diff --git a/.aliases/aliases.sh b/.aliases/aliases.sh new file mode 100644 index 0000000..4a73a6d --- /dev/null +++ b/.aliases/aliases.sh @@ -0,0 +1,7 @@ +source /Users/marsway/.vvconfig/.aliases/crack.sh +source /Users/marsway/.vvconfig/.aliases/edit.sh +source /Users/marsway/.vvconfig/.aliases/git.sh +source /Users/marsway/.vvconfig/.aliases/mc.sh +source /Users/marsway/.vvconfig/.aliases/quickpath.sh +source /Users/marsway/.vvconfig/.aliases/quickssh.sh +source /Users/marsway/.vvconfig/.aliases/scripts.sh diff --git a/commands/crack.sh b/.aliases/crack.sh similarity index 100% rename from commands/crack.sh rename to .aliases/crack.sh diff --git a/.aliases/editor.sh b/.aliases/editor.sh new file mode 100644 index 0000000..d71bc29 --- /dev/null +++ b/.aliases/editor.sh @@ -0,0 +1 @@ +alias nv='nvim' diff --git a/.aliases/git.sh b/.aliases/git.sh new file mode 100644 index 0000000..68d0c26 --- /dev/null +++ b/.aliases/git.sh @@ -0,0 +1,8 @@ +alias g='git' +# Git +alias gb='git branch' +alias gs='git status' +alias gl='git log' +alias gd='git diff' +alias gp='git pull' +alias gm='git commit -m' diff --git a/.aliases/mc.sh b/.aliases/mc.sh new file mode 100644 index 0000000..0d5cd32 --- /dev/null +++ b/.aliases/mc.sh @@ -0,0 +1,4 @@ +mc() { + mkdir $1 + cd $1 +} diff --git a/.aliases/quickpath.sh b/.aliases/quickpath.sh new file mode 100644 index 0000000..87f663a --- /dev/null +++ b/.aliases/quickpath.sh @@ -0,0 +1 @@ +alias co='cd ~/Documents/coding/' diff --git a/.aliases/quickssh.sh b/.aliases/quickssh.sh new file mode 100644 index 0000000..d0829f9 --- /dev/null +++ b/.aliases/quickssh.sh @@ -0,0 +1,14 @@ +# Quick ssh +alias api='ssh root@api.eagle.local' +alias autops='ssh root@autops.eagle.local' +alias toolchain='ssh root@autops.eagle.local' +alias esq='ssh root@101.35.8.154' +alias cpid='ssh-copy-id' +alias apidb='ssh root@apidb.eagle.local' +alias oness='ssh root@suzones.eagle.local' +alias proxy='ssh root@suzproxy01.eagle.local' +alias apimonitor='ssh root@apimonitor.eagle.local' +alias portal='ssh root@portal.eagle.local' +alias datac='ssh root@datacenter.eagle.local' +alias apip='ssh root@47.116.120.231' +alias gtss="ssh 'ubuntu@git.marsway.red'" diff --git a/.aliases/scripts.sh b/.aliases/scripts.sh new file mode 100644 index 0000000..7e57482 --- /dev/null +++ b/.aliases/scripts.sh @@ -0,0 +1 @@ +alias backup-forgejo='bash /Users/$USER/.vvconfig/scripts/backup_forgejo.sh' diff --git a/.aliases/update_aliases_list b/.aliases/update_aliases_list new file mode 100644 index 0000000..ee4283e --- /dev/null +++ b/.aliases/update_aliases_list @@ -0,0 +1,5 @@ +#!/bin/zsh +rm ./aliases.sh +for i in $(realpath ./*.sh); do + echo "source $i" >> aliases.sh +done diff --git a/.config/alacritty/alacritty.toml b/.config/alacritty/alacritty.toml new file mode 100644 index 0000000..9704200 --- /dev/null +++ b/.config/alacritty/alacritty.toml @@ -0,0 +1,51 @@ +[general] +live_config_reload = true +import = [ + "~/.config/alacritty/theme-falcon.toml", + "~/.config/alacritty/keybinding.toml" +] + +[terminal.shell] +program = "/opt/homebrew/bin/fish" + +[window] +decorations = "Buttonless" +position = {x = 0, y = 0} +padding = {x=10, y=3} +dynamic_padding = true +dimensions = {columns=160, lines=25} +#level = "AlwaysOnTop" +opacity = 0.8 +blur = true +#startup_mode = "Maximized" + +[env] +TERM = "xterm-256color" +[mouse] +hide_when_typing = true + +[colors] +draw_bold_text_with_bright_colors = false + +[cursor] +style = {shape="Beam", blinking="Always"} + +[font] +size = 16.0 +#offset = {x=0, y=8} +glyph_offset = {x=0, y=0} +italic = {family = "JetBrainsMono Nerd Font", style = "Italic"} +bold = {family = "JetBrainsMono Nerd Font", style = "Regular"} +bold_italic = {family = "JetBrainsMono Nerd Font", style = "Italic"} +normal = {family = "JetBrainsMono Nerd Font", style = "Italic"} + +[scrolling] +history = 100000 +multiplier = 4 + +[selection] +save_to_clipboard = true +semantic_escape_chars = ''',│`|:"' ()[]{}<>''' + +[debug] +#render_timer = true \ No newline at end of file diff --git a/.config/alacritty/keybinding.toml b/.config/alacritty/keybinding.toml new file mode 100644 index 0000000..9008b49 --- /dev/null +++ b/.config/alacritty/keybinding.toml @@ -0,0 +1,46 @@ +# Key bindings +# A list with all available `key` names can be found here: +# https://docs.rs/glutin/*/glutin/enum.VirtualKeyCode.html#variants +# +# Run "xxd -psd" to find hex codes of keys. +# +# Alacritty + Tmux key integratio +# `\x1c` is `C-\` as tmux prefix +# `\x1b` is `Esc` + +[[keyboard.bindings]] +action = "SpawnNewInstance" +key = "N" +mods = "Command" + +[[keyboard.bindings]] +chars = "\u001Bb" +key = "Left" +mods = "Alt" + +[[keyboard.bindings]] +chars = "\u001Bf" +key = "Right" +mods = "Alt" + +[[keyboard.bindings]] +chars = "\u001BOH" +key = "Left" +mode = "AppCursor" +mods = "Command" + +[[keyboard.bindings]] +chars = "\u001BOF" +key = "Right" +mode = "AppCursor" +mods = "Command" + +[[keyboard.bindings]] +chars = "\u0015" +key = "Back" +mods = "Command" + +[[keyboard.bindings]] +chars = "\u001B\u007F" +key = "Back" +mods = "Alt" diff --git a/.config/alacritty/logo.icns b/.config/alacritty/logo.icns new file mode 100644 index 0000000..53c1187 Binary files /dev/null and b/.config/alacritty/logo.icns differ diff --git a/.config/alacritty/theme-falcon.toml b/.config/alacritty/theme-falcon.toml new file mode 100644 index 0000000..e5b027b --- /dev/null +++ b/.config/alacritty/theme-falcon.toml @@ -0,0 +1,33 @@ +# falcon colorscheme for alacritty +# by fenetikm, https//github.com/fenetikm/falcon + +# Default colors +[colors.primary] +background = '#020221' +foreground = '#b4b4b9' + +[colors.cursor] +text = '#020221' +cursor = '#ffe8c0' + +# Normal colors +[colors.normal] +black = '#000004' +red = '#ff3600' +green = '#718e3f' +yellow = '#ffc552' +blue = '#635196' +magenta = '#ff761a' +cyan = '#34bfa4' +white = '#b4b4b9' + +# Bright colors +[colors.bright] +black = '#020221' +red = '#ff8e78' +green = '#b1bf75' +yellow = '#ffd392' +blue = '#99a4bc' +magenta = '#ffb07b' +cyan = '#8bccbf' +white = '#f8f8ff' diff --git a/.config/alacritty/themes b/.config/alacritty/themes deleted file mode 160000 index 86c5784..0000000 --- a/.config/alacritty/themes +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 86c578469e2bf784faf6f916883bf48349ff4f6d diff --git a/.config/fish/completions/docker.fish b/.config/fish/completions/docker.fish new file mode 100644 index 0000000..10d72f2 --- /dev/null +++ b/.config/fish/completions/docker.fish @@ -0,0 +1,587 @@ +# docker.fish - docker completions for fish shell +# +# This file is generated by gen_docker_fish_completions.py from: +# https://github.com/barnybug/docker-fish-completion +# +# To install the completions: +# mkdir -p ~/.config/fish/completions +# cp docker.fish ~/.config/fish/completions +# +# Completion supported: +# - parameters +# - commands +# - containers +# - images +# - repositories + +function __fish_docker_no_subcommand --description 'Test if docker has yet to be given the subcommand' + for i in (commandline -opc) + if contains -- $i attach build commit cp create diff events exec export history images import info inspect kill load login logout logs network pause port ps pull push rename restart rm rmi run save search start stop tag top trust unpause version wait stats + return 1 + end + end + return 0 +end + +function __fish_print_docker_containers --description 'Print a list of docker containers' -a select + switch $select + case running + docker ps -a --no-trunc --filter status=running --format "{{.ID}}\n{{.Names}}" | tr ',' '\n' + case stopped + docker ps -a --no-trunc --filter status=exited --format "{{.ID}}\n{{.Names}}" | tr ',' '\n' + case all + docker ps -a --no-trunc --format "{{.ID}}\n{{.Names}}" | tr ',' '\n' + end +end + +function __fish_print_docker_networks --description 'Print a list of docker networks' + docker network ls --format "{{.ID}}\n{{.Name}}" | tr ',' '\n' +end + + +function __fish_docker_no_subcommand_trust --description 'Test if docker has yet to be given the trust subcommand' + if __fish_seen_subcommand_from trust + for i in (commandline -opc) + if contains -- $i inspect key revoke sign signer + return 1 + end + end + return 0 + end + return 1 +end + +function __fish_docker_subcommand_path --description 'Test if command has all arguments in any order' + set -l cmd (commandline -poc) + set -e cmd[1] + for sub in $argv + if not contains -- $sub $cmd + return 1 + end + end + return 0 +end + +function __fish_docker_subcommand_path_without --description 'Test if command has all arguments in any order' + set -l cmd (commandline -poc) + set -e cmd[1] + for sub in $argv + if contains -- $sub $cmd + return 1 + end + end + return 0 +end + +function __fish_print_docker_images --description 'Print a list of docker images' + docker images --format "{{.Repository}}:{{.Tag}}" | command grep -v '' +end + +function __fish_print_docker_repositories --description 'Print a list of docker repositories' + docker images --format "{{.Repository}}" | command grep -v '' | command sort | command uniq +end + +# common options +complete -c docker -f -n '__fish_docker_no_subcommand' -s b -l bridge -d 'Attach containers to a pre-existing network bridge' +complete -c docker -f -n '__fish_docker_no_subcommand' -l bip -d "Use this CIDR notation address for the network bridge's IP, not compatible with -b" +complete -c docker -f -n '__fish_docker_no_subcommand' -s D -l debug -d 'Enable debug mode' +complete -c docker -f -n '__fish_docker_no_subcommand' -s d -l daemon -d 'Enable daemon mode' +complete -c docker -f -n '__fish_docker_no_subcommand' -l dns -d 'Force Docker to use specific DNS servers' +complete -c docker -f -n '__fish_docker_no_subcommand' -l dns-opt -d 'Force Docker to use specific DNS options' +complete -c docker -f -n '__fish_docker_no_subcommand' -l dns-search -d 'Force Docker to use specific DNS search domains' +complete -c docker -f -n '__fish_docker_no_subcommand' -l exec-opt -d 'Set runtime execution options' +complete -c docker -f -n '__fish_docker_no_subcommand' -l fixed-cidr -d 'IPv4 subnet for fixed IPs (e.g. 10.20.0.0/16)' +complete -c docker -f -n '__fish_docker_no_subcommand' -l fixed-cidr-v6 -d 'IPv6 subnet for fixed IPs (e.g.: 2001:a02b/48)' +complete -c docker -f -n '__fish_docker_no_subcommand' -s G -l group -d 'Group to assign the unix socket specified by -H when running in daemon mode' +complete -c docker -f -n '__fish_docker_no_subcommand' -s g -l graph -d 'Path to use as the root of the Docker runtime' +complete -c docker -f -n '__fish_docker_no_subcommand' -s H -l host -d 'The socket(s) to bind to in daemon mode or connect to in client mode, specified using one or more tcp://host:port, unix:///path/to/socket, fd://* or fd://socketfd.' +complete -c docker -f -n '__fish_docker_no_subcommand' -s h -l help -d 'Print usage' +complete -c docker -f -n '__fish_docker_no_subcommand' -l icc -d 'Allow unrestricted inter-container and Docker daemon host communication' +complete -c docker -f -n '__fish_docker_no_subcommand' -l insecure-registry -d 'Enable insecure communication with specified registries (no certificate verification for HTTPS and enable HTTP fallback) (e.g., localhost:5000 or 10.20.0.0/16)' +complete -c docker -f -n '__fish_docker_no_subcommand' -l ip -d 'Default IP address to use when binding container ports' +complete -c docker -f -n '__fish_docker_no_subcommand' -l ip-forward -d 'Enable net.ipv4.ip_forward and IPv6 forwarding if --fixed-cidr-v6 is defined. IPv6 forwarding may interfere with your existing IPv6 configuration when using Router Advertisement.' +complete -c docker -f -n '__fish_docker_no_subcommand' -l ip-masq -d "Enable IP masquerading for bridge's IP range" +complete -c docker -f -n '__fish_docker_no_subcommand' -l iptables -d "Enable Docker's addition of iptables rules" +complete -c docker -f -n '__fish_docker_no_subcommand' -l ipv6 -d 'Enable IPv6 networking' +complete -c docker -f -n '__fish_docker_no_subcommand' -s l -l log-level -d 'Set the logging level ("debug", "info", "warn", "error", "fatal")' +complete -c docker -f -n '__fish_docker_no_subcommand' -l label -d 'Set key=value labels to the daemon (displayed in `docker info`)' +complete -c docker -f -n '__fish_docker_no_subcommand' -l mtu -d 'Set the containers network MTU' +complete -c docker -f -n '__fish_docker_no_subcommand' -s p -l pidfile -d 'Path to use for daemon PID file' +complete -c docker -f -n '__fish_docker_no_subcommand' -l registry-mirror -d 'Specify a preferred registry mirror' +complete -c docker -f -n '__fish_docker_no_subcommand' -s s -l storage-driver -d 'Force the Docker runtime to use a specific storage driver' +complete -c docker -f -n '__fish_docker_no_subcommand' -l selinux-enabled -d 'Enable selinux support. SELinux does not presently support the BTRFS storage driver' +complete -c docker -f -n '__fish_docker_no_subcommand' -l storage-opt -d 'Set storage driver options' +complete -c docker -f -n '__fish_docker_no_subcommand' -l tls -d 'Use TLS; implied by --tlsverify' +complete -c docker -f -n '__fish_docker_no_subcommand' -l tlscacert -d 'Trust only remotes providing a certificate signed by the CA given here' +complete -c docker -f -n '__fish_docker_no_subcommand' -l tlscert -d 'Path to TLS certificate file' +complete -c docker -f -n '__fish_docker_no_subcommand' -l tlskey -d 'Path to TLS key file' +complete -c docker -f -n '__fish_docker_no_subcommand' -l tlsverify -d 'Use TLS and verify the remote (daemon: verify client, client: verify daemon)' +complete -c docker -f -n '__fish_docker_no_subcommand' -s v -l version -d 'Print version information and quit' + +# subcommands +# attach +complete -c docker -f -n '__fish_docker_no_subcommand' -a attach -d 'Attach local standard input, output, and error streams to a running container' +complete -c docker -A -f -n '__fish_seen_subcommand_from attach' -l detach-keys -d 'Override the key sequence for detaching a container' +complete -c docker -A -f -n '__fish_seen_subcommand_from attach' -l help -d 'Print usage' +complete -c docker -A -f -n '__fish_seen_subcommand_from attach' -l no-stdin -d 'Do not attach STDIN' +complete -c docker -A -f -n '__fish_seen_subcommand_from attach' -l sig-proxy -d 'Proxy all received signals to the process' +complete -c docker -A -f -n '__fish_seen_subcommand_from attach' -a '(__fish_print_docker_containers running)' -d "Container" + +# build +complete -c docker -f -n '__fish_docker_no_subcommand' -a build -d 'Build an image from a Dockerfile' +complete -c docker -A -f -n '__fish_seen_subcommand_from build' -l add-host -d 'Add a custom host-to-IP mapping (host:ip)' +complete -c docker -A -f -n '__fish_seen_subcommand_from build' -l build-arg -d 'Set build-time variables' +complete -c docker -A -f -n '__fish_seen_subcommand_from build' -l cache-from -d 'Images to consider as cache sources' +complete -c docker -A -f -n '__fish_seen_subcommand_from build' -l cgroup-parent -d 'Optional parent cgroup for the container' +complete -c docker -A -f -n '__fish_seen_subcommand_from build' -l compress -d 'Compress the build context using gzip' +complete -c docker -A -f -n '__fish_seen_subcommand_from build' -l cpu-period -d 'Limit the CPU CFS (Completely Fair Scheduler) period' +complete -c docker -A -f -n '__fish_seen_subcommand_from build' -l cpu-quota -d 'Limit the CPU CFS (Completely Fair Scheduler) quota' +complete -c docker -A -f -n '__fish_seen_subcommand_from build' -s c -l cpu-shares -d 'CPU shares (relative weight)' +complete -c docker -A -f -n '__fish_seen_subcommand_from build' -l cpuset-cpus -d 'CPUs in which to allow execution (0-3, 0,1)' +complete -c docker -A -f -n '__fish_seen_subcommand_from build' -l cpuset-mems -d 'MEMs in which to allow execution (0-3, 0,1)' +complete -c docker -A -f -n '__fish_seen_subcommand_from build' -l disable-content-trust -d 'Skip image verification' +complete -c docker -A -f -n '__fish_seen_subcommand_from build' -s f -l file -d "Name of the Dockerfile (Default is ‘PATH/Dockerfile’)" +complete -c docker -A -f -n '__fish_seen_subcommand_from build' -l force-rm -d 'Always remove intermediate containers' +complete -c docker -A -f -n '__fish_seen_subcommand_from build' -l help -d 'Print usage' +complete -c docker -A -f -n '__fish_seen_subcommand_from build' -l iddfile -d 'Write the image ID to the file' +complete -c docker -A -f -n '__fish_seen_subcommand_from build' -l isolation -d 'Container isolation technology' +complete -c docker -A -f -n '__fish_seen_subcommand_from build' -l label -d 'Set metadata for an image' +complete -c docker -A -f -n '__fish_seen_subcommand_from build' -s m -l memory -d 'Memory limit' +complete -c docker -A -f -n '__fish_seen_subcommand_from build' -l memory-swap -d 'Swap limit equal to memory plus swap: ‘-1’ to enable unlimited swap' +complete -c docker -A -f -n '__fish_seen_subcommand_from build' -l network -d 'Set the networking mode for the RUN instructions during build' +complete -c docker -A -f -n '__fish_seen_subcommand_from build' -l no-cache -d 'Do not use cache when building the image' +complete -c docker -A -f -n '__fish_seen_subcommand_from build' -l pull -d 'Always attempt to pull a newer version of the image' +complete -c docker -A -f -n '__fish_seen_subcommand_from build' -s q -l quiet -d 'Suppress the build output and print image ID on success' +complete -c docker -A -f -n '__fish_seen_subcommand_from build' -l rm -d 'Remove intermediate containers after a successful build' +complete -c docker -A -f -n '__fish_seen_subcommand_from build' -l security-opt -d 'Security options' +complete -c docker -A -f -n '__fish_seen_subcommand_from build' -l shm-size -d 'Size of /dev/shm' +complete -c docker -A -f -n '__fish_seen_subcommand_from build' -s t -l tag -d 'Name and optionally a tag in the ‘name:tag’ format' +complete -c docker -A -f -n '__fish_seen_subcommand_from build' -l target -d 'Set the target build stage to build' +complete -c docker -A -f -n '__fish_seen_subcommand_from build' -l ulimit -d 'Ulimit options' + +# commit +complete -c docker -f -n '__fish_docker_no_subcommand' -a commit -d "Create a new image from a container's changes" +complete -c docker -A -f -n '__fish_seen_subcommand_from commit' -s a -l author -d 'Author (e.g., "John Hannibal Smith ")' +complete -c docker -A -f -n '__fish_seen_subcommand_from commit' -s c -l change -d 'Apply Dockerfile instruction to the created image' +complete -c docker -A -f -n '__fish_seen_subcommand_from commit' -l help -d 'Print usage' +complete -c docker -A -f -n '__fish_seen_subcommand_from commit' -s m -l message -d 'Commit message' +complete -c docker -A -f -n '__fish_seen_subcommand_from commit' -s p -l pause -d 'Pause container during commit' +complete -c docker -A -f -n '__fish_seen_subcommand_from commit' -a '(__fish_print_docker_containers all)' -d "Container" + +# cp +complete -c docker -f -n '__fish_docker_no_subcommand' -a cp -d "Copy files/folders between a container and the local filesystem" +complete -c docker -A -f -n '__fish_seen_subcommand_from cp' -s a -l archive -d 'Archive mode (copy all uid/gid information)' +complete -c docker -A -f -n '__fish_seen_subcommand_from cp' -s L -l follow-link -d 'Always follow symbol link in SRC_PATH' +complete -c docker -A -f -n '__fish_seen_subcommand_from cp' -l help -d 'Print usage' + +# create +complete -c docker -f -n '__fish_docker_no_subcommand' -a create -d 'Create a new container' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l add-host -d 'Add a custom host-to-IP mapping (host:ip)' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l annotation -d 'Add an annotation to the container (passed through to the OCI runtime)' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -s a -l attach -d 'Attach to STDIN, STDOUT or STDERR.' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l blkio-weight -d 'Block IO (relative weight), between 10 and 1000, or 0 to disable (default 0)' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l blkio-weight-device -d 'Block IO weight (relative device weight)' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l cap-add -d 'Add Linux capabilities' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l cap-drop -d 'Drop Linux capabilities' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l cgroupns -d 'Cgroup namespace mode to use' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l cgroup-parent -d 'Optional parent cgroup for the container' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l cidfile -d 'Write the container ID to the file' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l cpu-count -d 'CPU count (Windows only)' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l cpu-percent -d 'CPU percent (Windows only)' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l cpu-period -d 'Limit CPU CFS (Completely Fair Scheduler) period' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l cpu-quota -d 'Limit CPU CFS (Completely Fair Scheduler) quota' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l cpu-rt-period -d 'Limit CPU real-time period in microseconds' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l cpu-rt-runtime -d 'Limit CPU real-time runtime in microseconds' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l cpu-shares -d 'CPU shares (relative weight)' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l cpus -d 'Number of CPUs' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l cpuset-cpus -d 'CPUs in which to allow execution (0-3, 0,1)' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l cpuset-mems -d 'MEMs in which to allow execution (0-3, 0,1)' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l device -d 'Add a host device to the container (e.g. --device=/dev/sdc:/dev/xvdc:rwm)' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l device-cgroup-rule -d 'Add a rule to the cgroup allowed devices list' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l device-read-bps -d 'Limit read rate (bytes per second) from a device' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l device-read-iops -d 'Limit read rate (IO per second) from a device' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l device-write-bps -d 'Limit write rate (bytes per second) to a device' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l device-write-iops -d 'Limit write rate (IO per second) to a device' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l disable-content-trust -d 'Skip image verification' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l dns -d 'Set custom DNS servers' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l dns-opt -d 'Set DNS options' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l dns-option -d 'Set DNS options' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l dns-search -d 'Set custom DNS search domains' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -s e -l env -d 'Set environment variables' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l entrypoint -d 'Overwrite the default ENTRYPOINT of the image' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l env-file -d 'Read in a line delimited file of environment variables' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l expose -d 'Expose a port or a range of ports' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l group-add -d 'Add additional groups to join' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l health-cmd -d 'Command to run to check health' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l health-interval -d 'Time between running the check (ms|s|m|h) (default 0s)' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l health-retries -d 'Consecutive failures needed to report unhealthy' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l health-start-period -d 'Start period for the container to initialize before starting health-retries countdown (ms|s|m|h) (default 0s)' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l health-timeout -d 'Maximum time to allow one check to run (ms|s|m|h) (default 0s)' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l help -d 'Print usage' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -s h -l hostname -d 'Container host name' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l init -d 'Run an init inside the container that forwards signals and reaps processes' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -s i -l interactive -d 'Keep STDIN open even if not attached' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l io-maxbandwidth -d 'Maximum IO bandwidth limit for the system drive (Windows only)' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l io-maxiops -d 'Maximum IOps limit for the system drive (Windows only)' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l ip -d 'IPv4 address (e.g., 172.30.100.104)' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l ip6 -d 'IPv6 address (e.g., 2001:db8::33)' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l ipc -d 'IPC mode to use' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l isolation -d 'Container isolation technology' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l kernel-memory -d 'Kernel memory limit' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -s l -l label -d 'Set meta data on a container' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l label-file -d 'Read in a line delimited file of labels' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l link -d 'Add link to another container' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l link-local-ip -d 'Container IPv4/IPv6 link-local addresses' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l log-driver -d 'Logging driver for the container' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l log-opt -d 'Log driver options' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l mac-address -d 'Container MAC address (e.g., 92:d0:c6:0a:29:33)' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -s m -l memory -d 'Memory limit' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l memory-reservation -d 'Memory soft limit' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l memory-swap -d 'Swap limit equal to memory plus swap: ‘-1’ to enable unlimited swap' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l memory-swappiness -d 'Tune container memory swappiness (0 to 100)' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l mount -d 'Attach a filesystem mount to the container' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l name -d 'Assign a name to the container' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -s net -l network -d 'Connect a container to a network' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -s net-alias -l network-alias -d 'Add network-scoped alias for the container' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l no-healthcheck -d 'Disable any container-specified HEALTHCHECK' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l oom-kill-disable -d 'Disable OOM Killer' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l oom-score-adj -d 'Tune host’s OOM preferences (-1000 to 1000)' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l pid -d 'PID namespace to use' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l pids-limit -d 'Tune container pids limit (set -1 for unlimited )' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l privileged -d 'Give extended privileges to this container' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -s p -l publish -d "Publish a container’s port(s) to the host" +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -s P -l publish-all -d 'Publish all exposed ports to random ports' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l read-only -d "Mount the container's root filesystem as read only" +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l restart -d 'Restart policy to apply when a container exits' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l rm -d 'Automatically remove the container when it exits' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l runtime -d 'Runtime to use for this container' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l security-opt -d 'Security Options' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l shm-size -d 'Size of /dev/shm' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l stop-signal -d 'Signal to stop a container' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l stop-timeout -d 'Timeout (in seconds) to stop a container' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l storage-opt -d 'Storage driver options for the container' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l sysctl -d 'Sysctl options' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l tmpfs -d 'Mount a tmpfs directory' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -s t -l tty -d 'Allocate a pseudo-TTY' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l ulimit -d 'Ulimit options' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -s u -l user -d ' Username or UID (format: [:])' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l userns -d 'User namespace to use' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l uts -d 'UTS namespace to use' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -s v -l volume -d 'Bind mount a volume' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l volume-driver -d 'Optional volume driver for the container' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l volumes-from -d 'Mount volumes from the specified container(s)' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -s w -l workdir -d 'Working directory inside the container' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -a '(__fish_print_docker_images)' -d "Image" + +# diff +complete -c docker -f -n '__fish_docker_no_subcommand' -a diff -d "Inspect changes on a container's filesystem" +complete -c docker -A -f -n '__fish_seen_subcommand_from diff' -l help -d 'Print usage' +complete -c docker -A -f -n '__fish_seen_subcommand_from diff' -a '(__fish_print_docker_containers all)' -d "Container" + +# events +complete -c docker -f -n '__fish_docker_no_subcommand' -a events -d 'Get real time events from the server' +complete -c docker -A -f -n '__fish_seen_subcommand_from events' -s f -l filter -d "Filter output based on conditions provided" +complete -c docker -A -f -n '__fish_seen_subcommand_from events' -l format -d 'Format the output using the given Go template' +complete -c docker -A -f -n '__fish_seen_subcommand_from events' -l help -d 'Print usage' +complete -c docker -A -f -n '__fish_seen_subcommand_from events' -l since -d 'Show all events created since timestamp' +complete -c docker -A -f -n '__fish_seen_subcommand_from events' -l until -d 'Stream events until this timestamp' + +# exec +complete -c docker -f -n '__fish_docker_no_subcommand' -a exec -d 'Execute a command in a running container' +complete -c docker -A -f -n '__fish_seen_subcommand_from exec' -s d -l detach -d 'Detached mode: run command in the background' +complete -c docker -A -f -n '__fish_seen_subcommand_from exec' -l detach-keys -d 'Override the key sequence for detaching a container' +complete -c docker -A -f -n '__fish_seen_subcommand_from exec' -s e -l env -d 'Set environment variables' +complete -c docker -A -f -n '__fish_seen_subcommand_from exec' -l help -d 'Print usage' +complete -c docker -A -f -n '__fish_seen_subcommand_from exec' -s i -l interactive -d 'Keep STDIN open even if not attached' +complete -c docker -A -f -n '__fish_seen_subcommand_from exec' -l privileged -d 'Give extended privileges to the command' +complete -c docker -A -f -n '__fish_seen_subcommand_from exec' -s t -l tty -d 'Allocate a pseudo-TTY' +complete -c docker -A -f -n '__fish_seen_subcommand_from exec' -s u -l user -d 'Username or UID (format: [:])' +complete -c docker -A -f -n '__fish_seen_subcommand_from exec' -s w -l workdir -d 'Working directory inside the container' +complete -c docker -A -f -n '__fish_seen_subcommand_from exec' -a '(__fish_print_docker_containers running)' -d "Container" + +# export +complete -c docker -f -n '__fish_docker_no_subcommand' -a export -d 'Stream the contents of a container as a tar archive' +complete -c docker -A -f -n '__fish_seen_subcommand_from export' -l help -d 'Print usage' +complete -c docker -A -f -n '__fish_seen_subcommand_from export' -s o -l output -d 'Write to a file, instead of STDOUT' +complete -c docker -A -f -n '__fish_seen_subcommand_from export' -a '(__fish_print_docker_containers all)' -d "Container" + +# history +complete -c docker -f -n '__fish_docker_no_subcommand' -a history -d 'Show the history of an image' +complete -c docker -A -f -n '__fish_seen_subcommand_from history' -l format -d 'Format the output using the given Go template' +complete -c docker -A -f -n '__fish_seen_subcommand_from history' -l help -d 'Print usage' +complete -c docker -A -f -n '__fish_seen_subcommand_from history' -s H -l human -d 'Print sizes and dates in human readable format' +complete -c docker -A -f -n '__fish_seen_subcommand_from history' -l no-trunc -d "Don't truncate output" +complete -c docker -A -f -n '__fish_seen_subcommand_from history' -s q -l quiet -d 'Only show image IDs' +complete -c docker -A -f -n '__fish_seen_subcommand_from history' -a '(__fish_print_docker_images)' -d "Image" + +# images +complete -c docker -f -n '__fish_docker_no_subcommand' -a images -d 'List images' +complete -c docker -A -f -n '__fish_seen_subcommand_from images' -s a -l all -d 'Show all images (default hides intermediate images)' +complete -c docker -A -f -n '__fish_seen_subcommand_from images' -l digests -d 'Show digests' +complete -c docker -A -f -n '__fish_seen_subcommand_from images' -s f -l filter -d 'Filter output based on conditions provided' +complete -c docker -A -f -n '__fish_seen_subcommand_from images' -l format -d 'Format the output using the given Go template' +complete -c docker -A -f -n '__fish_seen_subcommand_from images' -l help -d 'Print usage' +complete -c docker -A -f -n '__fish_seen_subcommand_from images' -l no-trunc -d "Don't truncate output" +complete -c docker -A -f -n '__fish_seen_subcommand_from images' -s q -l quiet -d 'Only show image IDs' +complete -c docker -A -f -n '__fish_seen_subcommand_from images' -a '(__fish_print_docker_repositories)' -d "Repository" + +# import +complete -c docker -f -n '__fish_docker_no_subcommand' -a import -d 'Create a new filesystem image from the contents of a tarball' +complete -c docker -A -f -n '__fish_seen_subcommand_from import' -s c -l change -d 'Apply Dockerfile instruction to the created image' +complete -c docker -A -f -n '__fish_seen_subcommand_from import' -s m -l message -d 'Set commit message for imported image' +complete -c docker -A -f -n '__fish_seen_subcommand_from import' -l help -d 'Print usage' + +# info +complete -c docker -f -n '__fish_docker_no_subcommand' -a info -d 'Display system-wide information' +complete -c docker -A -f -n '__fish_seen_subcommand_from info' -s f -l format -d 'Format the output using the given go template' +complete -c docker -A -f -n '__fish_seen_subcommand_from info' -l help -d 'Print usage' + +# inspect +complete -c docker -f -n '__fish_docker_no_subcommand' -a inspect -d 'Return low-level information on a container or image' +complete -c docker -A -f -n '__fish_seen_subcommand_from inspect' -s f -l format -d 'Format the output using the given go template.' +complete -c docker -A -f -n '__fish_seen_subcommand_from inspect' -l help -d 'Print usage' +complete -c docker -A -f -n '__fish_seen_subcommand_from inspect' -s s -l size -d 'Display total file sizes if the type is container.' +complete -c docker -A -f -n '__fish_seen_subcommand_from inspect' -l type -d 'Return JSON for specified type' +complete -c docker -A -f -n '__fish_seen_subcommand_from inspect' -a '(__fish_print_docker_images)' -d "Image" +complete -c docker -A -f -n '__fish_seen_subcommand_from inspect' -a '(__fish_print_docker_containers all)' -d "Container" + +# kill +complete -c docker -f -n '__fish_docker_no_subcommand' -a kill -d 'Kill a running container' +complete -c docker -A -f -n '__fish_seen_subcommand_from kill' -l help -d 'Print usage' +complete -c docker -A -f -n '__fish_seen_subcommand_from kill' -s s -l signal -d 'Signal to send to the container' +complete -c docker -A -f -n '__fish_seen_subcommand_from kill' -a '(__fish_print_docker_containers running)' -d "Container" + +# load +complete -c docker -f -n '__fish_docker_no_subcommand' -a load -d 'Load an image from a tar archive' +complete -c docker -A -f -n '__fish_seen_subcommand_from load' -l help -d 'Print usage' +complete -c docker -A -f -n '__fish_seen_subcommand_from load' -s i -l input -d 'Read from a tar archive file, instead of STDIN' +complete -c docker -A -f -n '__fish_seen_subcommand_from load' -s q -l quiet -d 'Suppress the load output' + +# login +complete -c docker -f -n '__fish_docker_no_subcommand' -a login -d 'Log in to a registry' +complete -c docker -A -f -n '__fish_seen_subcommand_from login' -l help -d 'Print usage' +complete -c docker -A -f -n '__fish_seen_subcommand_from login' -s p -l password -d 'Password' +complete -c docker -A -f -n '__fish_seen_subcommand_from login' -l password-stdin -d 'Take the password from stdin' +complete -c docker -A -f -n '__fish_seen_subcommand_from login' -s u -l username -d 'Username' + +# logout +complete -c docker -f -n '__fish_docker_no_subcommand' -a logout -d 'Log out from a registry' + +# logs +complete -c docker -f -n '__fish_docker_no_subcommand' -a logs -d 'Fetch the logs of a container' +complete -c docker -A -f -n '__fish_seen_subcommand_from logs' -s f -l follow -d 'Follow log output' +complete -c docker -A -f -n '__fish_seen_subcommand_from logs' -l help -d 'Print usage' +complete -c docker -A -f -n '__fish_seen_subcommand_from logs' -s t -l timestamps -d 'Show timestamps' +complete -c docker -A -f -n '__fish_seen_subcommand_from logs' -l since -d 'Show logs since timestamp' +complete -c docker -A -f -n '__fish_seen_subcommand_from logs' -s n -l tail -d 'Output the specified number of lines at the end of logs (defaults to all logs)' +complete -c docker -A -f -n '__fish_seen_subcommand_from logs' -a '(__fish_print_docker_containers running)' -d "Container" + +# network +complete -c docker -f -n '__fish_docker_no_subcommand' -a network -d 'Manage networks' +complete -c docker -A -f -n '__fish_seen_subcommand_from network' -a connect -d 'Connect a container to a network' +complete -c docker -A -f -n '__fish_seen_subcommand_from network' -a create -d 'Create a network' +complete -c docker -A -f -n '__fish_seen_subcommand_from network' -a disconnect -d 'Disconnect a container from a network' +complete -c docker -A -f -n '__fish_seen_subcommand_from network' -a inspect -d 'Display detailed information on one or more networks' +complete -c docker -A -f -n '__fish_seen_subcommand_from network' -a ls -d 'List networks' +complete -c docker -A -f -n '__fish_seen_subcommand_from network' -a prune -d 'Remove all unused networks' +complete -c docker -A -f -n '__fish_seen_subcommand_from network' -a rm -d 'Remove one or more networks' +complete -c docker -A -f -n '__fish_seen_subcommand_from network' -l help -d 'Print usage' +complete -c docker -A -f -n '__fish_seen_subcommand_from network rm' -a '(__fish_print_docker_networks)' -d "Network" +complete -c docker -A -f -n '__fish_seen_subcommand_from network connect' -a '(__fish_print_docker_networks)' -d "Network" +complete -c docker -A -f -n '__fish_seen_subcommand_from network disconnect' -a '(__fish_print_docker_networks)' -d "Network" +complete -c docker -A -f -n '__fish_seen_subcommand_from network inspect' -a '(__fish_print_docker_networks)' -d "Network" + +# port +complete -c docker -f -n '__fish_docker_no_subcommand' -a port -d 'Lookup the public-facing port that is NAT-ed to PRIVATE_PORT' +complete -c docker -A -f -n '__fish_seen_subcommand_from port' -l help -d 'Print usage' +complete -c docker -A -f -n '__fish_seen_subcommand_from port' -a '(__fish_print_docker_containers running)' -d "Container" + +# pause +complete -c docker -f -n '__fish_docker_no_subcommand' -a pause -d 'Pause all processes within a container' +complete -c docker -A -f -n '__fish_seen_subcommand_from pause' -a '(__fish_print_docker_containers running)' -d "Container" + +# ps +complete -c docker -f -n '__fish_docker_no_subcommand' -a ps -d 'List containers' +complete -c docker -A -f -n '__fish_seen_subcommand_from ps' -s a -l all -d 'Show all containers. Only running containers are shown by default.' +complete -c docker -A -f -n '__fish_seen_subcommand_from ps' -l before -d 'Show only container created before Id or Name, include non-running ones.' +complete -c docker -A -f -n '__fish_seen_subcommand_from ps' -s f -l filter -d 'Provide filter values. Valid filters:' +complete -c docker -A -f -n '__fish_seen_subcommand_from ps' -l help -d 'Print usage' +complete -c docker -A -f -n '__fish_seen_subcommand_from ps' -s l -l latest -d 'Show only the latest created container, include non-running ones.' +complete -c docker -A -f -n '__fish_seen_subcommand_from ps' -s n -d 'Show n last created containers, include non-running ones.' +complete -c docker -A -f -n '__fish_seen_subcommand_from ps' -l no-trunc -d "Don't truncate output" +complete -c docker -A -f -n '__fish_seen_subcommand_from ps' -s q -l quiet -d 'Only display container IDs' +complete -c docker -A -f -n '__fish_seen_subcommand_from ps' -s s -l size -d 'Display total file sizes' +complete -c docker -A -f -n '__fish_seen_subcommand_from ps' -l since -d 'Show only containers created since Id or Name, include non-running ones.' + +# pull +complete -c docker -f -n '__fish_docker_no_subcommand' -a pull -d 'Download an image from a registry' +complete -c docker -A -f -n '__fish_seen_subcommand_from pull' -s a -l all-tags -d 'Download all tagged images in the repository' +complete -c docker -A -f -n '__fish_seen_subcommand_from pull' -l help -d 'Print usage' +complete -c docker -A -f -n '__fish_seen_subcommand_from pull' -a '(__fish_print_docker_images)' -d "Image" +complete -c docker -A -f -n '__fish_seen_subcommand_from pull' -a '(__fish_print_docker_repositories)' -d "Repository" + +# push +complete -c docker -f -n '__fish_docker_no_subcommand' -a push -d 'Upload an image to a registry' +complete -c docker -A -f -n '__fish_seen_subcommand_from push' -l help -d 'Print usage' +complete -c docker -A -f -n '__fish_seen_subcommand_from push' -a '(__fish_print_docker_images)' -d "Image" +complete -c docker -A -f -n '__fish_seen_subcommand_from push' -a '(__fish_print_docker_repositories)' -d "Repository" + +# rename +complete -c docker -f -n '__fish_docker_no_subcommand' -a rename -d 'Rename an existing container' + +# restart +complete -c docker -f -n '__fish_docker_no_subcommand' -a restart -d 'Restart a container' +complete -c docker -A -f -n '__fish_seen_subcommand_from restart' -l help -d 'Print usage' +complete -c docker -A -f -n '__fish_seen_subcommand_from restart' -s t -l time -d 'Number of seconds to try to stop for before killing the container. Once killed it will then be restarted. Default is 10 seconds.' +complete -c docker -A -f -n '__fish_seen_subcommand_from restart' -a '(__fish_print_docker_containers running)' -d "Container" + +# rm +complete -c docker -f -n '__fish_docker_no_subcommand' -a rm -d 'Remove one or more containers' +complete -c docker -A -f -n '__fish_seen_subcommand_from rm' -s f -l force -d 'Force the removal of a running container (uses SIGKILL)' +complete -c docker -A -f -n '__fish_seen_subcommand_from rm' -l help -d 'Print usage' +complete -c docker -A -f -n '__fish_seen_subcommand_from rm' -s l -l link -d 'Remove the specified link and not the underlying container' +complete -c docker -A -f -n '__fish_seen_subcommand_from rm' -s v -l volumes -d 'Remove anonymous volumes associated with the container' +complete -c docker -A -f -n '__fish_seen_subcommand_from rm' -a '(__fish_print_docker_containers stopped)' -d "Container" +complete -c docker -A -f -n '__fish_seen_subcommand_from rm' -s f -l force -a '(__fish_print_docker_containers all)' -d "Container" + +# rmi +complete -c docker -f -n '__fish_docker_no_subcommand' -a rmi -d 'Remove one or more images' +complete -c docker -A -f -n '__fish_seen_subcommand_from rmi' -s f -l force -d 'Force removal of the image' +complete -c docker -A -f -n '__fish_seen_subcommand_from rmi' -l help -d 'Print usage' +complete -c docker -A -f -n '__fish_seen_subcommand_from rmi' -l no-prune -d 'Do not delete untagged parents' +complete -c docker -A -f -n '__fish_seen_subcommand_from rmi' -a '(__fish_print_docker_images)' -d "Image" + +# run +complete -c docker -f -n '__fish_docker_no_subcommand' -a run -d 'Create and run a new container from an image' +complete -c docker -A -f -n '__fish_seen_subcommand_from run' -l annotation -d 'Add an annotation to the container (passed through to the OCI runtime)' +complete -c docker -A -f -n '__fish_seen_subcommand_from run' -s a -l attach -d 'Attach to STDIN, STDOUT or STDERR.' +complete -c docker -A -f -n '__fish_seen_subcommand_from run' -l add-host -d 'Add a custom host-to-IP mapping (host:ip)' +complete -c docker -A -f -n '__fish_seen_subcommand_from run' -s c -l cpu-shares -d 'CPU shares (relative weight)' +complete -c docker -A -f -n '__fish_seen_subcommand_from run' -l cap-add -d 'Add Linux capabilities' +complete -c docker -A -f -n '__fish_seen_subcommand_from run' -l cap-drop -d 'Drop Linux capabilities' +complete -c docker -A -f -n '__fish_seen_subcommand_from run' -l cidfile -d 'Write the container ID to the file' +complete -c docker -A -f -n '__fish_seen_subcommand_from run' -l cgroupns -d 'Cgroup namespace mode to use' +complete -c docker -A -f -n '__fish_seen_subcommand_from run' -l cpuset -d 'CPUs in which to allow execution (0-3, 0,1)' +complete -c docker -A -f -n '__fish_seen_subcommand_from run' -s d -l detach -d 'Detached mode: run the container in the background and print the new container ID' +complete -c docker -A -f -n '__fish_seen_subcommand_from run' -l device -d 'Add a host device to the container (e.g. --device=/dev/sdc:/dev/xvdc:rwm)' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l device-cgroup-rule -d 'Add a rule to the cgroup allowed devices list (e.g. --device-cgroup-rule="c 13:37 rwm")' +complete -c docker -A -f -n '__fish_seen_subcommand_from run' -l dns -d 'Set custom DNS servers' +complete -c docker -A -f -n '__fish_seen_subcommand_from run' -l dns-opt -d "Set custom DNS options (Use --dns-opt='' if you don't wish to set options)" +complete -c docker -A -f -n '__fish_seen_subcommand_from run' -l dns-search -d "Set custom DNS search domains (Use --dns-search=. if you don't wish to set the search domain)" +complete -c docker -A -f -n '__fish_seen_subcommand_from run' -s e -l env -d 'Set environment variables' +complete -c docker -A -f -n '__fish_seen_subcommand_from run' -l entrypoint -d 'Overwrite the default ENTRYPOINT of the image' +complete -c docker -A -f -n '__fish_seen_subcommand_from run' -l env-file -d 'Read in a line delimited file of environment variables' +complete -c docker -A -f -n '__fish_seen_subcommand_from run' -l expose -d 'Expose a port or a range of ports (e.g. --expose=3300-3310) from the container without publishing it to your host' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l group-add -d 'Add additional groups to run as' +complete -c docker -A -f -n '__fish_seen_subcommand_from run' -s h -l hostname -d 'Container host name' +complete -c docker -A -f -n '__fish_seen_subcommand_from run' -l help -d 'Print usage' +complete -c docker -A -f -n '__fish_seen_subcommand_from run' -s i -l interactive -d 'Keep STDIN open even if not attached' +complete -c docker -A -f -n '__fish_seen_subcommand_from run' -l ipc -d 'Default is to create a private IPC namespace (POSIX SysV IPC) for the container' +complete -c docker -A -f -n '__fish_seen_subcommand_from run' -l link -d 'Add link to another container in the form of :alias' +complete -c docker -A -f -n '__fish_seen_subcommand_from run' -s m -l memory -d 'Memory limit (format: [], where unit = b, k, m or g)' +complete -c docker -A -f -n '__fish_seen_subcommand_from run' -l mac-address -d 'Container MAC address (e.g., 92:d0:c6:0a:29:33)' +complete -c docker -A -f -n '__fish_seen_subcommand_from run' -l memory-swap -d "Total memory usage (memory + swap), set '-1' to disable swap (format: [], where unit = b, k, m or g)" +complete -c docker -A -f -n '__fish_seen_subcommand_from run' -l mount -d 'Attach a filesystem mount to the container' +complete -c docker -A -f -n '__fish_seen_subcommand_from run' -l name -d 'Assign a name to the container' +complete -c docker -A -f -n '__fish_seen_subcommand_from run' -l net -d 'Set the Network mode for the container' +complete -c docker -A -f -n '__fish_seen_subcommand_from run' -s P -l publish-all -d 'Publish all exposed ports to random ports on the host interfaces' +complete -c docker -A -f -n '__fish_seen_subcommand_from run' -s p -l publish -d "Publish a container's port to the host" +complete -c docker -A -f -n '__fish_seen_subcommand_from run' -l pid -d 'Default is to create a private PID namespace for the container' +complete -c docker -A -f -n '__fish_seen_subcommand_from run' -l privileged -d 'Give extended privileges to this container' +complete -c docker -A -f -n '__fish_seen_subcommand_from run' -l read-only -d "Mount the container's root filesystem as read only" +complete -c docker -A -f -n '__fish_seen_subcommand_from run' -l restart -d 'Restart policy to apply when a container exits (no, on-failure[:max-retry], always)' +complete -c docker -A -f -n '__fish_seen_subcommand_from run' -l rm -d 'Automatically remove the container when it exits (incompatible with -d)' +complete -c docker -A -f -n '__fish_seen_subcommand_from run' -l security-opt -d 'Security Options' +complete -c docker -A -f -n '__fish_seen_subcommand_from run' -l sig-proxy -d 'Proxy received signals to the process (non-TTY mode only). SIGCHLD, SIGSTOP, and SIGKILL are not proxied.' +complete -c docker -A -f -n '__fish_seen_subcommand_from run' -l stop-signal -d 'Signal to kill a container' +complete -c docker -A -f -n '__fish_seen_subcommand_from run' -s t -l tty -d 'Allocate a pseudo-TTY' +complete -c docker -A -f -n '__fish_seen_subcommand_from run' -s u -l user -d 'Username or UID' +complete -c docker -A -f -n '__fish_seen_subcommand_from run' -l tmpfs -d 'Mount tmpfs on a directory' +complete -c docker -A -f -n '__fish_seen_subcommand_from run' -s v -l volume -d 'Bind mount a volume (e.g., from the host: -v /host:/container, from Docker: -v /container)' +complete -c docker -A -f -n '__fish_seen_subcommand_from run' -l volumes-from -d 'Mount volumes from the specified container(s)' +complete -c docker -A -f -n '__fish_seen_subcommand_from run' -s w -l workdir -d 'Working directory inside the container' +complete -c docker -A -f -n '__fish_seen_subcommand_from run' -a '(__fish_print_docker_images)' -d "Image" + +# save +complete -c docker -f -n '__fish_docker_no_subcommand' -a save -d 'Save an image to a tar archive' +complete -c docker -A -f -n '__fish_seen_subcommand_from save' -l help -d 'Print usage' +complete -c docker -A -f -n '__fish_seen_subcommand_from save' -s o -l output -d 'Write to an file, instead of STDOUT' +complete -c docker -A -f -n '__fish_seen_subcommand_from save' -a '(__fish_print_docker_images)' -d "Image" + +# search +complete -c docker -f -n '__fish_docker_no_subcommand' -a search -d 'Search for an image on the registry (defaults to the Docker Hub)' +complete -c docker -A -f -n '__fish_seen_subcommand_from search' -l automated -d 'Only show automated builds' +complete -c docker -A -f -n '__fish_seen_subcommand_from search' -l help -d 'Print usage' +complete -c docker -A -f -n '__fish_seen_subcommand_from search' -l no-trunc -d "Don't truncate output" +complete -c docker -A -f -n '__fish_seen_subcommand_from search' -s s -l stars -d 'Only displays with at least x stars' + +# start +complete -c docker -f -n '__fish_docker_no_subcommand' -a start -d 'Start a container' +complete -c docker -A -f -n '__fish_seen_subcommand_from start' -s a -l attach -d "Attach container's STDOUT and STDERR and forward all signals to the process" +complete -c docker -A -f -n '__fish_seen_subcommand_from start' -l help -d 'Print usage' +complete -c docker -A -f -n '__fish_seen_subcommand_from start' -s i -l interactive -d "Attach container's STDIN" +complete -c docker -A -f -n '__fish_seen_subcommand_from start' -a '(__fish_print_docker_containers stopped)' -d "Container" + +# stats +complete -c docker -f -n '__fish_docker_no_subcommand' -a stats -d "Display a live stream of one or more containers' resource usage statistics" +complete -c docker -A -f -n '__fish_seen_subcommand_from stats' -l help -d 'Print usage' +complete -c docker -A -f -n '__fish_seen_subcommand_from stats' -l no-stream -d 'Disable streaming stats and only pull the first result' +complete -c docker -A -f -n '__fish_seen_subcommand_from stats' -a '(__fish_print_docker_containers running)' -d "Container" + +# stop +complete -c docker -f -n '__fish_docker_no_subcommand' -a stop -d 'Stop a container' +complete -c docker -A -f -n '__fish_seen_subcommand_from stop' -l help -d 'Print usage' +complete -c docker -A -f -n '__fish_seen_subcommand_from stop' -s t -l time -d 'Number of seconds to wait for the container to stop before killing it. Default is 10 seconds.' +complete -c docker -A -f -n '__fish_seen_subcommand_from stop' -a '(__fish_print_docker_containers running)' -d "Container" + +# tag +complete -c docker -f -n '__fish_docker_no_subcommand' -a tag -d 'Tag an image into a repository' +complete -c docker -A -f -n '__fish_seen_subcommand_from tag' -s f -l force -d 'Force' +complete -c docker -A -f -n '__fish_seen_subcommand_from tag' -l help -d 'Print usage' + +# top +complete -c docker -f -n '__fish_docker_no_subcommand' -a top -d 'Lookup the running processes of a container' +complete -c docker -A -f -n '__fish_seen_subcommand_from top' -l help -d 'Print usage' +complete -c docker -A -f -n '__fish_seen_subcommand_from top' -a '(__fish_print_docker_containers running)' -d "Container" + +#trust +complete -c docker -f -n '__fish_docker_no_subcommand' -a trust -d 'Manage trust on Docker images' +complete -c docker -A -f -n '__fish_seen_subcommand_from trust' -l help -d 'Print usage' + +#trust inspect +complete -c docker -A -f -n '__fish_docker_no_subcommand_trust' -a inspect -d 'Return low-level information about keys and signatures' +complete -c docker -A -f -n '__fish_docker_subcommand_path trust inspect' -l pretty -d 'Print the information in a human friendly format' + +#trust key +complete -c docker -A -f -n '__fish_docker_no_subcommand_trust' -a key -d 'Manage keys for signing Docker images' +complete -c docker -A -f -n '__fish_docker_subcommand_path trust key; and __fish_docker_subcommand_path_without generate load' -a generate -d 'Generate and load a signing key-pair' +complete -c docker -A -f -n '__fish_docker_subcommand_path trust key load' -l dir -d 'Directory to generate key in, defaults to current directory' +complete -c docker -A -f -n '__fish_docker_subcommand_path trust key; and __fish_docker_subcommand_path_without generate load' -a load -d 'Load a private key file for signing' +complete -c docker -A -f -n '__fish_docker_subcommand_path trust key load' -l name -d 'Name for the loaded key (default "signer")' + +#trust revoke +complete -c docker -A -f -n '__fish_docker_no_subcommand_trust' -a revoke -d 'Remove trust for an image' +complete -c docker -A -f -n '__fish_docker_subcommand_path trust revoke' -s y -l yes -d 'Do not prompt for confirmation' + +#trust sign +complete -c docker -A -f -n '__fish_docker_no_subcommand_trust' -a sign -d 'Sign an image' +complete -c docker -A -f -n '__fish_docker_subcommand_path trust sign' -l local -d 'Sign a locally tagged image' + +#trust signer +complete -c docker -A -f -n '__fish_docker_no_subcommand_trust' -a signer -d 'Manage entities who can sign Docker images' +complete -c docker -A -f -n '__fish_docker_subcommand_path trust signer; and __fish_docker_subcommand_path_without add remove' -a add -d 'Add a signer' +complete -c docker -A -f -n '__fish_docker_subcommand_path trust signer; and __fish_docker_subcommand_path_without add remove' -a remove -d 'remove a signer' + +# unpause +complete -c docker -f -n '__fish_docker_no_subcommand' -a unpause -d 'Unpause a paused container' +complete -c docker -A -f -n '__fish_seen_subcommand_from unpause' -a '(__fish_print_docker_containers running)' -d "Container" + +# version +complete -c docker -f -n '__fish_docker_no_subcommand' -a version -d 'Show the Docker version information' +complete -c docker -A -f -n '__fish_seen_subcommand_from version' -s f -l format -d 'Format the output using the given go template' +complete -c docker -A -f -n '__fish_seen_subcommand_from version' -l help -d 'Print usage' + +# wait +complete -c docker -f -n '__fish_docker_no_subcommand' -a wait -d 'Block until a container stops, then print its exit code' +complete -c docker -A -f -n '__fish_seen_subcommand_from wait' -l help -d 'Print usage' +complete -c docker -A -f -n '__fish_seen_subcommand_from wait' -a '(__fish_print_docker_containers running)' -d "Container" diff --git a/.config/fish/completions/kubectl.fish b/.config/fish/completions/kubectl.fish new file mode 100644 index 0000000..ccdfe3d --- /dev/null +++ b/.config/fish/completions/kubectl.fish @@ -0,0 +1,249 @@ + +# Copyright 2016 The Kubernetes Authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# fish completion for kubectl -*- shell-script -*- + +function __kubectl_debug + set -l file "$BASH_COMP_DEBUG_FILE" + if test -n "$file" + echo "$argv" >> $file + end +end + +function __kubectl_perform_completion + __kubectl_debug "Starting __kubectl_perform_completion" + + # Extract all args except the last one + set -l args (commandline -opc) + # Extract the last arg and escape it in case it is a space + set -l lastArg (string escape -- (commandline -ct)) + + __kubectl_debug "args: $args" + __kubectl_debug "last arg: $lastArg" + + # Disable ActiveHelp which is not supported for fish shell + set -l requestComp "KUBECTL_ACTIVE_HELP=0 $args[1] __complete $args[2..-1] $lastArg" + + __kubectl_debug "Calling $requestComp" + set -l results (eval $requestComp 2> /dev/null) + + # Some programs may output extra empty lines after the directive. + # Let's ignore them or else it will break completion. + # Ref: https://github.com/spf13/cobra/issues/1279 + for line in $results[-1..1] + if test (string trim -- $line) = "" + # Found an empty line, remove it + set results $results[1..-2] + else + # Found non-empty line, we have our proper output + break + end + end + + set -l comps $results[1..-2] + set -l directiveLine $results[-1] + + # For Fish, when completing a flag with an = (e.g., -n=) + # completions must be prefixed with the flag + set -l flagPrefix (string match -r -- '-.*=' "$lastArg") + + __kubectl_debug "Comps: $comps" + __kubectl_debug "DirectiveLine: $directiveLine" + __kubectl_debug "flagPrefix: $flagPrefix" + + for comp in $comps + printf "%s%s\n" "$flagPrefix" "$comp" + end + + printf "%s\n" "$directiveLine" +end + +# this function limits calls to __kubectl_perform_completion, by caching the result behind $__kubectl_perform_completion_once_result +function __kubectl_perform_completion_once + __kubectl_debug "Starting __kubectl_perform_completion_once" + + if test -n "$__kubectl_perform_completion_once_result" + __kubectl_debug "Seems like a valid result already exists, skipping __kubectl_perform_completion" + return 0 + end + + set --global __kubectl_perform_completion_once_result (__kubectl_perform_completion) + if test -z "$__kubectl_perform_completion_once_result" + __kubectl_debug "No completions, probably due to a failure" + return 1 + end + + __kubectl_debug "Performed completions and set __kubectl_perform_completion_once_result" + return 0 +end + +# this function is used to clear the $__kubectl_perform_completion_once_result variable after completions are run +function __kubectl_clear_perform_completion_once_result + __kubectl_debug "" + __kubectl_debug "========= clearing previously set __kubectl_perform_completion_once_result variable ==========" + set --erase __kubectl_perform_completion_once_result + __kubectl_debug "Succesfully erased the variable __kubectl_perform_completion_once_result" +end + +function __kubectl_requires_order_preservation + __kubectl_debug "" + __kubectl_debug "========= checking if order preservation is required ==========" + + __kubectl_perform_completion_once + if test -z "$__kubectl_perform_completion_once_result" + __kubectl_debug "Error determining if order preservation is required" + return 1 + end + + set -l directive (string sub --start 2 $__kubectl_perform_completion_once_result[-1]) + __kubectl_debug "Directive is: $directive" + + set -l shellCompDirectiveKeepOrder 32 + set -l keeporder (math (math --scale 0 $directive / $shellCompDirectiveKeepOrder) % 2) + __kubectl_debug "Keeporder is: $keeporder" + + if test $keeporder -ne 0 + __kubectl_debug "This does require order preservation" + return 0 + end + + __kubectl_debug "This doesn't require order preservation" + return 1 +end + + +# This function does two things: +# - Obtain the completions and store them in the global __kubectl_comp_results +# - Return false if file completion should be performed +function __kubectl_prepare_completions + __kubectl_debug "" + __kubectl_debug "========= starting completion logic ==========" + + # Start fresh + set --erase __kubectl_comp_results + + __kubectl_perform_completion_once + __kubectl_debug "Completion results: $__kubectl_perform_completion_once_result" + + if test -z "$__kubectl_perform_completion_once_result" + __kubectl_debug "No completion, probably due to a failure" + # Might as well do file completion, in case it helps + return 1 + end + + set -l directive (string sub --start 2 $__kubectl_perform_completion_once_result[-1]) + set --global __kubectl_comp_results $__kubectl_perform_completion_once_result[1..-2] + + __kubectl_debug "Completions are: $__kubectl_comp_results" + __kubectl_debug "Directive is: $directive" + + set -l shellCompDirectiveError 1 + set -l shellCompDirectiveNoSpace 2 + set -l shellCompDirectiveNoFileComp 4 + set -l shellCompDirectiveFilterFileExt 8 + set -l shellCompDirectiveFilterDirs 16 + + if test -z "$directive" + set directive 0 + end + + set -l compErr (math (math --scale 0 $directive / $shellCompDirectiveError) % 2) + if test $compErr -eq 1 + __kubectl_debug "Received error directive: aborting." + # Might as well do file completion, in case it helps + return 1 + end + + set -l filefilter (math (math --scale 0 $directive / $shellCompDirectiveFilterFileExt) % 2) + set -l dirfilter (math (math --scale 0 $directive / $shellCompDirectiveFilterDirs) % 2) + if test $filefilter -eq 1; or test $dirfilter -eq 1 + __kubectl_debug "File extension filtering or directory filtering not supported" + # Do full file completion instead + return 1 + end + + set -l nospace (math (math --scale 0 $directive / $shellCompDirectiveNoSpace) % 2) + set -l nofiles (math (math --scale 0 $directive / $shellCompDirectiveNoFileComp) % 2) + + __kubectl_debug "nospace: $nospace, nofiles: $nofiles" + + # If we want to prevent a space, or if file completion is NOT disabled, + # we need to count the number of valid completions. + # To do so, we will filter on prefix as the completions we have received + # may not already be filtered so as to allow fish to match on different + # criteria than the prefix. + if test $nospace -ne 0; or test $nofiles -eq 0 + set -l prefix (commandline -t | string escape --style=regex) + __kubectl_debug "prefix: $prefix" + + set -l completions (string match -r -- "^$prefix.*" $__kubectl_comp_results) + set --global __kubectl_comp_results $completions + __kubectl_debug "Filtered completions are: $__kubectl_comp_results" + + # Important not to quote the variable for count to work + set -l numComps (count $__kubectl_comp_results) + __kubectl_debug "numComps: $numComps" + + if test $numComps -eq 1; and test $nospace -ne 0 + # We must first split on \t to get rid of the descriptions to be + # able to check what the actual completion will be. + # We don't need descriptions anyway since there is only a single + # real completion which the shell will expand immediately. + set -l split (string split --max 1 \t $__kubectl_comp_results[1]) + + # Fish won't add a space if the completion ends with any + # of the following characters: @=/:., + set -l lastChar (string sub -s -1 -- $split) + if not string match -r -q "[@=/:.,]" -- "$lastChar" + # In other cases, to support the "nospace" directive we trick the shell + # by outputting an extra, longer completion. + __kubectl_debug "Adding second completion to perform nospace directive" + set --global __kubectl_comp_results $split[1] $split[1]. + __kubectl_debug "Completions are now: $__kubectl_comp_results" + end + end + + if test $numComps -eq 0; and test $nofiles -eq 0 + # To be consistent with bash and zsh, we only trigger file + # completion when there are no other completions + __kubectl_debug "Requesting file completion" + return 1 + end + end + + return 0 +end + +# Since Fish completions are only loaded once the user triggers them, we trigger them ourselves +# so we can properly delete any completions provided by another script. +# Only do this if the program can be found, or else fish may print some errors; besides, +# the existing completions will only be loaded if the program can be found. +if type -q "kubectl" + # The space after the program name is essential to trigger completion for the program + # and not completion of the program name itself. + # Also, we use '> /dev/null 2>&1' since '&>' is not supported in older versions of fish. + complete --do-complete "kubectl " > /dev/null 2>&1 +end + +# Remove any pre-existing completions for the program since we will be handling all of them. +complete -c kubectl -e + +# this will get called after the two calls below and clear the $__kubectl_perform_completion_once_result global +complete -c kubectl -n '__kubectl_clear_perform_completion_once_result' +# The call to __kubectl_prepare_completions will setup __kubectl_comp_results +# which provides the program's completion choices. +# If this doesn't require order preservation, we don't use the -k flag +complete -c kubectl -n 'not __kubectl_requires_order_preservation && __kubectl_prepare_completions' -f -a '$__kubectl_comp_results' +# otherwise we use the -k flag +complete -k -c kubectl -n '__kubectl_requires_order_preservation && __kubectl_prepare_completions' -f -a '$__kubectl_comp_results' diff --git a/.config/fish/conf.d/brew.fish b/.config/fish/conf.d/brew.fish new file mode 100644 index 0000000..accb2ce --- /dev/null +++ b/.config/fish/conf.d/brew.fish @@ -0,0 +1,8 @@ +function brew + command /bin/zsh -c "brew $argv" + echo "Updating Brewfile..." + command /bin/zsh -c "brew bundle dump --force --file=~/.vvconfig/Brewfile" +end +function brew_install + brew bundle --file="~/.vvconfig/Brewfile" +end diff --git a/.config/fish/conf.d/ls.fish b/.config/fish/conf.d/ls.fish new file mode 100644 index 0000000..03b411d --- /dev/null +++ b/.config/fish/conf.d/ls.fish @@ -0,0 +1,9 @@ +function l + command ls --color=auto -l $argv +end +function la + command ls --color=auto -la $argv +end +function lg + command ls --color=auto -la | grep $argv[1] +end diff --git a/.config/fish/conf.d/omf.fish b/.config/fish/conf.d/omf.fish new file mode 100644 index 0000000..3e0f6d6 --- /dev/null +++ b/.config/fish/conf.d/omf.fish @@ -0,0 +1,7 @@ +# Path to Oh My Fish install. +set -q XDG_DATA_HOME + and set -gx OMF_PATH "$XDG_DATA_HOME/omf" + or set -gx OMF_PATH "$HOME/.local/share/omf" + +# Load Oh My Fish configuration. +source $OMF_PATH/init.fish diff --git a/.config/fish/conf.d/quick-ssh.fish b/.config/fish/conf.d/quick-ssh.fish new file mode 100644 index 0000000..b499de6 --- /dev/null +++ b/.config/fish/conf.d/quick-ssh.fish @@ -0,0 +1,3 @@ +function gts + ssh 'ubuntu@git.marsway.red' +end diff --git a/.config/fish/conf.d/vim.fish b/.config/fish/conf.d/vim.fish new file mode 100644 index 0000000..08f92a1 --- /dev/null +++ b/.config/fish/conf.d/vim.fish @@ -0,0 +1,3 @@ +function v + command nvim $argv +end diff --git a/.config/fish/conf.d/z.fish b/.config/fish/conf.d/z.fish new file mode 100644 index 0000000..34b3557 --- /dev/null +++ b/.config/fish/conf.d/z.fish @@ -0,0 +1,4 @@ +lua ~/.vvconfig/scripts/z.lua/z.lua --init fish | source +abbr -a zs 'z -c' +abbr -a zb 'z -b' +abbr -a zbi 'z -b -i' diff --git a/.config/fish/config.fish b/.config/fish/config.fish new file mode 100644 index 0000000..3b83a5d --- /dev/null +++ b/.config/fish/config.fish @@ -0,0 +1,6 @@ +if status is-interactive + # Commands to run in interactive sessions can go here + if ! contains -- /opt/homebrew/bin $fish_user_paths + fish_add_path /opt/homebrew/bin + end +end diff --git a/.config/fish/fish_variables b/.config/fish/fish_variables new file mode 100644 index 0000000..84af588 --- /dev/null +++ b/.config/fish/fish_variables @@ -0,0 +1,104 @@ +# This file contains fish universal variable definitions. +# VERSION: 3.0 +SETUVAR THEME_EDEN_PROMPT_CHAR:\u00bb +SETUVAR --export ZLUA_LUAEXE:/opt/homebrew/bin/lua +SETUVAR --export ZLUA_SCRIPT:/Users/marsway/\x2evvconfig/scripts/z\x2elua/z\x2elua +SETUVAR _ZL_DATA:/Users/marsway/\x2elocal/share/zlua/zlua\x2etxt +SETUVAR _ZL_DATA_DIR:/Users/marsway/\x2elocal/share/zlua +SETUVAR __fish_initialized:3800 +SETUVAR _fisher_upgraded_to_4_4:\x1d +SETUVAR fish_color_autosuggestion:brblack +SETUVAR fish_color_cancel:\x2dr +SETUVAR fish_color_command:normal +SETUVAR fish_color_comment:red +SETUVAR fish_color_cwd:green +SETUVAR fish_color_cwd_root:red +SETUVAR fish_color_end:green +SETUVAR fish_color_error:brred +SETUVAR fish_color_escape:brcyan +SETUVAR fish_color_history_current:\x2d\x2dbold +SETUVAR fish_color_host:normal +SETUVAR fish_color_host_remote:yellow +SETUVAR fish_color_normal:normal +SETUVAR fish_color_operator:brcyan +SETUVAR fish_color_param:cyan +SETUVAR fish_color_quote:yellow +SETUVAR fish_color_redirection:cyan\x1e\x2d\x2dbold +SETUVAR fish_color_search_match:white\x1e\x2d\x2dbackground\x3dbrblack +SETUVAR fish_color_selection:white\x1e\x2d\x2dbold\x1e\x2d\x2dbackground\x3dbrblack +SETUVAR fish_color_status:red +SETUVAR fish_color_user:brgreen +SETUVAR fish_color_valid_path:\x2d\x2dunderline +SETUVAR fish_key_bindings:fish_default_key_bindings +SETUVAR fish_pager_color_completion:normal +SETUVAR fish_pager_color_description:yellow\x1e\x2di +SETUVAR fish_pager_color_prefix:normal\x1e\x2d\x2dbold\x1e\x2d\x2dunderline +SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan +SETUVAR fish_pager_color_selected_background:\x2dr +SETUVAR fish_user_paths:/opt/homebrew/bin +SETUVAR pure_begin_prompt_with_current_directory:true +SETUVAR pure_check_for_new_release:false +SETUVAR pure_color_at_sign:pure_color_mute +SETUVAR pure_color_aws_profile:pure_color_warning +SETUVAR pure_color_command_duration:pure_color_warning +SETUVAR pure_color_current_directory:pure_color_primary +SETUVAR pure_color_danger:red +SETUVAR pure_color_dark:black +SETUVAR pure_color_git_branch:pure_color_mute +SETUVAR pure_color_git_dirty:pure_color_mute +SETUVAR pure_color_git_stash:pure_color_info +SETUVAR pure_color_git_unpulled_commits:pure_color_info +SETUVAR pure_color_git_unpushed_commits:pure_color_info +SETUVAR pure_color_hostname:pure_color_mute +SETUVAR pure_color_info:cyan +SETUVAR pure_color_jobs:pure_color_normal +SETUVAR pure_color_k8s_context:pure_color_success +SETUVAR pure_color_k8s_namespace:pure_color_primary +SETUVAR pure_color_k8s_prefix:pure_color_info +SETUVAR pure_color_light:white +SETUVAR pure_color_mute:brblack +SETUVAR pure_color_nixdevshell_prefix:pure_color_info +SETUVAR pure_color_nixdevshell_symbol:pure_color_mute +SETUVAR pure_color_normal:normal +SETUVAR pure_color_prefix_root_prompt:pure_color_danger +SETUVAR pure_color_primary:blue +SETUVAR pure_color_prompt_on_error:pure_color_danger +SETUVAR pure_color_prompt_on_success:pure_color_success +SETUVAR pure_color_success:magenta +SETUVAR pure_color_system_time:pure_color_mute +SETUVAR pure_color_username_normal:pure_color_mute +SETUVAR pure_color_username_root:pure_color_light +SETUVAR pure_color_virtualenv:pure_color_mute +SETUVAR pure_color_warning:yellow +SETUVAR pure_enable_aws_profile:true +SETUVAR pure_enable_container_detection:true +SETUVAR pure_enable_git:true +SETUVAR pure_enable_k8s:false +SETUVAR pure_enable_nixdevshell:false +SETUVAR pure_enable_single_line_prompt:false +SETUVAR pure_enable_virtualenv:true +SETUVAR pure_reverse_prompt_symbol_in_vimode:true +SETUVAR pure_separate_prompt_on_error:false +SETUVAR pure_shorten_prompt_current_directory_length:0 +SETUVAR pure_shorten_window_title_current_directory_length:0 +SETUVAR pure_show_jobs:false +SETUVAR pure_show_prefix_root_prompt:false +SETUVAR pure_show_subsecond_command_duration:false +SETUVAR pure_show_system_time:false +SETUVAR pure_symbol_aws_profile_prefix: +SETUVAR pure_symbol_container_prefix: +SETUVAR pure_symbol_git_dirty:\x2a +SETUVAR pure_symbol_git_stash:\u2261 +SETUVAR pure_symbol_git_unpulled_commits:\u21e3 +SETUVAR pure_symbol_git_unpushed_commits:\u21e1 +SETUVAR pure_symbol_k8s_prefix:\u2638 +SETUVAR pure_symbol_nixdevshell_prefix:\u2744\ufe0f +SETUVAR pure_symbol_prefix_root_prompt:\x23 +SETUVAR pure_symbol_prompt:\U0001f3c2 +SETUVAR pure_symbol_reverse_prompt:\u276e +SETUVAR pure_symbol_ssh_prefix: +SETUVAR pure_symbol_title_bar_separator:\x2d +SETUVAR pure_symbol_virtualenv_prefix: +SETUVAR pure_threshold_command_duration:5 +SETUVAR pure_truncate_prompt_current_directory_keeps:\x2d1 +SETUVAR pure_truncate_window_title_current_directory_keeps:\x2d1 diff --git a/.config/fish/functions/!!.fish b/.config/fish/functions/!!.fish new file mode 100644 index 0000000..0776b46 --- /dev/null +++ b/.config/fish/functions/!!.fish @@ -0,0 +1,3 @@ +function !! + eval command sudo $history[1] +end diff --git a/.config/fish/functions/backup_forgejo.fish b/.config/fish/functions/backup_forgejo.fish new file mode 100755 index 0000000..cf2b308 --- /dev/null +++ b/.config/fish/functions/backup_forgejo.fish @@ -0,0 +1,9 @@ +function backup_forgejo + set -l userdir "/Users/$USER/" + echo "Start backing up..." > $userdir/Documents/forgejo_backup/log + scp ubuntu@git.marsway.red:/home/ubuntu/forgejo.zip "$userdir/Documents/forgejo_backup/$(date +%Y%m%d).zip" + + echo "Deleting old backs..." + find "$userdir/Documents/forgejo_backup/" -name "[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9].zip" -mtime +6 -ls >> $userdir/Documents/forgejo_backup/log + find "$userdir/Documents/forgejo_backup/" -name "[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9].zip" -mtime +6 -delete +end diff --git a/.config/fish/functions/du.fish b/.config/fish/functions/du.fish new file mode 100644 index 0000000..75783b1 --- /dev/null +++ b/.config/fish/functions/du.fish @@ -0,0 +1,3 @@ +function du + command du -h -d 1 $argv[1] +end diff --git a/.config/fish/functions/fish_greeting.fish b/.config/fish/functions/fish_greeting.fish new file mode 100644 index 0000000..9918ffc --- /dev/null +++ b/.config/fish/functions/fish_greeting.fish @@ -0,0 +1,3 @@ +function fish_greeting + command neofetch +end diff --git a/.config/fish/functions/fish_title.fish b/.config/fish/functions/fish_title.fish new file mode 100644 index 0000000..aa6b4a4 --- /dev/null +++ b/.config/fish/functions/fish_title.fish @@ -0,0 +1,3 @@ +function fish_title + prompt_pwd +end diff --git a/.config/fish/functions/g.fish b/.config/fish/functions/g.fish new file mode 100644 index 0000000..45a2583 --- /dev/null +++ b/.config/fish/functions/g.fish @@ -0,0 +1,3 @@ +function g + command git $argv +end diff --git a/.config/fish/functions/mc.fish b/.config/fish/functions/mc.fish new file mode 100644 index 0000000..9bfdb67 --- /dev/null +++ b/.config/fish/functions/mc.fish @@ -0,0 +1,4 @@ +function mc + mkdir -p $argv[1] + cd $argv[1] +end diff --git a/.config/fish/functions/p.fish b/.config/fish/functions/p.fish new file mode 100644 index 0000000..3e3577b --- /dev/null +++ b/.config/fish/functions/p.fish @@ -0,0 +1,8 @@ +function p + if contains -- -d $argv + # 如果参数中包含 -d + set -u all_proxy + else + set -x all_proxy "localhost:7897" + end +end diff --git a/.config/fish/functions/pd.fish b/.config/fish/functions/pd.fish new file mode 100644 index 0000000..aa281b2 --- /dev/null +++ b/.config/fish/functions/pd.fish @@ -0,0 +1,3 @@ +function pd + command ~/.vvconfig/scripts/pd-crack.sh +end diff --git a/.config/fish/functions/sibelius_crack.fish b/.config/fish/functions/sibelius_crack.fish new file mode 100644 index 0000000..dfac6a2 --- /dev/null +++ b/.config/fish/functions/sibelius_crack.fish @@ -0,0 +1,3 @@ +function sibelius_crack + command ~/.vvconfig/scripts/Seblius_2024.3_Trail_Reset.command +end diff --git a/.config/fish/functions/tree.fish b/.config/fish/functions/tree.fish new file mode 100644 index 0000000..ef7ec67 --- /dev/null +++ b/.config/fish/functions/tree.fish @@ -0,0 +1,3 @@ +function tree + command tree -C $argv +end diff --git a/.config/mackup/.config/fish/completions/docker.fish b/.config/mackup/.config/fish/completions/docker.fish new file mode 100644 index 0000000..10d72f2 --- /dev/null +++ b/.config/mackup/.config/fish/completions/docker.fish @@ -0,0 +1,587 @@ +# docker.fish - docker completions for fish shell +# +# This file is generated by gen_docker_fish_completions.py from: +# https://github.com/barnybug/docker-fish-completion +# +# To install the completions: +# mkdir -p ~/.config/fish/completions +# cp docker.fish ~/.config/fish/completions +# +# Completion supported: +# - parameters +# - commands +# - containers +# - images +# - repositories + +function __fish_docker_no_subcommand --description 'Test if docker has yet to be given the subcommand' + for i in (commandline -opc) + if contains -- $i attach build commit cp create diff events exec export history images import info inspect kill load login logout logs network pause port ps pull push rename restart rm rmi run save search start stop tag top trust unpause version wait stats + return 1 + end + end + return 0 +end + +function __fish_print_docker_containers --description 'Print a list of docker containers' -a select + switch $select + case running + docker ps -a --no-trunc --filter status=running --format "{{.ID}}\n{{.Names}}" | tr ',' '\n' + case stopped + docker ps -a --no-trunc --filter status=exited --format "{{.ID}}\n{{.Names}}" | tr ',' '\n' + case all + docker ps -a --no-trunc --format "{{.ID}}\n{{.Names}}" | tr ',' '\n' + end +end + +function __fish_print_docker_networks --description 'Print a list of docker networks' + docker network ls --format "{{.ID}}\n{{.Name}}" | tr ',' '\n' +end + + +function __fish_docker_no_subcommand_trust --description 'Test if docker has yet to be given the trust subcommand' + if __fish_seen_subcommand_from trust + for i in (commandline -opc) + if contains -- $i inspect key revoke sign signer + return 1 + end + end + return 0 + end + return 1 +end + +function __fish_docker_subcommand_path --description 'Test if command has all arguments in any order' + set -l cmd (commandline -poc) + set -e cmd[1] + for sub in $argv + if not contains -- $sub $cmd + return 1 + end + end + return 0 +end + +function __fish_docker_subcommand_path_without --description 'Test if command has all arguments in any order' + set -l cmd (commandline -poc) + set -e cmd[1] + for sub in $argv + if contains -- $sub $cmd + return 1 + end + end + return 0 +end + +function __fish_print_docker_images --description 'Print a list of docker images' + docker images --format "{{.Repository}}:{{.Tag}}" | command grep -v '' +end + +function __fish_print_docker_repositories --description 'Print a list of docker repositories' + docker images --format "{{.Repository}}" | command grep -v '' | command sort | command uniq +end + +# common options +complete -c docker -f -n '__fish_docker_no_subcommand' -s b -l bridge -d 'Attach containers to a pre-existing network bridge' +complete -c docker -f -n '__fish_docker_no_subcommand' -l bip -d "Use this CIDR notation address for the network bridge's IP, not compatible with -b" +complete -c docker -f -n '__fish_docker_no_subcommand' -s D -l debug -d 'Enable debug mode' +complete -c docker -f -n '__fish_docker_no_subcommand' -s d -l daemon -d 'Enable daemon mode' +complete -c docker -f -n '__fish_docker_no_subcommand' -l dns -d 'Force Docker to use specific DNS servers' +complete -c docker -f -n '__fish_docker_no_subcommand' -l dns-opt -d 'Force Docker to use specific DNS options' +complete -c docker -f -n '__fish_docker_no_subcommand' -l dns-search -d 'Force Docker to use specific DNS search domains' +complete -c docker -f -n '__fish_docker_no_subcommand' -l exec-opt -d 'Set runtime execution options' +complete -c docker -f -n '__fish_docker_no_subcommand' -l fixed-cidr -d 'IPv4 subnet for fixed IPs (e.g. 10.20.0.0/16)' +complete -c docker -f -n '__fish_docker_no_subcommand' -l fixed-cidr-v6 -d 'IPv6 subnet for fixed IPs (e.g.: 2001:a02b/48)' +complete -c docker -f -n '__fish_docker_no_subcommand' -s G -l group -d 'Group to assign the unix socket specified by -H when running in daemon mode' +complete -c docker -f -n '__fish_docker_no_subcommand' -s g -l graph -d 'Path to use as the root of the Docker runtime' +complete -c docker -f -n '__fish_docker_no_subcommand' -s H -l host -d 'The socket(s) to bind to in daemon mode or connect to in client mode, specified using one or more tcp://host:port, unix:///path/to/socket, fd://* or fd://socketfd.' +complete -c docker -f -n '__fish_docker_no_subcommand' -s h -l help -d 'Print usage' +complete -c docker -f -n '__fish_docker_no_subcommand' -l icc -d 'Allow unrestricted inter-container and Docker daemon host communication' +complete -c docker -f -n '__fish_docker_no_subcommand' -l insecure-registry -d 'Enable insecure communication with specified registries (no certificate verification for HTTPS and enable HTTP fallback) (e.g., localhost:5000 or 10.20.0.0/16)' +complete -c docker -f -n '__fish_docker_no_subcommand' -l ip -d 'Default IP address to use when binding container ports' +complete -c docker -f -n '__fish_docker_no_subcommand' -l ip-forward -d 'Enable net.ipv4.ip_forward and IPv6 forwarding if --fixed-cidr-v6 is defined. IPv6 forwarding may interfere with your existing IPv6 configuration when using Router Advertisement.' +complete -c docker -f -n '__fish_docker_no_subcommand' -l ip-masq -d "Enable IP masquerading for bridge's IP range" +complete -c docker -f -n '__fish_docker_no_subcommand' -l iptables -d "Enable Docker's addition of iptables rules" +complete -c docker -f -n '__fish_docker_no_subcommand' -l ipv6 -d 'Enable IPv6 networking' +complete -c docker -f -n '__fish_docker_no_subcommand' -s l -l log-level -d 'Set the logging level ("debug", "info", "warn", "error", "fatal")' +complete -c docker -f -n '__fish_docker_no_subcommand' -l label -d 'Set key=value labels to the daemon (displayed in `docker info`)' +complete -c docker -f -n '__fish_docker_no_subcommand' -l mtu -d 'Set the containers network MTU' +complete -c docker -f -n '__fish_docker_no_subcommand' -s p -l pidfile -d 'Path to use for daemon PID file' +complete -c docker -f -n '__fish_docker_no_subcommand' -l registry-mirror -d 'Specify a preferred registry mirror' +complete -c docker -f -n '__fish_docker_no_subcommand' -s s -l storage-driver -d 'Force the Docker runtime to use a specific storage driver' +complete -c docker -f -n '__fish_docker_no_subcommand' -l selinux-enabled -d 'Enable selinux support. SELinux does not presently support the BTRFS storage driver' +complete -c docker -f -n '__fish_docker_no_subcommand' -l storage-opt -d 'Set storage driver options' +complete -c docker -f -n '__fish_docker_no_subcommand' -l tls -d 'Use TLS; implied by --tlsverify' +complete -c docker -f -n '__fish_docker_no_subcommand' -l tlscacert -d 'Trust only remotes providing a certificate signed by the CA given here' +complete -c docker -f -n '__fish_docker_no_subcommand' -l tlscert -d 'Path to TLS certificate file' +complete -c docker -f -n '__fish_docker_no_subcommand' -l tlskey -d 'Path to TLS key file' +complete -c docker -f -n '__fish_docker_no_subcommand' -l tlsverify -d 'Use TLS and verify the remote (daemon: verify client, client: verify daemon)' +complete -c docker -f -n '__fish_docker_no_subcommand' -s v -l version -d 'Print version information and quit' + +# subcommands +# attach +complete -c docker -f -n '__fish_docker_no_subcommand' -a attach -d 'Attach local standard input, output, and error streams to a running container' +complete -c docker -A -f -n '__fish_seen_subcommand_from attach' -l detach-keys -d 'Override the key sequence for detaching a container' +complete -c docker -A -f -n '__fish_seen_subcommand_from attach' -l help -d 'Print usage' +complete -c docker -A -f -n '__fish_seen_subcommand_from attach' -l no-stdin -d 'Do not attach STDIN' +complete -c docker -A -f -n '__fish_seen_subcommand_from attach' -l sig-proxy -d 'Proxy all received signals to the process' +complete -c docker -A -f -n '__fish_seen_subcommand_from attach' -a '(__fish_print_docker_containers running)' -d "Container" + +# build +complete -c docker -f -n '__fish_docker_no_subcommand' -a build -d 'Build an image from a Dockerfile' +complete -c docker -A -f -n '__fish_seen_subcommand_from build' -l add-host -d 'Add a custom host-to-IP mapping (host:ip)' +complete -c docker -A -f -n '__fish_seen_subcommand_from build' -l build-arg -d 'Set build-time variables' +complete -c docker -A -f -n '__fish_seen_subcommand_from build' -l cache-from -d 'Images to consider as cache sources' +complete -c docker -A -f -n '__fish_seen_subcommand_from build' -l cgroup-parent -d 'Optional parent cgroup for the container' +complete -c docker -A -f -n '__fish_seen_subcommand_from build' -l compress -d 'Compress the build context using gzip' +complete -c docker -A -f -n '__fish_seen_subcommand_from build' -l cpu-period -d 'Limit the CPU CFS (Completely Fair Scheduler) period' +complete -c docker -A -f -n '__fish_seen_subcommand_from build' -l cpu-quota -d 'Limit the CPU CFS (Completely Fair Scheduler) quota' +complete -c docker -A -f -n '__fish_seen_subcommand_from build' -s c -l cpu-shares -d 'CPU shares (relative weight)' +complete -c docker -A -f -n '__fish_seen_subcommand_from build' -l cpuset-cpus -d 'CPUs in which to allow execution (0-3, 0,1)' +complete -c docker -A -f -n '__fish_seen_subcommand_from build' -l cpuset-mems -d 'MEMs in which to allow execution (0-3, 0,1)' +complete -c docker -A -f -n '__fish_seen_subcommand_from build' -l disable-content-trust -d 'Skip image verification' +complete -c docker -A -f -n '__fish_seen_subcommand_from build' -s f -l file -d "Name of the Dockerfile (Default is ‘PATH/Dockerfile’)" +complete -c docker -A -f -n '__fish_seen_subcommand_from build' -l force-rm -d 'Always remove intermediate containers' +complete -c docker -A -f -n '__fish_seen_subcommand_from build' -l help -d 'Print usage' +complete -c docker -A -f -n '__fish_seen_subcommand_from build' -l iddfile -d 'Write the image ID to the file' +complete -c docker -A -f -n '__fish_seen_subcommand_from build' -l isolation -d 'Container isolation technology' +complete -c docker -A -f -n '__fish_seen_subcommand_from build' -l label -d 'Set metadata for an image' +complete -c docker -A -f -n '__fish_seen_subcommand_from build' -s m -l memory -d 'Memory limit' +complete -c docker -A -f -n '__fish_seen_subcommand_from build' -l memory-swap -d 'Swap limit equal to memory plus swap: ‘-1’ to enable unlimited swap' +complete -c docker -A -f -n '__fish_seen_subcommand_from build' -l network -d 'Set the networking mode for the RUN instructions during build' +complete -c docker -A -f -n '__fish_seen_subcommand_from build' -l no-cache -d 'Do not use cache when building the image' +complete -c docker -A -f -n '__fish_seen_subcommand_from build' -l pull -d 'Always attempt to pull a newer version of the image' +complete -c docker -A -f -n '__fish_seen_subcommand_from build' -s q -l quiet -d 'Suppress the build output and print image ID on success' +complete -c docker -A -f -n '__fish_seen_subcommand_from build' -l rm -d 'Remove intermediate containers after a successful build' +complete -c docker -A -f -n '__fish_seen_subcommand_from build' -l security-opt -d 'Security options' +complete -c docker -A -f -n '__fish_seen_subcommand_from build' -l shm-size -d 'Size of /dev/shm' +complete -c docker -A -f -n '__fish_seen_subcommand_from build' -s t -l tag -d 'Name and optionally a tag in the ‘name:tag’ format' +complete -c docker -A -f -n '__fish_seen_subcommand_from build' -l target -d 'Set the target build stage to build' +complete -c docker -A -f -n '__fish_seen_subcommand_from build' -l ulimit -d 'Ulimit options' + +# commit +complete -c docker -f -n '__fish_docker_no_subcommand' -a commit -d "Create a new image from a container's changes" +complete -c docker -A -f -n '__fish_seen_subcommand_from commit' -s a -l author -d 'Author (e.g., "John Hannibal Smith ")' +complete -c docker -A -f -n '__fish_seen_subcommand_from commit' -s c -l change -d 'Apply Dockerfile instruction to the created image' +complete -c docker -A -f -n '__fish_seen_subcommand_from commit' -l help -d 'Print usage' +complete -c docker -A -f -n '__fish_seen_subcommand_from commit' -s m -l message -d 'Commit message' +complete -c docker -A -f -n '__fish_seen_subcommand_from commit' -s p -l pause -d 'Pause container during commit' +complete -c docker -A -f -n '__fish_seen_subcommand_from commit' -a '(__fish_print_docker_containers all)' -d "Container" + +# cp +complete -c docker -f -n '__fish_docker_no_subcommand' -a cp -d "Copy files/folders between a container and the local filesystem" +complete -c docker -A -f -n '__fish_seen_subcommand_from cp' -s a -l archive -d 'Archive mode (copy all uid/gid information)' +complete -c docker -A -f -n '__fish_seen_subcommand_from cp' -s L -l follow-link -d 'Always follow symbol link in SRC_PATH' +complete -c docker -A -f -n '__fish_seen_subcommand_from cp' -l help -d 'Print usage' + +# create +complete -c docker -f -n '__fish_docker_no_subcommand' -a create -d 'Create a new container' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l add-host -d 'Add a custom host-to-IP mapping (host:ip)' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l annotation -d 'Add an annotation to the container (passed through to the OCI runtime)' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -s a -l attach -d 'Attach to STDIN, STDOUT or STDERR.' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l blkio-weight -d 'Block IO (relative weight), between 10 and 1000, or 0 to disable (default 0)' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l blkio-weight-device -d 'Block IO weight (relative device weight)' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l cap-add -d 'Add Linux capabilities' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l cap-drop -d 'Drop Linux capabilities' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l cgroupns -d 'Cgroup namespace mode to use' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l cgroup-parent -d 'Optional parent cgroup for the container' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l cidfile -d 'Write the container ID to the file' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l cpu-count -d 'CPU count (Windows only)' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l cpu-percent -d 'CPU percent (Windows only)' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l cpu-period -d 'Limit CPU CFS (Completely Fair Scheduler) period' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l cpu-quota -d 'Limit CPU CFS (Completely Fair Scheduler) quota' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l cpu-rt-period -d 'Limit CPU real-time period in microseconds' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l cpu-rt-runtime -d 'Limit CPU real-time runtime in microseconds' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l cpu-shares -d 'CPU shares (relative weight)' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l cpus -d 'Number of CPUs' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l cpuset-cpus -d 'CPUs in which to allow execution (0-3, 0,1)' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l cpuset-mems -d 'MEMs in which to allow execution (0-3, 0,1)' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l device -d 'Add a host device to the container (e.g. --device=/dev/sdc:/dev/xvdc:rwm)' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l device-cgroup-rule -d 'Add a rule to the cgroup allowed devices list' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l device-read-bps -d 'Limit read rate (bytes per second) from a device' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l device-read-iops -d 'Limit read rate (IO per second) from a device' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l device-write-bps -d 'Limit write rate (bytes per second) to a device' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l device-write-iops -d 'Limit write rate (IO per second) to a device' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l disable-content-trust -d 'Skip image verification' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l dns -d 'Set custom DNS servers' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l dns-opt -d 'Set DNS options' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l dns-option -d 'Set DNS options' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l dns-search -d 'Set custom DNS search domains' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -s e -l env -d 'Set environment variables' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l entrypoint -d 'Overwrite the default ENTRYPOINT of the image' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l env-file -d 'Read in a line delimited file of environment variables' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l expose -d 'Expose a port or a range of ports' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l group-add -d 'Add additional groups to join' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l health-cmd -d 'Command to run to check health' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l health-interval -d 'Time between running the check (ms|s|m|h) (default 0s)' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l health-retries -d 'Consecutive failures needed to report unhealthy' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l health-start-period -d 'Start period for the container to initialize before starting health-retries countdown (ms|s|m|h) (default 0s)' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l health-timeout -d 'Maximum time to allow one check to run (ms|s|m|h) (default 0s)' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l help -d 'Print usage' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -s h -l hostname -d 'Container host name' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l init -d 'Run an init inside the container that forwards signals and reaps processes' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -s i -l interactive -d 'Keep STDIN open even if not attached' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l io-maxbandwidth -d 'Maximum IO bandwidth limit for the system drive (Windows only)' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l io-maxiops -d 'Maximum IOps limit for the system drive (Windows only)' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l ip -d 'IPv4 address (e.g., 172.30.100.104)' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l ip6 -d 'IPv6 address (e.g., 2001:db8::33)' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l ipc -d 'IPC mode to use' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l isolation -d 'Container isolation technology' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l kernel-memory -d 'Kernel memory limit' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -s l -l label -d 'Set meta data on a container' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l label-file -d 'Read in a line delimited file of labels' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l link -d 'Add link to another container' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l link-local-ip -d 'Container IPv4/IPv6 link-local addresses' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l log-driver -d 'Logging driver for the container' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l log-opt -d 'Log driver options' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l mac-address -d 'Container MAC address (e.g., 92:d0:c6:0a:29:33)' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -s m -l memory -d 'Memory limit' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l memory-reservation -d 'Memory soft limit' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l memory-swap -d 'Swap limit equal to memory plus swap: ‘-1’ to enable unlimited swap' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l memory-swappiness -d 'Tune container memory swappiness (0 to 100)' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l mount -d 'Attach a filesystem mount to the container' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l name -d 'Assign a name to the container' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -s net -l network -d 'Connect a container to a network' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -s net-alias -l network-alias -d 'Add network-scoped alias for the container' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l no-healthcheck -d 'Disable any container-specified HEALTHCHECK' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l oom-kill-disable -d 'Disable OOM Killer' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l oom-score-adj -d 'Tune host’s OOM preferences (-1000 to 1000)' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l pid -d 'PID namespace to use' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l pids-limit -d 'Tune container pids limit (set -1 for unlimited )' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l privileged -d 'Give extended privileges to this container' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -s p -l publish -d "Publish a container’s port(s) to the host" +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -s P -l publish-all -d 'Publish all exposed ports to random ports' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l read-only -d "Mount the container's root filesystem as read only" +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l restart -d 'Restart policy to apply when a container exits' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l rm -d 'Automatically remove the container when it exits' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l runtime -d 'Runtime to use for this container' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l security-opt -d 'Security Options' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l shm-size -d 'Size of /dev/shm' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l stop-signal -d 'Signal to stop a container' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l stop-timeout -d 'Timeout (in seconds) to stop a container' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l storage-opt -d 'Storage driver options for the container' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l sysctl -d 'Sysctl options' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l tmpfs -d 'Mount a tmpfs directory' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -s t -l tty -d 'Allocate a pseudo-TTY' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l ulimit -d 'Ulimit options' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -s u -l user -d ' Username or UID (format: [:])' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l userns -d 'User namespace to use' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l uts -d 'UTS namespace to use' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -s v -l volume -d 'Bind mount a volume' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l volume-driver -d 'Optional volume driver for the container' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l volumes-from -d 'Mount volumes from the specified container(s)' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -s w -l workdir -d 'Working directory inside the container' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -a '(__fish_print_docker_images)' -d "Image" + +# diff +complete -c docker -f -n '__fish_docker_no_subcommand' -a diff -d "Inspect changes on a container's filesystem" +complete -c docker -A -f -n '__fish_seen_subcommand_from diff' -l help -d 'Print usage' +complete -c docker -A -f -n '__fish_seen_subcommand_from diff' -a '(__fish_print_docker_containers all)' -d "Container" + +# events +complete -c docker -f -n '__fish_docker_no_subcommand' -a events -d 'Get real time events from the server' +complete -c docker -A -f -n '__fish_seen_subcommand_from events' -s f -l filter -d "Filter output based on conditions provided" +complete -c docker -A -f -n '__fish_seen_subcommand_from events' -l format -d 'Format the output using the given Go template' +complete -c docker -A -f -n '__fish_seen_subcommand_from events' -l help -d 'Print usage' +complete -c docker -A -f -n '__fish_seen_subcommand_from events' -l since -d 'Show all events created since timestamp' +complete -c docker -A -f -n '__fish_seen_subcommand_from events' -l until -d 'Stream events until this timestamp' + +# exec +complete -c docker -f -n '__fish_docker_no_subcommand' -a exec -d 'Execute a command in a running container' +complete -c docker -A -f -n '__fish_seen_subcommand_from exec' -s d -l detach -d 'Detached mode: run command in the background' +complete -c docker -A -f -n '__fish_seen_subcommand_from exec' -l detach-keys -d 'Override the key sequence for detaching a container' +complete -c docker -A -f -n '__fish_seen_subcommand_from exec' -s e -l env -d 'Set environment variables' +complete -c docker -A -f -n '__fish_seen_subcommand_from exec' -l help -d 'Print usage' +complete -c docker -A -f -n '__fish_seen_subcommand_from exec' -s i -l interactive -d 'Keep STDIN open even if not attached' +complete -c docker -A -f -n '__fish_seen_subcommand_from exec' -l privileged -d 'Give extended privileges to the command' +complete -c docker -A -f -n '__fish_seen_subcommand_from exec' -s t -l tty -d 'Allocate a pseudo-TTY' +complete -c docker -A -f -n '__fish_seen_subcommand_from exec' -s u -l user -d 'Username or UID (format: [:])' +complete -c docker -A -f -n '__fish_seen_subcommand_from exec' -s w -l workdir -d 'Working directory inside the container' +complete -c docker -A -f -n '__fish_seen_subcommand_from exec' -a '(__fish_print_docker_containers running)' -d "Container" + +# export +complete -c docker -f -n '__fish_docker_no_subcommand' -a export -d 'Stream the contents of a container as a tar archive' +complete -c docker -A -f -n '__fish_seen_subcommand_from export' -l help -d 'Print usage' +complete -c docker -A -f -n '__fish_seen_subcommand_from export' -s o -l output -d 'Write to a file, instead of STDOUT' +complete -c docker -A -f -n '__fish_seen_subcommand_from export' -a '(__fish_print_docker_containers all)' -d "Container" + +# history +complete -c docker -f -n '__fish_docker_no_subcommand' -a history -d 'Show the history of an image' +complete -c docker -A -f -n '__fish_seen_subcommand_from history' -l format -d 'Format the output using the given Go template' +complete -c docker -A -f -n '__fish_seen_subcommand_from history' -l help -d 'Print usage' +complete -c docker -A -f -n '__fish_seen_subcommand_from history' -s H -l human -d 'Print sizes and dates in human readable format' +complete -c docker -A -f -n '__fish_seen_subcommand_from history' -l no-trunc -d "Don't truncate output" +complete -c docker -A -f -n '__fish_seen_subcommand_from history' -s q -l quiet -d 'Only show image IDs' +complete -c docker -A -f -n '__fish_seen_subcommand_from history' -a '(__fish_print_docker_images)' -d "Image" + +# images +complete -c docker -f -n '__fish_docker_no_subcommand' -a images -d 'List images' +complete -c docker -A -f -n '__fish_seen_subcommand_from images' -s a -l all -d 'Show all images (default hides intermediate images)' +complete -c docker -A -f -n '__fish_seen_subcommand_from images' -l digests -d 'Show digests' +complete -c docker -A -f -n '__fish_seen_subcommand_from images' -s f -l filter -d 'Filter output based on conditions provided' +complete -c docker -A -f -n '__fish_seen_subcommand_from images' -l format -d 'Format the output using the given Go template' +complete -c docker -A -f -n '__fish_seen_subcommand_from images' -l help -d 'Print usage' +complete -c docker -A -f -n '__fish_seen_subcommand_from images' -l no-trunc -d "Don't truncate output" +complete -c docker -A -f -n '__fish_seen_subcommand_from images' -s q -l quiet -d 'Only show image IDs' +complete -c docker -A -f -n '__fish_seen_subcommand_from images' -a '(__fish_print_docker_repositories)' -d "Repository" + +# import +complete -c docker -f -n '__fish_docker_no_subcommand' -a import -d 'Create a new filesystem image from the contents of a tarball' +complete -c docker -A -f -n '__fish_seen_subcommand_from import' -s c -l change -d 'Apply Dockerfile instruction to the created image' +complete -c docker -A -f -n '__fish_seen_subcommand_from import' -s m -l message -d 'Set commit message for imported image' +complete -c docker -A -f -n '__fish_seen_subcommand_from import' -l help -d 'Print usage' + +# info +complete -c docker -f -n '__fish_docker_no_subcommand' -a info -d 'Display system-wide information' +complete -c docker -A -f -n '__fish_seen_subcommand_from info' -s f -l format -d 'Format the output using the given go template' +complete -c docker -A -f -n '__fish_seen_subcommand_from info' -l help -d 'Print usage' + +# inspect +complete -c docker -f -n '__fish_docker_no_subcommand' -a inspect -d 'Return low-level information on a container or image' +complete -c docker -A -f -n '__fish_seen_subcommand_from inspect' -s f -l format -d 'Format the output using the given go template.' +complete -c docker -A -f -n '__fish_seen_subcommand_from inspect' -l help -d 'Print usage' +complete -c docker -A -f -n '__fish_seen_subcommand_from inspect' -s s -l size -d 'Display total file sizes if the type is container.' +complete -c docker -A -f -n '__fish_seen_subcommand_from inspect' -l type -d 'Return JSON for specified type' +complete -c docker -A -f -n '__fish_seen_subcommand_from inspect' -a '(__fish_print_docker_images)' -d "Image" +complete -c docker -A -f -n '__fish_seen_subcommand_from inspect' -a '(__fish_print_docker_containers all)' -d "Container" + +# kill +complete -c docker -f -n '__fish_docker_no_subcommand' -a kill -d 'Kill a running container' +complete -c docker -A -f -n '__fish_seen_subcommand_from kill' -l help -d 'Print usage' +complete -c docker -A -f -n '__fish_seen_subcommand_from kill' -s s -l signal -d 'Signal to send to the container' +complete -c docker -A -f -n '__fish_seen_subcommand_from kill' -a '(__fish_print_docker_containers running)' -d "Container" + +# load +complete -c docker -f -n '__fish_docker_no_subcommand' -a load -d 'Load an image from a tar archive' +complete -c docker -A -f -n '__fish_seen_subcommand_from load' -l help -d 'Print usage' +complete -c docker -A -f -n '__fish_seen_subcommand_from load' -s i -l input -d 'Read from a tar archive file, instead of STDIN' +complete -c docker -A -f -n '__fish_seen_subcommand_from load' -s q -l quiet -d 'Suppress the load output' + +# login +complete -c docker -f -n '__fish_docker_no_subcommand' -a login -d 'Log in to a registry' +complete -c docker -A -f -n '__fish_seen_subcommand_from login' -l help -d 'Print usage' +complete -c docker -A -f -n '__fish_seen_subcommand_from login' -s p -l password -d 'Password' +complete -c docker -A -f -n '__fish_seen_subcommand_from login' -l password-stdin -d 'Take the password from stdin' +complete -c docker -A -f -n '__fish_seen_subcommand_from login' -s u -l username -d 'Username' + +# logout +complete -c docker -f -n '__fish_docker_no_subcommand' -a logout -d 'Log out from a registry' + +# logs +complete -c docker -f -n '__fish_docker_no_subcommand' -a logs -d 'Fetch the logs of a container' +complete -c docker -A -f -n '__fish_seen_subcommand_from logs' -s f -l follow -d 'Follow log output' +complete -c docker -A -f -n '__fish_seen_subcommand_from logs' -l help -d 'Print usage' +complete -c docker -A -f -n '__fish_seen_subcommand_from logs' -s t -l timestamps -d 'Show timestamps' +complete -c docker -A -f -n '__fish_seen_subcommand_from logs' -l since -d 'Show logs since timestamp' +complete -c docker -A -f -n '__fish_seen_subcommand_from logs' -s n -l tail -d 'Output the specified number of lines at the end of logs (defaults to all logs)' +complete -c docker -A -f -n '__fish_seen_subcommand_from logs' -a '(__fish_print_docker_containers running)' -d "Container" + +# network +complete -c docker -f -n '__fish_docker_no_subcommand' -a network -d 'Manage networks' +complete -c docker -A -f -n '__fish_seen_subcommand_from network' -a connect -d 'Connect a container to a network' +complete -c docker -A -f -n '__fish_seen_subcommand_from network' -a create -d 'Create a network' +complete -c docker -A -f -n '__fish_seen_subcommand_from network' -a disconnect -d 'Disconnect a container from a network' +complete -c docker -A -f -n '__fish_seen_subcommand_from network' -a inspect -d 'Display detailed information on one or more networks' +complete -c docker -A -f -n '__fish_seen_subcommand_from network' -a ls -d 'List networks' +complete -c docker -A -f -n '__fish_seen_subcommand_from network' -a prune -d 'Remove all unused networks' +complete -c docker -A -f -n '__fish_seen_subcommand_from network' -a rm -d 'Remove one or more networks' +complete -c docker -A -f -n '__fish_seen_subcommand_from network' -l help -d 'Print usage' +complete -c docker -A -f -n '__fish_seen_subcommand_from network rm' -a '(__fish_print_docker_networks)' -d "Network" +complete -c docker -A -f -n '__fish_seen_subcommand_from network connect' -a '(__fish_print_docker_networks)' -d "Network" +complete -c docker -A -f -n '__fish_seen_subcommand_from network disconnect' -a '(__fish_print_docker_networks)' -d "Network" +complete -c docker -A -f -n '__fish_seen_subcommand_from network inspect' -a '(__fish_print_docker_networks)' -d "Network" + +# port +complete -c docker -f -n '__fish_docker_no_subcommand' -a port -d 'Lookup the public-facing port that is NAT-ed to PRIVATE_PORT' +complete -c docker -A -f -n '__fish_seen_subcommand_from port' -l help -d 'Print usage' +complete -c docker -A -f -n '__fish_seen_subcommand_from port' -a '(__fish_print_docker_containers running)' -d "Container" + +# pause +complete -c docker -f -n '__fish_docker_no_subcommand' -a pause -d 'Pause all processes within a container' +complete -c docker -A -f -n '__fish_seen_subcommand_from pause' -a '(__fish_print_docker_containers running)' -d "Container" + +# ps +complete -c docker -f -n '__fish_docker_no_subcommand' -a ps -d 'List containers' +complete -c docker -A -f -n '__fish_seen_subcommand_from ps' -s a -l all -d 'Show all containers. Only running containers are shown by default.' +complete -c docker -A -f -n '__fish_seen_subcommand_from ps' -l before -d 'Show only container created before Id or Name, include non-running ones.' +complete -c docker -A -f -n '__fish_seen_subcommand_from ps' -s f -l filter -d 'Provide filter values. Valid filters:' +complete -c docker -A -f -n '__fish_seen_subcommand_from ps' -l help -d 'Print usage' +complete -c docker -A -f -n '__fish_seen_subcommand_from ps' -s l -l latest -d 'Show only the latest created container, include non-running ones.' +complete -c docker -A -f -n '__fish_seen_subcommand_from ps' -s n -d 'Show n last created containers, include non-running ones.' +complete -c docker -A -f -n '__fish_seen_subcommand_from ps' -l no-trunc -d "Don't truncate output" +complete -c docker -A -f -n '__fish_seen_subcommand_from ps' -s q -l quiet -d 'Only display container IDs' +complete -c docker -A -f -n '__fish_seen_subcommand_from ps' -s s -l size -d 'Display total file sizes' +complete -c docker -A -f -n '__fish_seen_subcommand_from ps' -l since -d 'Show only containers created since Id or Name, include non-running ones.' + +# pull +complete -c docker -f -n '__fish_docker_no_subcommand' -a pull -d 'Download an image from a registry' +complete -c docker -A -f -n '__fish_seen_subcommand_from pull' -s a -l all-tags -d 'Download all tagged images in the repository' +complete -c docker -A -f -n '__fish_seen_subcommand_from pull' -l help -d 'Print usage' +complete -c docker -A -f -n '__fish_seen_subcommand_from pull' -a '(__fish_print_docker_images)' -d "Image" +complete -c docker -A -f -n '__fish_seen_subcommand_from pull' -a '(__fish_print_docker_repositories)' -d "Repository" + +# push +complete -c docker -f -n '__fish_docker_no_subcommand' -a push -d 'Upload an image to a registry' +complete -c docker -A -f -n '__fish_seen_subcommand_from push' -l help -d 'Print usage' +complete -c docker -A -f -n '__fish_seen_subcommand_from push' -a '(__fish_print_docker_images)' -d "Image" +complete -c docker -A -f -n '__fish_seen_subcommand_from push' -a '(__fish_print_docker_repositories)' -d "Repository" + +# rename +complete -c docker -f -n '__fish_docker_no_subcommand' -a rename -d 'Rename an existing container' + +# restart +complete -c docker -f -n '__fish_docker_no_subcommand' -a restart -d 'Restart a container' +complete -c docker -A -f -n '__fish_seen_subcommand_from restart' -l help -d 'Print usage' +complete -c docker -A -f -n '__fish_seen_subcommand_from restart' -s t -l time -d 'Number of seconds to try to stop for before killing the container. Once killed it will then be restarted. Default is 10 seconds.' +complete -c docker -A -f -n '__fish_seen_subcommand_from restart' -a '(__fish_print_docker_containers running)' -d "Container" + +# rm +complete -c docker -f -n '__fish_docker_no_subcommand' -a rm -d 'Remove one or more containers' +complete -c docker -A -f -n '__fish_seen_subcommand_from rm' -s f -l force -d 'Force the removal of a running container (uses SIGKILL)' +complete -c docker -A -f -n '__fish_seen_subcommand_from rm' -l help -d 'Print usage' +complete -c docker -A -f -n '__fish_seen_subcommand_from rm' -s l -l link -d 'Remove the specified link and not the underlying container' +complete -c docker -A -f -n '__fish_seen_subcommand_from rm' -s v -l volumes -d 'Remove anonymous volumes associated with the container' +complete -c docker -A -f -n '__fish_seen_subcommand_from rm' -a '(__fish_print_docker_containers stopped)' -d "Container" +complete -c docker -A -f -n '__fish_seen_subcommand_from rm' -s f -l force -a '(__fish_print_docker_containers all)' -d "Container" + +# rmi +complete -c docker -f -n '__fish_docker_no_subcommand' -a rmi -d 'Remove one or more images' +complete -c docker -A -f -n '__fish_seen_subcommand_from rmi' -s f -l force -d 'Force removal of the image' +complete -c docker -A -f -n '__fish_seen_subcommand_from rmi' -l help -d 'Print usage' +complete -c docker -A -f -n '__fish_seen_subcommand_from rmi' -l no-prune -d 'Do not delete untagged parents' +complete -c docker -A -f -n '__fish_seen_subcommand_from rmi' -a '(__fish_print_docker_images)' -d "Image" + +# run +complete -c docker -f -n '__fish_docker_no_subcommand' -a run -d 'Create and run a new container from an image' +complete -c docker -A -f -n '__fish_seen_subcommand_from run' -l annotation -d 'Add an annotation to the container (passed through to the OCI runtime)' +complete -c docker -A -f -n '__fish_seen_subcommand_from run' -s a -l attach -d 'Attach to STDIN, STDOUT or STDERR.' +complete -c docker -A -f -n '__fish_seen_subcommand_from run' -l add-host -d 'Add a custom host-to-IP mapping (host:ip)' +complete -c docker -A -f -n '__fish_seen_subcommand_from run' -s c -l cpu-shares -d 'CPU shares (relative weight)' +complete -c docker -A -f -n '__fish_seen_subcommand_from run' -l cap-add -d 'Add Linux capabilities' +complete -c docker -A -f -n '__fish_seen_subcommand_from run' -l cap-drop -d 'Drop Linux capabilities' +complete -c docker -A -f -n '__fish_seen_subcommand_from run' -l cidfile -d 'Write the container ID to the file' +complete -c docker -A -f -n '__fish_seen_subcommand_from run' -l cgroupns -d 'Cgroup namespace mode to use' +complete -c docker -A -f -n '__fish_seen_subcommand_from run' -l cpuset -d 'CPUs in which to allow execution (0-3, 0,1)' +complete -c docker -A -f -n '__fish_seen_subcommand_from run' -s d -l detach -d 'Detached mode: run the container in the background and print the new container ID' +complete -c docker -A -f -n '__fish_seen_subcommand_from run' -l device -d 'Add a host device to the container (e.g. --device=/dev/sdc:/dev/xvdc:rwm)' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l device-cgroup-rule -d 'Add a rule to the cgroup allowed devices list (e.g. --device-cgroup-rule="c 13:37 rwm")' +complete -c docker -A -f -n '__fish_seen_subcommand_from run' -l dns -d 'Set custom DNS servers' +complete -c docker -A -f -n '__fish_seen_subcommand_from run' -l dns-opt -d "Set custom DNS options (Use --dns-opt='' if you don't wish to set options)" +complete -c docker -A -f -n '__fish_seen_subcommand_from run' -l dns-search -d "Set custom DNS search domains (Use --dns-search=. if you don't wish to set the search domain)" +complete -c docker -A -f -n '__fish_seen_subcommand_from run' -s e -l env -d 'Set environment variables' +complete -c docker -A -f -n '__fish_seen_subcommand_from run' -l entrypoint -d 'Overwrite the default ENTRYPOINT of the image' +complete -c docker -A -f -n '__fish_seen_subcommand_from run' -l env-file -d 'Read in a line delimited file of environment variables' +complete -c docker -A -f -n '__fish_seen_subcommand_from run' -l expose -d 'Expose a port or a range of ports (e.g. --expose=3300-3310) from the container without publishing it to your host' +complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l group-add -d 'Add additional groups to run as' +complete -c docker -A -f -n '__fish_seen_subcommand_from run' -s h -l hostname -d 'Container host name' +complete -c docker -A -f -n '__fish_seen_subcommand_from run' -l help -d 'Print usage' +complete -c docker -A -f -n '__fish_seen_subcommand_from run' -s i -l interactive -d 'Keep STDIN open even if not attached' +complete -c docker -A -f -n '__fish_seen_subcommand_from run' -l ipc -d 'Default is to create a private IPC namespace (POSIX SysV IPC) for the container' +complete -c docker -A -f -n '__fish_seen_subcommand_from run' -l link -d 'Add link to another container in the form of :alias' +complete -c docker -A -f -n '__fish_seen_subcommand_from run' -s m -l memory -d 'Memory limit (format: [], where unit = b, k, m or g)' +complete -c docker -A -f -n '__fish_seen_subcommand_from run' -l mac-address -d 'Container MAC address (e.g., 92:d0:c6:0a:29:33)' +complete -c docker -A -f -n '__fish_seen_subcommand_from run' -l memory-swap -d "Total memory usage (memory + swap), set '-1' to disable swap (format: [], where unit = b, k, m or g)" +complete -c docker -A -f -n '__fish_seen_subcommand_from run' -l mount -d 'Attach a filesystem mount to the container' +complete -c docker -A -f -n '__fish_seen_subcommand_from run' -l name -d 'Assign a name to the container' +complete -c docker -A -f -n '__fish_seen_subcommand_from run' -l net -d 'Set the Network mode for the container' +complete -c docker -A -f -n '__fish_seen_subcommand_from run' -s P -l publish-all -d 'Publish all exposed ports to random ports on the host interfaces' +complete -c docker -A -f -n '__fish_seen_subcommand_from run' -s p -l publish -d "Publish a container's port to the host" +complete -c docker -A -f -n '__fish_seen_subcommand_from run' -l pid -d 'Default is to create a private PID namespace for the container' +complete -c docker -A -f -n '__fish_seen_subcommand_from run' -l privileged -d 'Give extended privileges to this container' +complete -c docker -A -f -n '__fish_seen_subcommand_from run' -l read-only -d "Mount the container's root filesystem as read only" +complete -c docker -A -f -n '__fish_seen_subcommand_from run' -l restart -d 'Restart policy to apply when a container exits (no, on-failure[:max-retry], always)' +complete -c docker -A -f -n '__fish_seen_subcommand_from run' -l rm -d 'Automatically remove the container when it exits (incompatible with -d)' +complete -c docker -A -f -n '__fish_seen_subcommand_from run' -l security-opt -d 'Security Options' +complete -c docker -A -f -n '__fish_seen_subcommand_from run' -l sig-proxy -d 'Proxy received signals to the process (non-TTY mode only). SIGCHLD, SIGSTOP, and SIGKILL are not proxied.' +complete -c docker -A -f -n '__fish_seen_subcommand_from run' -l stop-signal -d 'Signal to kill a container' +complete -c docker -A -f -n '__fish_seen_subcommand_from run' -s t -l tty -d 'Allocate a pseudo-TTY' +complete -c docker -A -f -n '__fish_seen_subcommand_from run' -s u -l user -d 'Username or UID' +complete -c docker -A -f -n '__fish_seen_subcommand_from run' -l tmpfs -d 'Mount tmpfs on a directory' +complete -c docker -A -f -n '__fish_seen_subcommand_from run' -s v -l volume -d 'Bind mount a volume (e.g., from the host: -v /host:/container, from Docker: -v /container)' +complete -c docker -A -f -n '__fish_seen_subcommand_from run' -l volumes-from -d 'Mount volumes from the specified container(s)' +complete -c docker -A -f -n '__fish_seen_subcommand_from run' -s w -l workdir -d 'Working directory inside the container' +complete -c docker -A -f -n '__fish_seen_subcommand_from run' -a '(__fish_print_docker_images)' -d "Image" + +# save +complete -c docker -f -n '__fish_docker_no_subcommand' -a save -d 'Save an image to a tar archive' +complete -c docker -A -f -n '__fish_seen_subcommand_from save' -l help -d 'Print usage' +complete -c docker -A -f -n '__fish_seen_subcommand_from save' -s o -l output -d 'Write to an file, instead of STDOUT' +complete -c docker -A -f -n '__fish_seen_subcommand_from save' -a '(__fish_print_docker_images)' -d "Image" + +# search +complete -c docker -f -n '__fish_docker_no_subcommand' -a search -d 'Search for an image on the registry (defaults to the Docker Hub)' +complete -c docker -A -f -n '__fish_seen_subcommand_from search' -l automated -d 'Only show automated builds' +complete -c docker -A -f -n '__fish_seen_subcommand_from search' -l help -d 'Print usage' +complete -c docker -A -f -n '__fish_seen_subcommand_from search' -l no-trunc -d "Don't truncate output" +complete -c docker -A -f -n '__fish_seen_subcommand_from search' -s s -l stars -d 'Only displays with at least x stars' + +# start +complete -c docker -f -n '__fish_docker_no_subcommand' -a start -d 'Start a container' +complete -c docker -A -f -n '__fish_seen_subcommand_from start' -s a -l attach -d "Attach container's STDOUT and STDERR and forward all signals to the process" +complete -c docker -A -f -n '__fish_seen_subcommand_from start' -l help -d 'Print usage' +complete -c docker -A -f -n '__fish_seen_subcommand_from start' -s i -l interactive -d "Attach container's STDIN" +complete -c docker -A -f -n '__fish_seen_subcommand_from start' -a '(__fish_print_docker_containers stopped)' -d "Container" + +# stats +complete -c docker -f -n '__fish_docker_no_subcommand' -a stats -d "Display a live stream of one or more containers' resource usage statistics" +complete -c docker -A -f -n '__fish_seen_subcommand_from stats' -l help -d 'Print usage' +complete -c docker -A -f -n '__fish_seen_subcommand_from stats' -l no-stream -d 'Disable streaming stats and only pull the first result' +complete -c docker -A -f -n '__fish_seen_subcommand_from stats' -a '(__fish_print_docker_containers running)' -d "Container" + +# stop +complete -c docker -f -n '__fish_docker_no_subcommand' -a stop -d 'Stop a container' +complete -c docker -A -f -n '__fish_seen_subcommand_from stop' -l help -d 'Print usage' +complete -c docker -A -f -n '__fish_seen_subcommand_from stop' -s t -l time -d 'Number of seconds to wait for the container to stop before killing it. Default is 10 seconds.' +complete -c docker -A -f -n '__fish_seen_subcommand_from stop' -a '(__fish_print_docker_containers running)' -d "Container" + +# tag +complete -c docker -f -n '__fish_docker_no_subcommand' -a tag -d 'Tag an image into a repository' +complete -c docker -A -f -n '__fish_seen_subcommand_from tag' -s f -l force -d 'Force' +complete -c docker -A -f -n '__fish_seen_subcommand_from tag' -l help -d 'Print usage' + +# top +complete -c docker -f -n '__fish_docker_no_subcommand' -a top -d 'Lookup the running processes of a container' +complete -c docker -A -f -n '__fish_seen_subcommand_from top' -l help -d 'Print usage' +complete -c docker -A -f -n '__fish_seen_subcommand_from top' -a '(__fish_print_docker_containers running)' -d "Container" + +#trust +complete -c docker -f -n '__fish_docker_no_subcommand' -a trust -d 'Manage trust on Docker images' +complete -c docker -A -f -n '__fish_seen_subcommand_from trust' -l help -d 'Print usage' + +#trust inspect +complete -c docker -A -f -n '__fish_docker_no_subcommand_trust' -a inspect -d 'Return low-level information about keys and signatures' +complete -c docker -A -f -n '__fish_docker_subcommand_path trust inspect' -l pretty -d 'Print the information in a human friendly format' + +#trust key +complete -c docker -A -f -n '__fish_docker_no_subcommand_trust' -a key -d 'Manage keys for signing Docker images' +complete -c docker -A -f -n '__fish_docker_subcommand_path trust key; and __fish_docker_subcommand_path_without generate load' -a generate -d 'Generate and load a signing key-pair' +complete -c docker -A -f -n '__fish_docker_subcommand_path trust key load' -l dir -d 'Directory to generate key in, defaults to current directory' +complete -c docker -A -f -n '__fish_docker_subcommand_path trust key; and __fish_docker_subcommand_path_without generate load' -a load -d 'Load a private key file for signing' +complete -c docker -A -f -n '__fish_docker_subcommand_path trust key load' -l name -d 'Name for the loaded key (default "signer")' + +#trust revoke +complete -c docker -A -f -n '__fish_docker_no_subcommand_trust' -a revoke -d 'Remove trust for an image' +complete -c docker -A -f -n '__fish_docker_subcommand_path trust revoke' -s y -l yes -d 'Do not prompt for confirmation' + +#trust sign +complete -c docker -A -f -n '__fish_docker_no_subcommand_trust' -a sign -d 'Sign an image' +complete -c docker -A -f -n '__fish_docker_subcommand_path trust sign' -l local -d 'Sign a locally tagged image' + +#trust signer +complete -c docker -A -f -n '__fish_docker_no_subcommand_trust' -a signer -d 'Manage entities who can sign Docker images' +complete -c docker -A -f -n '__fish_docker_subcommand_path trust signer; and __fish_docker_subcommand_path_without add remove' -a add -d 'Add a signer' +complete -c docker -A -f -n '__fish_docker_subcommand_path trust signer; and __fish_docker_subcommand_path_without add remove' -a remove -d 'remove a signer' + +# unpause +complete -c docker -f -n '__fish_docker_no_subcommand' -a unpause -d 'Unpause a paused container' +complete -c docker -A -f -n '__fish_seen_subcommand_from unpause' -a '(__fish_print_docker_containers running)' -d "Container" + +# version +complete -c docker -f -n '__fish_docker_no_subcommand' -a version -d 'Show the Docker version information' +complete -c docker -A -f -n '__fish_seen_subcommand_from version' -s f -l format -d 'Format the output using the given go template' +complete -c docker -A -f -n '__fish_seen_subcommand_from version' -l help -d 'Print usage' + +# wait +complete -c docker -f -n '__fish_docker_no_subcommand' -a wait -d 'Block until a container stops, then print its exit code' +complete -c docker -A -f -n '__fish_seen_subcommand_from wait' -l help -d 'Print usage' +complete -c docker -A -f -n '__fish_seen_subcommand_from wait' -a '(__fish_print_docker_containers running)' -d "Container" diff --git a/.config/mackup/.config/fish/completions/kubectl.fish b/.config/mackup/.config/fish/completions/kubectl.fish new file mode 100644 index 0000000..ccdfe3d --- /dev/null +++ b/.config/mackup/.config/fish/completions/kubectl.fish @@ -0,0 +1,249 @@ + +# Copyright 2016 The Kubernetes Authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# fish completion for kubectl -*- shell-script -*- + +function __kubectl_debug + set -l file "$BASH_COMP_DEBUG_FILE" + if test -n "$file" + echo "$argv" >> $file + end +end + +function __kubectl_perform_completion + __kubectl_debug "Starting __kubectl_perform_completion" + + # Extract all args except the last one + set -l args (commandline -opc) + # Extract the last arg and escape it in case it is a space + set -l lastArg (string escape -- (commandline -ct)) + + __kubectl_debug "args: $args" + __kubectl_debug "last arg: $lastArg" + + # Disable ActiveHelp which is not supported for fish shell + set -l requestComp "KUBECTL_ACTIVE_HELP=0 $args[1] __complete $args[2..-1] $lastArg" + + __kubectl_debug "Calling $requestComp" + set -l results (eval $requestComp 2> /dev/null) + + # Some programs may output extra empty lines after the directive. + # Let's ignore them or else it will break completion. + # Ref: https://github.com/spf13/cobra/issues/1279 + for line in $results[-1..1] + if test (string trim -- $line) = "" + # Found an empty line, remove it + set results $results[1..-2] + else + # Found non-empty line, we have our proper output + break + end + end + + set -l comps $results[1..-2] + set -l directiveLine $results[-1] + + # For Fish, when completing a flag with an = (e.g., -n=) + # completions must be prefixed with the flag + set -l flagPrefix (string match -r -- '-.*=' "$lastArg") + + __kubectl_debug "Comps: $comps" + __kubectl_debug "DirectiveLine: $directiveLine" + __kubectl_debug "flagPrefix: $flagPrefix" + + for comp in $comps + printf "%s%s\n" "$flagPrefix" "$comp" + end + + printf "%s\n" "$directiveLine" +end + +# this function limits calls to __kubectl_perform_completion, by caching the result behind $__kubectl_perform_completion_once_result +function __kubectl_perform_completion_once + __kubectl_debug "Starting __kubectl_perform_completion_once" + + if test -n "$__kubectl_perform_completion_once_result" + __kubectl_debug "Seems like a valid result already exists, skipping __kubectl_perform_completion" + return 0 + end + + set --global __kubectl_perform_completion_once_result (__kubectl_perform_completion) + if test -z "$__kubectl_perform_completion_once_result" + __kubectl_debug "No completions, probably due to a failure" + return 1 + end + + __kubectl_debug "Performed completions and set __kubectl_perform_completion_once_result" + return 0 +end + +# this function is used to clear the $__kubectl_perform_completion_once_result variable after completions are run +function __kubectl_clear_perform_completion_once_result + __kubectl_debug "" + __kubectl_debug "========= clearing previously set __kubectl_perform_completion_once_result variable ==========" + set --erase __kubectl_perform_completion_once_result + __kubectl_debug "Succesfully erased the variable __kubectl_perform_completion_once_result" +end + +function __kubectl_requires_order_preservation + __kubectl_debug "" + __kubectl_debug "========= checking if order preservation is required ==========" + + __kubectl_perform_completion_once + if test -z "$__kubectl_perform_completion_once_result" + __kubectl_debug "Error determining if order preservation is required" + return 1 + end + + set -l directive (string sub --start 2 $__kubectl_perform_completion_once_result[-1]) + __kubectl_debug "Directive is: $directive" + + set -l shellCompDirectiveKeepOrder 32 + set -l keeporder (math (math --scale 0 $directive / $shellCompDirectiveKeepOrder) % 2) + __kubectl_debug "Keeporder is: $keeporder" + + if test $keeporder -ne 0 + __kubectl_debug "This does require order preservation" + return 0 + end + + __kubectl_debug "This doesn't require order preservation" + return 1 +end + + +# This function does two things: +# - Obtain the completions and store them in the global __kubectl_comp_results +# - Return false if file completion should be performed +function __kubectl_prepare_completions + __kubectl_debug "" + __kubectl_debug "========= starting completion logic ==========" + + # Start fresh + set --erase __kubectl_comp_results + + __kubectl_perform_completion_once + __kubectl_debug "Completion results: $__kubectl_perform_completion_once_result" + + if test -z "$__kubectl_perform_completion_once_result" + __kubectl_debug "No completion, probably due to a failure" + # Might as well do file completion, in case it helps + return 1 + end + + set -l directive (string sub --start 2 $__kubectl_perform_completion_once_result[-1]) + set --global __kubectl_comp_results $__kubectl_perform_completion_once_result[1..-2] + + __kubectl_debug "Completions are: $__kubectl_comp_results" + __kubectl_debug "Directive is: $directive" + + set -l shellCompDirectiveError 1 + set -l shellCompDirectiveNoSpace 2 + set -l shellCompDirectiveNoFileComp 4 + set -l shellCompDirectiveFilterFileExt 8 + set -l shellCompDirectiveFilterDirs 16 + + if test -z "$directive" + set directive 0 + end + + set -l compErr (math (math --scale 0 $directive / $shellCompDirectiveError) % 2) + if test $compErr -eq 1 + __kubectl_debug "Received error directive: aborting." + # Might as well do file completion, in case it helps + return 1 + end + + set -l filefilter (math (math --scale 0 $directive / $shellCompDirectiveFilterFileExt) % 2) + set -l dirfilter (math (math --scale 0 $directive / $shellCompDirectiveFilterDirs) % 2) + if test $filefilter -eq 1; or test $dirfilter -eq 1 + __kubectl_debug "File extension filtering or directory filtering not supported" + # Do full file completion instead + return 1 + end + + set -l nospace (math (math --scale 0 $directive / $shellCompDirectiveNoSpace) % 2) + set -l nofiles (math (math --scale 0 $directive / $shellCompDirectiveNoFileComp) % 2) + + __kubectl_debug "nospace: $nospace, nofiles: $nofiles" + + # If we want to prevent a space, or if file completion is NOT disabled, + # we need to count the number of valid completions. + # To do so, we will filter on prefix as the completions we have received + # may not already be filtered so as to allow fish to match on different + # criteria than the prefix. + if test $nospace -ne 0; or test $nofiles -eq 0 + set -l prefix (commandline -t | string escape --style=regex) + __kubectl_debug "prefix: $prefix" + + set -l completions (string match -r -- "^$prefix.*" $__kubectl_comp_results) + set --global __kubectl_comp_results $completions + __kubectl_debug "Filtered completions are: $__kubectl_comp_results" + + # Important not to quote the variable for count to work + set -l numComps (count $__kubectl_comp_results) + __kubectl_debug "numComps: $numComps" + + if test $numComps -eq 1; and test $nospace -ne 0 + # We must first split on \t to get rid of the descriptions to be + # able to check what the actual completion will be. + # We don't need descriptions anyway since there is only a single + # real completion which the shell will expand immediately. + set -l split (string split --max 1 \t $__kubectl_comp_results[1]) + + # Fish won't add a space if the completion ends with any + # of the following characters: @=/:., + set -l lastChar (string sub -s -1 -- $split) + if not string match -r -q "[@=/:.,]" -- "$lastChar" + # In other cases, to support the "nospace" directive we trick the shell + # by outputting an extra, longer completion. + __kubectl_debug "Adding second completion to perform nospace directive" + set --global __kubectl_comp_results $split[1] $split[1]. + __kubectl_debug "Completions are now: $__kubectl_comp_results" + end + end + + if test $numComps -eq 0; and test $nofiles -eq 0 + # To be consistent with bash and zsh, we only trigger file + # completion when there are no other completions + __kubectl_debug "Requesting file completion" + return 1 + end + end + + return 0 +end + +# Since Fish completions are only loaded once the user triggers them, we trigger them ourselves +# so we can properly delete any completions provided by another script. +# Only do this if the program can be found, or else fish may print some errors; besides, +# the existing completions will only be loaded if the program can be found. +if type -q "kubectl" + # The space after the program name is essential to trigger completion for the program + # and not completion of the program name itself. + # Also, we use '> /dev/null 2>&1' since '&>' is not supported in older versions of fish. + complete --do-complete "kubectl " > /dev/null 2>&1 +end + +# Remove any pre-existing completions for the program since we will be handling all of them. +complete -c kubectl -e + +# this will get called after the two calls below and clear the $__kubectl_perform_completion_once_result global +complete -c kubectl -n '__kubectl_clear_perform_completion_once_result' +# The call to __kubectl_prepare_completions will setup __kubectl_comp_results +# which provides the program's completion choices. +# If this doesn't require order preservation, we don't use the -k flag +complete -c kubectl -n 'not __kubectl_requires_order_preservation && __kubectl_prepare_completions' -f -a '$__kubectl_comp_results' +# otherwise we use the -k flag +complete -k -c kubectl -n '__kubectl_requires_order_preservation && __kubectl_prepare_completions' -f -a '$__kubectl_comp_results' diff --git a/.config/mackup/.config/fish/conf.d/omf.fish b/.config/mackup/.config/fish/conf.d/omf.fish new file mode 100644 index 0000000..3e0f6d6 --- /dev/null +++ b/.config/mackup/.config/fish/conf.d/omf.fish @@ -0,0 +1,7 @@ +# Path to Oh My Fish install. +set -q XDG_DATA_HOME + and set -gx OMF_PATH "$XDG_DATA_HOME/omf" + or set -gx OMF_PATH "$HOME/.local/share/omf" + +# Load Oh My Fish configuration. +source $OMF_PATH/init.fish diff --git a/.config/mackup/.config/fish/config.fish b/.config/mackup/.config/fish/config.fish new file mode 100644 index 0000000..d714361 --- /dev/null +++ b/.config/mackup/.config/fish/config.fish @@ -0,0 +1,3 @@ +if status is-interactive + # Commands to run in interactive sessions can go here +end diff --git a/.config/mackup/.config/fish/fish_variables b/.config/mackup/.config/fish/fish_variables new file mode 100644 index 0000000..ed35ace --- /dev/null +++ b/.config/mackup/.config/fish/fish_variables @@ -0,0 +1,98 @@ +# This file contains fish universal variable definitions. +# VERSION: 3.0 +SETUVAR __fish_initialized:3800 +SETUVAR _fisher_upgraded_to_4_4:\x1d +SETUVAR fish_color_autosuggestion:brblack +SETUVAR fish_color_cancel:\x2dr +SETUVAR fish_color_command:normal +SETUVAR fish_color_comment:red +SETUVAR fish_color_cwd:green +SETUVAR fish_color_cwd_root:red +SETUVAR fish_color_end:green +SETUVAR fish_color_error:brred +SETUVAR fish_color_escape:brcyan +SETUVAR fish_color_history_current:\x2d\x2dbold +SETUVAR fish_color_host:normal +SETUVAR fish_color_host_remote:yellow +SETUVAR fish_color_normal:normal +SETUVAR fish_color_operator:brcyan +SETUVAR fish_color_param:cyan +SETUVAR fish_color_quote:yellow +SETUVAR fish_color_redirection:cyan\x1e\x2d\x2dbold +SETUVAR fish_color_search_match:white\x1e\x2d\x2dbackground\x3dbrblack +SETUVAR fish_color_selection:white\x1e\x2d\x2dbold\x1e\x2d\x2dbackground\x3dbrblack +SETUVAR fish_color_status:red +SETUVAR fish_color_user:brgreen +SETUVAR fish_color_valid_path:\x2d\x2dunderline +SETUVAR fish_key_bindings:fish_default_key_bindings +SETUVAR fish_pager_color_completion:normal +SETUVAR fish_pager_color_description:yellow\x1e\x2di +SETUVAR fish_pager_color_prefix:normal\x1e\x2d\x2dbold\x1e\x2d\x2dunderline +SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan +SETUVAR fish_pager_color_selected_background:\x2dr +SETUVAR pure_begin_prompt_with_current_directory:true +SETUVAR pure_check_for_new_release:false +SETUVAR pure_color_at_sign:pure_color_mute +SETUVAR pure_color_aws_profile:pure_color_warning +SETUVAR pure_color_command_duration:pure_color_warning +SETUVAR pure_color_current_directory:pure_color_primary +SETUVAR pure_color_danger:red +SETUVAR pure_color_dark:black +SETUVAR pure_color_git_branch:pure_color_mute +SETUVAR pure_color_git_dirty:pure_color_mute +SETUVAR pure_color_git_stash:pure_color_info +SETUVAR pure_color_git_unpulled_commits:pure_color_info +SETUVAR pure_color_git_unpushed_commits:pure_color_info +SETUVAR pure_color_hostname:pure_color_mute +SETUVAR pure_color_info:cyan +SETUVAR pure_color_jobs:pure_color_normal +SETUVAR pure_color_k8s_context:pure_color_success +SETUVAR pure_color_k8s_namespace:pure_color_primary +SETUVAR pure_color_k8s_prefix:pure_color_info +SETUVAR pure_color_light:white +SETUVAR pure_color_mute:brblack +SETUVAR pure_color_nixdevshell_prefix:pure_color_info +SETUVAR pure_color_nixdevshell_symbol:pure_color_mute +SETUVAR pure_color_normal:normal +SETUVAR pure_color_prefix_root_prompt:pure_color_danger +SETUVAR pure_color_primary:blue +SETUVAR pure_color_prompt_on_error:pure_color_danger +SETUVAR pure_color_prompt_on_success:pure_color_success +SETUVAR pure_color_success:magenta +SETUVAR pure_color_system_time:pure_color_mute +SETUVAR pure_color_username_normal:pure_color_mute +SETUVAR pure_color_username_root:pure_color_light +SETUVAR pure_color_virtualenv:pure_color_mute +SETUVAR pure_color_warning:yellow +SETUVAR pure_enable_aws_profile:true +SETUVAR pure_enable_container_detection:true +SETUVAR pure_enable_git:true +SETUVAR pure_enable_k8s:false +SETUVAR pure_enable_nixdevshell:false +SETUVAR pure_enable_single_line_prompt:false +SETUVAR pure_enable_virtualenv:true +SETUVAR pure_reverse_prompt_symbol_in_vimode:true +SETUVAR pure_separate_prompt_on_error:false +SETUVAR pure_shorten_prompt_current_directory_length:0 +SETUVAR pure_shorten_window_title_current_directory_length:0 +SETUVAR pure_show_jobs:false +SETUVAR pure_show_prefix_root_prompt:false +SETUVAR pure_show_subsecond_command_duration:false +SETUVAR pure_show_system_time:false +SETUVAR pure_symbol_aws_profile_prefix: +SETUVAR pure_symbol_container_prefix: +SETUVAR pure_symbol_git_dirty:\x2a +SETUVAR pure_symbol_git_stash:\u2261 +SETUVAR pure_symbol_git_unpulled_commits:\u21e3 +SETUVAR pure_symbol_git_unpushed_commits:\u21e1 +SETUVAR pure_symbol_k8s_prefix:\u2638 +SETUVAR pure_symbol_nixdevshell_prefix:\u2744\ufe0f +SETUVAR pure_symbol_prefix_root_prompt:\x23 +SETUVAR pure_symbol_prompt:\U0001f3c2 +SETUVAR pure_symbol_reverse_prompt:\u276e +SETUVAR pure_symbol_ssh_prefix: +SETUVAR pure_symbol_title_bar_separator:\x2d +SETUVAR pure_symbol_virtualenv_prefix: +SETUVAR pure_threshold_command_duration:5 +SETUVAR pure_truncate_prompt_current_directory_keeps:\x2d1 +SETUVAR pure_truncate_window_title_current_directory_keeps:\x2d1 diff --git a/.config/mackup/.config/nvim/init.lua b/.config/mackup/.config/nvim/init.lua new file mode 100644 index 0000000..1544509 --- /dev/null +++ b/.config/mackup/.config/nvim/init.lua @@ -0,0 +1,3 @@ +if not vim.g.vscode then + require("core") +end diff --git a/.config/mackup/.config/nvim/lua/core/event.lua b/.config/mackup/.config/nvim/lua/core/event.lua new file mode 100644 index 0000000..b7ba778 --- /dev/null +++ b/.config/mackup/.config/nvim/lua/core/event.lua @@ -0,0 +1,152 @@ +-- Now use `` or `` to back to the `dotstutor`. +local autocmd = {} + +function autocmd.nvim_create_augroups(definitions) + for group_name, definition in pairs(definitions) do + -- Prepend an underscore to avoid name clashes + vim.api.nvim_command("augroup _" .. group_name) + vim.api.nvim_command("autocmd!") + for _, def in ipairs(definition) do + local command = table.concat(vim.iter({ "autocmd", def }):flatten(math.huge):totable(), " ") + vim.api.nvim_command(command) + end + vim.api.nvim_command("augroup END") + end +end + +-- Hold off on configuring anything related to the LSP until LspAttach +local mapping = require("keymap.completion") +vim.api.nvim_create_autocmd("LspAttach", { + group = vim.api.nvim_create_augroup("LspKeymapLoader", { clear = true }), + callback = function(event) + if not _G._debugging then + -- LSP Keymaps + mapping.lsp(event.buf) + + -- LSP Inlay Hints + local inlayhints_enabled = require("core.settings").lsp_inlayhints + local client = vim.lsp.get_client_by_id(event.data.client_id) + if client and client.server_capabilities.inlayHintProvider ~= nil then + vim.lsp.inlay_hint.enable(inlayhints_enabled == true, { bufnr = event.buf }) + end + end + end, +}) + +-- auto close NvimTree +vim.api.nvim_create_autocmd("BufEnter", { + group = vim.api.nvim_create_augroup("NvimTreeClose", { clear = true }), + pattern = "NvimTree_*", + callback = function() + local layout = vim.api.nvim_call_function("winlayout", {}) + if + layout[1] == "leaf" + and vim.bo[vim.api.nvim_win_get_buf(layout[2])].filetype == "NvimTree" + and layout[3] == nil + then + vim.api.nvim_command([[confirm quit]]) + end + end, +}) + +-- auto close some filetype with +vim.api.nvim_create_autocmd("FileType", { + pattern = { + "qf", + "help", + "man", + "notify", + "nofile", + "lspinfo", + "terminal", + "prompt", + "toggleterm", + "copilot", + "startuptime", + "tsplayground", + "PlenaryTestPopup", + }, + callback = function(event) + vim.bo[event.buf].buflisted = false + vim.api.nvim_buf_set_keymap(event.buf, "n", "q", "close", { silent = true }) + end, +}) + +function autocmd.load_autocmds() + local definitions = { + lazy = {}, + bufs = { + -- Reload vim config automatically + { + "BufWritePost", + [[$VIM_PATH/{*.vim,*.yaml,vimrc} nested source $MYVIMRC | redraw]], + }, + -- Reload Vim script automatically if setlocal autoread + { + "BufWritePost,FileWritePost", + "*.vim", + [[nested if &l:autoread > 0 | source | echo 'source ' . bufname('%') | endif]], + }, + { "BufWritePre", "/tmp/*", "setlocal noundofile" }, + { "BufWritePre", "COMMIT_EDITMSG", "setlocal noundofile" }, + { "BufWritePre", "MERGE_MSG", "setlocal noundofile" }, + { "BufWritePre", "*.tmp", "setlocal noundofile" }, + { "BufWritePre", "*.bak", "setlocal noundofile" }, + -- auto place to last edit + { + "BufReadPost", + "*", + [[if line("'\"") > 1 && line("'\"") <= line("$") | execute "normal! g'\"" | endif]], + }, + -- Auto toggle fcitx5 + -- {"InsertLeave", "* :silent", "!fcitx5-remote -c"}, + -- {"BufCreate", "*", ":silent !fcitx5-remote -c"}, + -- {"BufEnter", "*", ":silent !fcitx5-remote -c "}, + -- {"BufLeave", "*", ":silent !fcitx5-remote -c "} + }, + wins = { + -- Highlight current line only on focused window + { + "WinEnter,BufEnter,InsertLeave", + "*", + [[if ! &cursorline && &filetype !~# '^\(dashboard\|clap_\)' && ! &pvw | setlocal cursorline | endif]], + }, + { + "WinLeave,BufLeave,InsertEnter", + "*", + [[if &cursorline && &filetype !~# '^\(dashboard\|clap_\)' && ! &pvw | setlocal nocursorline | endif]], + }, + -- Attempt to write shada when leaving nvim + { + "VimLeave", + "*", + [[if has('nvim') | wshada | else | wviminfo! | endif]], + }, + -- Check if file changed when its window is focus, more eager than 'autoread' + { "FocusGained", "* checktime" }, + -- Equalize window dimensions when resizing vim window + { "VimResized", "*", [[tabdo wincmd =]] }, + }, + ft = { + { "FileType", "*", "setlocal formatoptions-=cro" }, + { "FileType", "alpha", "setlocal showtabline=0" }, + { "FileType", "markdown", "setlocal wrap" }, + { "FileType", "dap-repl", "lua require('dap.ext.autocompl').attach()" }, + { + "FileType", + "c,cpp", + "nnoremap h :ClangdSwitchSourceHeaderVSplit", + }, + }, + yank = { + { + "TextYankPost", + "*", + [[silent! lua vim.highlight.on_yank({higroup="IncSearch", timeout=300})]], + }, + }, + } + autocmd.nvim_create_augroups(require("modules.utils").extend_config(definitions, "user.event")) +end + +autocmd.load_autocmds() diff --git a/.config/mackup/.config/nvim/lua/core/global.lua b/.config/mackup/.config/nvim/lua/core/global.lua new file mode 100644 index 0000000..0f01edc --- /dev/null +++ b/.config/mackup/.config/nvim/lua/core/global.lua @@ -0,0 +1,18 @@ +local global = {} +local os_name = vim.uv.os_uname().sysname + +function global:load_variables() + self.is_mac = os_name == "Darwin" + self.is_linux = os_name == "Linux" + self.is_windows = os_name == "Windows_NT" + self.is_wsl = vim.fn.has("wsl") == 1 + self.vim_path = vim.fn.stdpath("config") + self.cache_dir = vim.fn.stdpath("cache") + self.data_dir = string.format("%s/site/", vim.fn.stdpath("data")) + self.modules_dir = self.vim_path .. "/modules" + self.home = self.is_windows and os.getenv("USERPROFILE") or os.getenv("HOME") +end + +global:load_variables() + +return global diff --git a/.config/mackup/.config/nvim/lua/core/init.lua b/.config/mackup/.config/nvim/lua/core/init.lua new file mode 100644 index 0000000..840cfbf --- /dev/null +++ b/.config/mackup/.config/nvim/lua/core/init.lua @@ -0,0 +1,121 @@ +local settings = require("core.settings") +local global = require("core.global") + +-- Create cache dir and data dirs +local createdir = function() + local data_dirs = { + global.cache_dir .. "/backup", + global.cache_dir .. "/session", + global.cache_dir .. "/swap", + global.cache_dir .. "/tags", + global.cache_dir .. "/undo", + } + -- Only check whether cache_dir exists, this would be enough. + if vim.fn.isdirectory(global.cache_dir) == 0 then + ---@diagnostic disable-next-line: param-type-mismatch + vim.fn.mkdir(global.cache_dir, "p") + for _, dir in pairs(data_dirs) do + if vim.fn.isdirectory(dir) == 0 then + vim.fn.mkdir(dir, "p") + end + end + end +end + +local leader_map = function() + vim.g.mapleader = " " + -- NOTE: + -- > Uncomment the following if you're using a other than , and you wish + -- > to disable advancing one character by pressing in normal/visual mode. + -- vim.api.nvim_set_keymap("n", " ", "", { noremap = true }) + -- vim.api.nvim_set_keymap("x", " ", "", { noremap = true }) +end + +local gui_config = function() + if next(settings.gui_config) then + vim.api.nvim_set_option_value( + "guifont", + settings.gui_config.font_name .. ":h" .. settings.gui_config.font_size, + {} + ) + end +end + +local neovide_config = function() + for name, config in pairs(settings.neovide_config) do + vim.g["neovide_" .. name] = config + end +end + +local clipboard_config = function() + if global.is_mac then + vim.g.clipboard = { + name = "macOS-clipboard", + copy = { ["+"] = "pbcopy", ["*"] = "pbcopy" }, + paste = { ["+"] = "pbpaste", ["*"] = "pbpaste" }, + cache_enabled = 0, + } + elseif global.is_wsl then + vim.g.clipboard = { + name = "win32yank-wsl", + copy = { + ["+"] = "win32yank.exe -i --crlf", + ["*"] = "win32yank.exe -i --crlf", + }, + paste = { + ["+"] = "win32yank.exe -o --lf", + ["*"] = "win32yank.exe -o --lf", + }, + cache_enabled = 0, + } + end +end + +local shell_config = function() + if global.is_windows then + if not (vim.fn.executable("pwsh") == 1 or vim.fn.executable("powershell") == 1) then + vim.notify( + [[ +Failed to setup terminal config + +PowerShell is either not installed, missing from PATH, or not executable; +cmd.exe will be used instead for `:!` (shell bang) and toggleterm.nvim. + +You're recommended to install PowerShell for better experience.]], + vim.log.levels.WARN, + { title = "[core] Runtime Warning" } + ) + return + end + + local basecmd = "-NoLogo -MTA -ExecutionPolicy RemoteSigned" + local ctrlcmd = "-Command [console]::InputEncoding = [console]::OutputEncoding = [System.Text.Encoding]::UTF8" + local set_opts = vim.api.nvim_set_option_value + set_opts("shell", vim.fn.executable("pwsh") == 1 and "pwsh" or "powershell", {}) + set_opts("shellcmdflag", string.format("%s %s;", basecmd, ctrlcmd), {}) + set_opts("shellredir", "-RedirectStandardOutput %s -NoNewWindow -Wait", {}) + set_opts("shellpipe", "2>&1 | Out-File -Encoding UTF8 %s; exit $LastExitCode", {}) + set_opts("shellquote", "", {}) + set_opts("shellxquote", "", {}) + end +end + +local load_core = function() + createdir() + leader_map() + + gui_config() + neovide_config() + clipboard_config() + shell_config() + + require("core.options") + require("core.event") + require("core.pack") + require("keymap") + + vim.api.nvim_set_option_value("background", settings.background, {}) + vim.cmd.colorscheme(settings.colorscheme) +end + +load_core() diff --git a/.config/mackup/.config/nvim/lua/core/options.lua b/.config/mackup/.config/nvim/lua/core/options.lua new file mode 100644 index 0000000..72751e0 --- /dev/null +++ b/.config/mackup/.config/nvim/lua/core/options.lua @@ -0,0 +1,131 @@ +local global = require("core.global") + +local function load_options() + local global_local = { + -- backupdir = global.cache_dir .. "/backup/", + -- directory = global.cache_dir .. "/swap/", + -- spellfile = global.cache_dir .. "/spell/en.uft-8.add", + -- viewdir = global.cache_dir .. "/view/", + autoindent = true, + autoread = true, + autowrite = true, + backspace = "indent,eol,start", + backup = false, + backupskip = "/tmp/*,$TMPDIR/*,$TMP/*,$TEMP/*,*/shm/*,/private/var/*,.vault.vim", + breakat = [[\ \ ;:,!?]], + breakindentopt = "shift:2,min:20", + clipboard = "unnamedplus", + cmdheight = 1, -- 0, 1, 2 + cmdwinheight = 5, + complete = ".,w,b,k,kspell", + completeopt = "menuone,noselect,popup", + concealcursor = "niv", + conceallevel = 0, + cursorcolumn = true, + cursorline = true, + diffopt = "filler,iwhite,internal,linematch:60,algorithm:patience", + display = "lastline", + encoding = "utf-8", + equalalways = false, + errorbells = true, + fileformats = "unix,mac,dos", + foldenable = true, + foldlevelstart = 99, + formatoptions = "1jcroql", + grepformat = "%f:%l:%c:%m", + grepprg = "rg --hidden --vimgrep --smart-case --", + helpheight = 12, + hidden = true, + history = 2000, + ignorecase = true, + inccommand = "nosplit", + incsearch = true, + infercase = true, + jumpoptions = "stack", + laststatus = 3, + linebreak = true, + list = true, + listchars = "tab:»·,nbsp:+,trail:·,extends:→,precedes:←", + magic = true, + mousescroll = "ver:3,hor:6", + number = true, + previewheight = 12, + -- Do NOT adjust the following option (pumblend) if you're using transparent background + pumblend = 0, + pumheight = 15, + redrawtime = 1500, + relativenumber = true, + ruler = true, + scrolloff = 2, + sessionoptions = "buffers,curdir,folds,help,tabpages,winpos,winsize", + shada = "!,'500,<50,@100,s10,h", + shiftround = true, + shiftwidth = 4, + shortmess = "aoOTIcF", + showbreak = "↳ ", + showcmd = false, + showmode = false, + showtabline = 2, + sidescrolloff = 5, + signcolumn = "yes", + smartcase = true, + smarttab = true, + smoothscroll = true, + splitbelow = true, + splitkeep = "screen", + splitright = true, + startofline = false, + swapfile = false, + switchbuf = "usetab,uselast", + synmaxcol = 2500, + tabstop = 4, + termguicolors = true, + timeout = true, + timeoutlen = 300, + ttimeout = true, + ttimeoutlen = 0, + undodir = global.cache_dir .. "/undo/", + undofile = true, + -- Please do NOT set `updatetime` to above 500, otherwise most plugins may not function correctly + updatetime = 200, + viewoptions = "folds,cursor,curdir,slash,unix", + virtualedit = "block", + visualbell = true, + whichwrap = "h,l,<,>,[,],~", + wildignore = ".git,.hg,.svn,*.pyc,*.o,*.out,*.jpg,*.jpeg,*.png,*.gif,*.zip,**/tmp/**,*.DS_Store,**/node_modules/**,**/bower_modules/**", + wildignorecase = true, + -- Do NOT adjust the following option (winblend) if you're using transparent background + winblend = 0, + winminwidth = 10, + winwidth = 30, + wrap = false, + wrapscan = true, + writebackup = false, + } + + local function isempty(s) + return s == nil or s == "" + end + local function use_if_defined(val, fallback) + return val ~= nil and val or fallback + end + + -- custom python provider + local conda_prefix = os.getenv("CONDA_PREFIX") + if not isempty(conda_prefix) then + vim.g.python_host_prog = use_if_defined(vim.g.python_host_prog, conda_prefix .. "/bin/python") + vim.g.python3_host_prog = use_if_defined(vim.g.python3_host_prog, conda_prefix .. "/bin/python") + else + vim.g.python_host_prog = use_if_defined(vim.g.python_host_prog, "python") + vim.g.python3_host_prog = use_if_defined(vim.g.python3_host_prog, "python3") + end + + for name, value in pairs(require("modules.utils").extend_config(global_local, "user.options")) do + vim.api.nvim_set_option_value(name, value, {}) + end +end + +-- Newtrw liststyle: https://medium.com/usevim/the-netrw-style-options-3ebe91d42456 +vim.g.netrw_liststyle = 3 + +load_options() diff --git a/.config/mackup/.config/nvim/lua/core/pack.lua b/.config/mackup/.config/nvim/lua/core/pack.lua new file mode 100644 index 0000000..28e21d5 --- /dev/null +++ b/.config/mackup/.config/nvim/lua/core/pack.lua @@ -0,0 +1,161 @@ +local fn, api = vim.fn, vim.api +local global = require("core.global") +local is_mac = global.is_mac +local vim_path = global.vim_path +local data_dir = global.data_dir +local lazy_path = data_dir .. "lazy/lazy.nvim" +local modules_dir = vim_path .. "/lua/modules" +local user_config_dir = vim_path .. "/lua/user" + +local settings = require("core.settings") +local use_ssh = settings.use_ssh + +local icons = { + kind = require("modules.utils.icons").get("kind"), + documents = require("modules.utils.icons").get("documents"), + ui = require("modules.utils.icons").get("ui"), + ui_sep = require("modules.utils.icons").get("ui", true), + misc = require("modules.utils.icons").get("misc"), +} + +local Lazy = {} + +function Lazy:load_plugins() + self.modules = {} + + local append_nativertp = function() + package.path = package.path + .. string.format( + ";%s;%s;%s", + modules_dir .. "/configs/?.lua", + modules_dir .. "/configs/?/init.lua", + user_config_dir .. "/?.lua" + ) + end + + local get_plugins_list = function() + local list = {} + local plugins_list = vim.split(fn.glob(modules_dir .. "/plugins/*.lua"), "\n") + local user_plugins_list = vim.split(fn.glob(user_config_dir .. "/plugins/*.lua"), "\n", { trimempty = true }) + vim.list_extend(plugins_list, user_plugins_list) + for _, f in ipairs(plugins_list) do + -- aggregate the plugins from `/plugins/*.lua` and `/user/plugins/*.lua` to a plugin list of a certain field for later `require` action. + -- current fields contains: completion, editor, lang, tool, ui + list[#list + 1] = f:find(modules_dir) and f:sub(#modules_dir - 6, -1) or f:sub(#user_config_dir - 3, -1) + end + return list + end + + append_nativertp() + + for _, m in ipairs(get_plugins_list()) do + -- require modules returned from `get_plugins_list()` function. + local modules = require(m:sub(0, #m - 4)) + if type(modules) == "table" then + for name, conf in pairs(modules) do + self.modules[#self.modules + 1] = vim.tbl_extend("force", { name }, conf) + end + end + end + for _, name in ipairs(settings.disabled_plugins) do + self.modules[#self.modules + 1] = { name, enabled = false } + end +end + +function Lazy:load_lazy() + if not vim.uv.fs_stat(lazy_path) then + local lazy_repo = use_ssh and "git@github.com:folke/lazy.nvim.git " or "https://github.com/folke/lazy.nvim.git " + api.nvim_command("!git clone --filter=blob:none --branch=stable " .. lazy_repo .. lazy_path) + end + self:load_plugins() + + local clone_prefix = use_ssh and "git@github.com:%s.git" or "https://github.com/%s.git" + local lazy_settings = { + root = data_dir .. "lazy", -- directory where plugins will be installed + git = { + -- log = { "-10" }, -- show the last 10 commits + timeout = 300, + url_format = clone_prefix, + }, + install = { + -- install missing plugins on startup. This doesn't increase startup time. + missing = true, + colorscheme = { settings.colorscheme }, + }, + ui = { + -- a number <1 is a percentage., >1 is a fixed size + size = { width = 0.88, height = 0.8 }, + wrap = true, -- wrap the lines in the ui + -- The border to use for the UI window. Accepts same border values as |nvim_open_win()|. + border = "rounded", + icons = { + cmd = icons.misc.Code, + config = icons.ui.Gear, + event = icons.kind.Event, + ft = icons.documents.Files, + init = icons.misc.ManUp, + import = icons.documents.Import, + keys = icons.ui.Keyboard, + loaded = icons.ui.Check, + not_loaded = icons.misc.Ghost, + plugin = icons.ui.Package, + runtime = icons.misc.Vim, + source = icons.kind.StaticMethod, + start = icons.ui.Play, + list = { + icons.ui_sep.BigCircle, + icons.ui_sep.BigUnfilledCircle, + icons.ui_sep.Square, + icons.ui_sep.ChevronRight, + }, + }, + }, + performance = { + cache = { + enabled = true, + path = vim.fn.stdpath("cache") .. "/lazy/cache", + -- Once one of the following events triggers, caching will be disabled. + -- To cache all modules, set this to `{}`, but that is not recommended. + disable_events = { "UIEnter", "BufReadPre" }, + ttl = 3600 * 24 * 2, -- keep unused modules for up to 2 days + }, + reset_packpath = true, -- reset the package path to improve startup time + rtp = { + reset = true, -- reset the runtime path to $VIMRUNTIME and the config directory + ---@type string[] + paths = {}, -- add any custom paths here that you want to include in the rtp + disabled_plugins = { + -- Comment out `"editorconfig"` to enable native EditorConfig support + -- WARN: Sleuth.vim already includes all the features provided by this plugin. + -- Do NOT enable both at the same time, or you risk breaking the entire detection system. + "editorconfig", + -- Do not load spell files + "spellfile", + -- Do not use builtin matchit.vim and matchparen.vim because we're using vim-matchup + "matchit", + "matchparen", + -- Do not load tohtml.vim + "tohtml", + -- Do not load zipPlugin.vim, gzip.vim and tarPlugin.vim (all of these plugins are + -- related to reading files inside compressed containers) + "gzip", + "tarPlugin", + "zipPlugin", + -- Disable remote plugins + -- NOTE: + -- > Disabling rplugin.vim will make `wilder.nvim` complain about missing rplugins during :checkhealth, + -- > but since it's config doesn't require python rtp (strictly), it's fine to ignore that for now. + -- "rplugin", + }, + }, + }, + } + if is_mac then + lazy_settings.concurrency = 20 + end + + vim.opt.rtp:prepend(lazy_path) + require("lazy").setup(self.modules, lazy_settings) +end + +Lazy:load_lazy() diff --git a/.config/mackup/.config/nvim/lua/core/settings.lua b/.config/mackup/.config/nvim/lua/core/settings.lua new file mode 100644 index 0000000..5d47dd9 --- /dev/null +++ b/.config/mackup/.config/nvim/lua/core/settings.lua @@ -0,0 +1,225 @@ +local settings = {} + +-- Set it to false if you want to use https to update plugins and treesitter parsers. +---@type boolean +settings["use_ssh"] = true + +-- Set it to false if you don't use copilot +---@type boolean +settings["use_copilot"] = true + +-- Set it to false if there is no need to format on save. +---@type boolean +settings["format_on_save"] = true + +-- Set format timeout here (in ms). +---@type number +settings["format_timeout"] = 1000 + +-- Set it to false if the notification after formatting is annoying. +---@type boolean +settings["format_notify"] = true + +-- Set it to true if you prefer formatting ONLY the *changed lines* as defined by your version control system. +-- NOTE: This entry will only be respected if: +-- > The buffer to be formatted is under version control (Git or Mercurial); +-- > Any of the server attached to that buffer supports |DocumentRangeFormattingProvider| server capability. +-- Otherwise Neovim would fall back to format the whole buffer, and a warning will be issued. +---@type boolean +settings["format_modifications_only"] = false + +-- Set the format disabled directories here, files under these dirs won't be formatted on save. +--- NOTE: Directories may contain regular expressions (grammar: vim). |regexp| +--- NOTE: Directories are automatically normalized. |vim.fs.normalize()| +---@type string[] +settings["format_disabled_dirs"] = { + -- Example + "~/format_disabled_dir", +} + +-- Filetypes in this list will skip lsp formatting if rhs is true. +---@type table +settings["formatter_block_list"] = { + lua = false, -- example +} + +-- Servers in this list will skip setting formatting capabilities if rhs is true. +---@type table +settings["server_formatting_block_list"] = { + clangd = true, + lua_ls = true, + ts_ls = true, +} + +-- Set it to false if you want to turn off LSP Inlay Hints +---@type boolean +settings["lsp_inlayhints"] = true + +-- Set it to false if diagnostics virtual text is annoying. +-- If disabled, you may browse lsp diagnostics using trouble.nvim (press `gt` to toggle it). +---@type boolean +settings["diagnostics_virtual_text"] = true + +-- Set it to one of the values below if you want to change the visible severity level of lsp diagnostics. +-- Priority: `Error` > `Warning` > `Information` > `Hint`. +-- > e.g. if you set this option to `Warning`, only lsp warnings and errors will be shown. +-- NOTE: This entry only works when `diagnostics_virtual_text` is true. +---@type "ERROR"|"WARN"|"INFO"|"HINT" +settings["diagnostics_level"] = "HINT" + +-- Set the plugins to disable here. +-- Example: "Some-User/A-Repo" +---@type string[] +settings["disabled_plugins"] = {} + +-- Set it to false if you don't use nvim to open big files. +---@type boolean +settings["load_big_files_faster"] = true + +-- Change the colors of the global palette here. +-- Settings will complete their replacement at initialization. +-- Parameters will be automatically completed as you type. +-- Example: { sky = "#04A5E5" } +---@type palette[] +settings["palette_overwrite"] = {} + +-- Set the colorscheme to use here. +-- Available values are: `catppuccin`, `catppuccin-latte`, `catppucin-mocha`, `catppuccin-frappe`, `catppuccin-macchiato`. +---@type string +settings["colorscheme"] = "catppuccin" + +-- Set it to true if your terminal has transparent background. +---@type boolean +settings["transparent_background"] = false + +-- Set background color to use here. +-- Useful if you would like to use a colorscheme that has a light and dark variant like `edge`. +-- Valid values are: `dark`, `light`. +---@type "dark"|"light" +settings["background"] = "dark" + +-- Set the command for handling external URLs here. The executable must be available on your $PATH. +-- This entry is IGNORED on Windows and macOS, which have their default handlers builtin. +---@type string +settings["external_browser"] = "chrome-cli open" + +-- Set the language servers that will be installed during bootstrap here. +-- check the below link for all the supported LSPs: +-- https://github.com/neovim/nvim-lspconfig/tree/master/lua/lspconfig/server_configurations +---@type string[] +settings["lsp_deps"] = { + "bashls", + "clangd", + "html", + "jsonls", + "lua_ls", + "pylsp", + "gopls", +} + +-- Set the general-purpose servers that will be installed during bootstrap here. +-- Check the below link for all supported sources. +-- in `code_actions`, `completion`, `diagnostics`, `formatting`, `hover` folders: +-- https://github.com/nvimtools/none-ls.nvim/tree/main/lua/null-ls/builtins +---@type string[] +settings["null_ls_deps"] = { + "clang_format", + "gofumpt", + "goimports", + "prettier", + "shfmt", + "stylua", + "vint", +} + +-- Set the Debug Adapter Protocol (DAP) clients that will be installed and configured during bootstrap here. +-- Check the below link for all supported DAPs: +-- https://github.com/jay-babu/mason-nvim-dap.nvim/blob/main/lua/mason-nvim-dap/mappings/source.lua +---@type string[] +settings["dap_deps"] = { + "codelldb", -- C-Family + "delve", -- Go + "python", -- Python (debugpy) +} + +-- Set the Treesitter parsers that will be installed during bootstrap here. +-- Check the below link for all supported languages: +-- https://github.com/nvim-treesitter/nvim-treesitter#supported-languages +---@type string[] +settings["treesitter_deps"] = { + "bash", + "c", + "cpp", + "css", + "go", + "gomod", + "html", + "javascript", + "json", + "jsonc", + "latex", + "lua", + "make", + "markdown", + "markdown_inline", + "python", + "rust", + "typescript", + "vimdoc", + "vue", + "yaml", +} + +-- Set the options for neovim's gui clients like `neovide` and `neovim-qt` here. +-- NOTE: Currently, only the following options related to the GUI are supported. Other entries will be IGNORED. +---@type { font_name: string, font_size: number } +settings["gui_config"] = { + font_name = "JetBrainsMono Nerd Font", + font_size = 12, +} + +-- Set the options specific to `neovide` here. +-- NOTE: You should remove the `neovide_` prefix (with trailing underscore) from all your entries below. +-- Check the below link for all supported entries: +-- https://neovide.dev/configuration.html +---@type table +settings["neovide_config"] = { + no_idle = true, + refresh_rate = 120, + cursor_vfx_mode = "railgun", + cursor_vfx_opacity = 200.0, + cursor_antialiasing = true, + cursor_trail_length = 0.05, + cursor_animation_length = 0.03, + cursor_vfx_particle_speed = 20.0, + cursor_vfx_particle_density = 5.0, + cursor_vfx_particle_lifetime = 1.2, +} + +-- Set the dashboard startup image here +-- You can generate the ascii image using: https://github.com/TheZoraiz/ascii-image-converter +-- More info: https://github.com/ayamir/nvimdots/wiki/Issues#change-dashboard-startup-image +---@type string[] +settings["dashboard_image"] = { + [[⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡿⠿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿]], + [[⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡿⠋⣠⣶⣾⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿]], + [[⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣡⣾⣿⣿⣿⣿⣿⢿⣿⣿⣿⣿⣿⣿⣟⠻⣿⣿⣿⣿⣿⣿⣿⣿]], + [[⣿⣿⣿⣿⣿⣿⣿⣿⡿⢫⣷⣿⣿⣿⣿⣿⣿⣿⣾⣯⣿⡿⢧⡚⢷⣌⣽⣿⣿⣿⣿⣿⣶⡌⣿⣿⣿⣿⣿⣿]], + [[⣿⣿⣿⣿⣿⣿⣿⣿⠇⢸⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣮⣇⣘⠿⢹⣿⣿⣿⣿⣿⣻⢿⣿⣿⣿⣿⣿]], + [[⣿⣿⣿⣿⣿⣿⣿⣿⠀⢸⣿⣿⡇⣿⣿⣿⣿⣿⣿⣿⣿⡟⢿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣦⣻⣿⣿⣿⣿]], + [[⣿⣿⣿⣿⣿⣿⣿⡇⠀⣬⠏⣿⡇⢻⣿⣿⣿⣿⣿⣿⣿⣷⣼⣿⣿⣸⣿⣿⣿⣿⣿⣿⣿⣿⣿⢻⣿⣿⣿⣿]], + [[⣿⣿⣿⣿⣿⣿⣿⠀⠈⠁⠀⣿⡇⠘⡟⣿⣿⣿⣿⣿⣿⣿⣿⡏⠿⣿⣟⣿⣿⣿⣿⣿⣿⣿⣿⣇⣿⣿⣿⣿]], + [[⣿⣿⣿⣿⣿⣿⡏⠀⠀⠐⠀⢻⣇⠀⠀⠹⣿⣿⣿⣿⣿⣿⣩⡶⠼⠟⠻⠞⣿⡈⠻⣟⢻⣿⣿⣿⣿⣿⣿⣿]], + [[⣿⣿⣿⣿⣿⣿⡇⠀⠀⠀⠀⠀⢿⠀⡆⠀⠘⢿⢻⡿⣿⣧⣷⢣⣶⡃⢀⣾⡆⡋⣧⠙⢿⣿⣿⣟⣿⣿⣿⣿]], + [[⣿⣿⣿⣿⣿⣿⡿⠀⠀⠀⠀⠀⠀⠀⡥⠂⡐⠀⠁⠑⣾⣿⣿⣾⣿⣿⣿⡿⣷⣷⣿⣧⣾⣿⣿⣿⣿⣿⣿⣿]], + [[⣿⣿⡿⣿⣍⡴⠆⠀⠀⠀⠀⠀⠀⠀⠀⣼⣄⣀⣷⡄⣙⢿⣿⣿⣿⣿⣯⣶⣿⣿⢟⣾⣿⣿⢡⣿⣿⣿⣿⣿]], + [[⣿⡏⣾⣿⣿⣿⣷⣦⠀⠀⠀⢀⡀⠀⠀⠠⣭⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡿⠟⣡⣾⣿⣿⢏⣾⣿⣿⣿⣿⣿]], + [[⣿⣿⣿⣿⣿⣿⣿⣿⡴⠀⠀⠀⠀⠀⠠⠀⠰⣿⣿⣿⣷⣿⠿⠿⣿⣿⣭⡶⣫⠔⢻⢿⢇⣾⣿⣿⣿⣿⣿⣿]], + [[⣿⣿⣿⡿⢫⣽⠟⣋⠀⠀⠀⠀⣶⣦⠀⠀⠀⠈⠻⣿⣿⣿⣾⣿⣿⣿⣿⡿⣣⣿⣿⢸⣾⣿⣿⣿⣿⣿⣿⣿]], + [[⡿⠛⣹⣶⣶⣶⣾⣿⣷⣦⣤⣤⣀⣀⠀⠀⠀⠀⠀⠀⠉⠛⠻⢿⣿⡿⠫⠾⠿⠋⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿]], + [[⢀⣾⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣀⡆⣠⢀⣴⣏⡀⠀⠀⠀⠉⠀⠀⢀⣠⣰⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿]], + [[⠿⠛⠛⠛⠛⠛⠛⠻⢿⣿⣿⣿⣿⣯⣟⠷⢷⣿⡿⠋⠀⠀⠀⠀⣵⡀⢠⡿⠋⢻⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿]], + [[⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠉⠉⠛⢿⣿⣿⠂⠀⠀⠀⠀⠀⢀⣽⣿⣿⣿⣿⣿⣿⣿⣍⠛⠿⣿⣿⣿⣿⣿⣿]], +} + +return require("modules.utils").extend_config(settings, "user.settings") diff --git a/.config/mackup/.config/nvim/lua/keymap/bind.lua b/.config/mackup/.config/nvim/lua/keymap/bind.lua new file mode 100644 index 0000000..a5c4b8d --- /dev/null +++ b/.config/mackup/.config/nvim/lua/keymap/bind.lua @@ -0,0 +1,169 @@ +---@class map_rhs +---@field cmd string +---@field options table +---@field options.noremap boolean +---@field options.silent boolean +---@field options.expr boolean +---@field options.nowait boolean +---@field options.callback function +---@field options.desc string +---@field buffer boolean|number +local rhs_options = {} + +function rhs_options:new() + local instance = { + cmd = "", + options = { + noremap = false, + silent = false, + expr = false, + nowait = false, + callback = nil, + desc = "", + }, + buffer = false, + } + setmetatable(instance, self) + self.__index = self + return instance +end + +---@param cmd_string string +---@return map_rhs +function rhs_options:map_cmd(cmd_string) + self.cmd = cmd_string + return self +end + +---@param cmd_string string +---@return map_rhs +function rhs_options:map_cr(cmd_string) + self.cmd = (":%s"):format(cmd_string) + return self +end + +---@param cmd_string string +---@return map_rhs +function rhs_options:map_args(cmd_string) + self.cmd = (":%s"):format(cmd_string) + return self +end + +---@param cmd_string string +---@return map_rhs +function rhs_options:map_cu(cmd_string) + -- to eliminate the automatically inserted range in visual mode + self.cmd = (":%s"):format(cmd_string) + return self +end + +---@param callback fun():nil +--- Takes a callback that will be called when the key is pressed +---@return map_rhs +function rhs_options:map_callback(callback) + self.cmd = "" + self.options.callback = callback + return self +end + +---@return map_rhs +function rhs_options:with_silent() + self.options.silent = true + return self +end + +---@param description_string string +---@return map_rhs +function rhs_options:with_desc(description_string) + self.options.desc = description_string + return self +end + +---@return map_rhs +function rhs_options:with_noremap() + self.options.noremap = true + return self +end + +---@return map_rhs +function rhs_options:with_expr() + self.options.expr = true + return self +end + +---@return map_rhs +function rhs_options:with_nowait() + self.options.nowait = true + return self +end + +---@param num number +---@return map_rhs +function rhs_options:with_buffer(num) + self.buffer = num + return self +end + +local bind = {} + +---@param cmd_string string +---@return map_rhs +function bind.map_cr(cmd_string) + local ro = rhs_options:new() + return ro:map_cr(cmd_string) +end + +---@param cmd_string string +---@return map_rhs +function bind.map_cmd(cmd_string) + local ro = rhs_options:new() + return ro:map_cmd(cmd_string) +end + +---@param cmd_string string +---@return map_rhs +function bind.map_cu(cmd_string) + local ro = rhs_options:new() + return ro:map_cu(cmd_string) +end + +---@param cmd_string string +---@return map_rhs +function bind.map_args(cmd_string) + local ro = rhs_options:new() + return ro:map_args(cmd_string) +end + +---@param callback fun():nil +---@return map_rhs +function bind.map_callback(callback) + local ro = rhs_options:new() + return ro:map_callback(callback) +end + +---@param cmd_string string +---@return string escaped_string +function bind.escape_termcode(cmd_string) + return vim.api.nvim_replace_termcodes(cmd_string, true, true, true) +end + +---@param mapping table +function bind.nvim_load_mapping(mapping) + for key, value in pairs(mapping) do + local modes, keymap = key:match("([^|]*)|?(.*)") + if type(value) == "table" then + for _, mode in ipairs(vim.split(modes, "")) do + local rhs = value.cmd + local options = value.options + local buf = value.buffer + if buf and type(buf) == "number" then + vim.api.nvim_buf_set_keymap(buf, mode, keymap, rhs, options) + else + vim.api.nvim_set_keymap(mode, keymap, rhs, options) + end + end + end + end +end + +return bind diff --git a/.config/mackup/.config/nvim/lua/keymap/completion.lua b/.config/mackup/.config/nvim/lua/keymap/completion.lua new file mode 100644 index 0000000..40a1de8 --- /dev/null +++ b/.config/mackup/.config/nvim/lua/keymap/completion.lua @@ -0,0 +1,91 @@ +local bind = require("keymap.bind") +local map_cr = bind.map_cr +local map_callback = bind.map_callback + +local mappings = { + fmt = { + ["n|"] = map_cr("FormatToggle"):with_noremap():with_silent():with_desc("formatter: Toggle format on save"), + ["n|"] = map_cr("Format"):with_noremap():with_silent():with_desc("formatter: Format buffer manually"), + }, +} +bind.nvim_load_mapping(mappings.fmt) + +--- The following code allows this file to be exported --- +--- for use with LSP lazy-loaded keymap bindings --- + +local M = {} + +---@param buf integer +function M.lsp(buf) + local map = { + -- LSP-related keymaps, ONLY effective in buffers with LSP(s) attached + ["n|li"] = map_cr("LspInfo"):with_silent():with_buffer(buf):with_desc("lsp: Info"), + ["n|lr"] = map_cr("LspRestart"):with_silent():with_buffer(buf):with_nowait():with_desc("lsp: Restart"), + ["n|go"] = map_callback(function() + require("edgy").toggle("right") + end) + :with_silent() + :with_buffer(buf) + :with_desc("lsp: Toggle outline"), + ["n|g["] = map_cr("Lspsaga diagnostic_jump_prev") + :with_silent() + :with_buffer(buf) + :with_desc("lsp: Prev diagnostic"), + ["n|g]"] = map_cr("Lspsaga diagnostic_jump_next") + :with_silent() + :with_buffer(buf) + :with_desc("lsp: Next diagnostic"), + ["n|lx"] = map_cr("Lspsaga show_line_diagnostics ++unfocus") + :with_silent() + :with_buffer(buf) + :with_desc("lsp: Line diagnostic"), + ["n|gs"] = map_callback(function() + vim.lsp.buf.signature_help() + end):with_desc("lsp: Signature help"), + ["n|gr"] = map_cr("Lspsaga rename"):with_silent():with_buffer(buf):with_desc("lsp: Rename in file range"), + ["n|gR"] = map_cr("Lspsaga rename ++project") + :with_silent() + :with_buffer(buf) + :with_desc("lsp: Rename in project range"), + ["n|K"] = map_cr("Lspsaga hover_doc"):with_silent():with_buffer(buf):with_desc("lsp: Show doc"), + ["nv|ga"] = map_cr("Lspsaga code_action") + :with_silent() + :with_buffer(buf) + :with_desc("lsp: Code action for cursor"), + ["n|gd"] = map_cr("Glance definitions"):with_silent():with_buffer(buf):with_desc("lsp: Preview definition"), + ["n|gD"] = map_cr("Lspsaga goto_definition"):with_silent():with_buffer(buf):with_desc("lsp: Goto definition"), + ["n|gh"] = map_cr("Glance references"):with_silent():with_buffer(buf):with_desc("lsp: Show reference"), + ["n|gm"] = map_cr("Glance implementations") + :with_silent() + :with_buffer(buf) + :with_desc("lsp: Show implementation"), + ["n|gci"] = map_cr("Lspsaga incoming_calls") + :with_silent() + :with_buffer(buf) + :with_desc("lsp: Show incoming calls"), + ["n|gco"] = map_cr("Lspsaga outgoing_calls") + :with_silent() + :with_buffer(buf) + :with_desc("lsp: Show outgoing calls"), + ["n|lv"] = map_callback(function() + _toggle_virtualtext() + end) + :with_noremap() + :with_silent() + :with_desc("lsp: Toggle virtual text display of current buffer"), + ["n|lh"] = map_callback(function() + _toggle_inlayhint() + end) + :with_noremap() + :with_silent() + :with_desc("lsp: Toggle inlay hints dispaly of current buffer"), + } + bind.nvim_load_mapping(map) + + local ok, user_mappings = pcall(require, "user.keymap.completion") + if ok and type(user_mappings.lsp) == "function" then + require("modules.utils.keymap").replace(user_mappings.lsp(buf)) + end +end + +return M diff --git a/.config/mackup/.config/nvim/lua/keymap/editor.lua b/.config/mackup/.config/nvim/lua/keymap/editor.lua new file mode 100644 index 0000000..752615f --- /dev/null +++ b/.config/mackup/.config/nvim/lua/keymap/editor.lua @@ -0,0 +1,140 @@ +local bind = require("keymap.bind") +local map_cr = bind.map_cr +local map_cu = bind.map_cu +local map_cmd = bind.map_cmd +local map_callback = bind.map_callback +local et = bind.escape_termcode + +local mappings = { + builtins = { + -- Builtins: Save & Quit + ["n|"] = map_cu("write"):with_noremap():with_silent():with_desc("edit: Save file"), + ["n|"] = map_cr("wq"):with_desc("edit: Save file and quit"), + ["n|"] = map_cr("q!"):with_desc("edit: Force quit"), + + -- Builtins: Insert mode + ["i|"] = map_cmd("u"):with_noremap():with_desc("edit: Delete previous block"), + ["i|"] = map_cmd(""):with_noremap():with_desc("edit: Move cursor to left"), + ["i|"] = map_cmd("^i"):with_noremap():with_desc("edit: Move cursor to line start"), + ["i|"] = map_cmd(":w"):with_desc("edit: Save file"), + ["i|"] = map_cmd(":wq"):with_desc("edit: Save file and quit"), + + -- Builtins: Command mode + ["c|"] = map_cmd(""):with_noremap():with_desc("edit: Left"), + ["c|"] = map_cmd(""):with_noremap():with_desc("edit: Right"), + ["c|"] = map_cmd(""):with_noremap():with_desc("edit: Home"), + ["c|"] = map_cmd(""):with_noremap():with_desc("edit: End"), + ["c|"] = map_cmd(""):with_noremap():with_desc("edit: Delete"), + ["c|"] = map_cmd(""):with_noremap():with_desc("edit: Backspace"), + ["c|"] = map_cmd([[=expand("%:p:h") . "/" ]]) + :with_noremap() + :with_desc("edit: Complete path of current file"), + + -- Builtins: Visual mode + ["v|J"] = map_cmd(":m '>+1gv=gv"):with_desc("edit: Move this line down"), + ["v|K"] = map_cmd(":m '<-2gv=gv"):with_desc("edit: Move this line up"), + ["v|<"] = map_cmd(""] = map_cmd(">gv"):with_desc("edit: Increase indent"), + + -- Builtins: "Suckless" - named after r/suckless + ["n|Y"] = map_cmd("y$"):with_desc("edit: Yank text to EOL"), + ["n|D"] = map_cmd("d$"):with_desc("edit: Delete text to EOL"), + ["n|n"] = map_cmd("nzzzv"):with_noremap():with_desc("edit: Next search result"), + ["n|N"] = map_cmd("Nzzzv"):with_noremap():with_desc("edit: Prev search result"), + ["n|J"] = map_cmd("mzJ`z"):with_noremap():with_desc("edit: Join next line"), + ["n|"] = map_cr("normal za"):with_noremap():with_silent():with_desc("edit: Toggle code fold"), + ["n|"] = map_callback(function() + _flash_esc_or_noh() + end) + :with_noremap() + :with_silent() + :with_desc("edit: Clear search highlight"), + ["n|o"] = map_cr("setlocal spell! spelllang=en_us"):with_desc("edit: Toggle spell check"), + }, + plugins = { + -- Plugin: persisted.nvim + ["n|ss"] = map_cu("SessionSave"):with_noremap():with_silent():with_desc("session: Save"), + ["n|sl"] = map_cu("SessionLoad"):with_noremap():with_silent():with_desc("session: Load current"), + ["n|sd"] = map_cu("SessionDelete"):with_noremap():with_silent():with_desc("session: Delete"), + + -- Plugin: comment.nvim + ["n|gcc"] = map_callback(function() + return vim.v.count == 0 and et("(comment_toggle_linewise_current)") + or et("(comment_toggle_linewise_count)") + end) + :with_silent() + :with_noremap() + :with_expr() + :with_desc("edit: Toggle comment for line"), + ["n|gbc"] = map_callback(function() + return vim.v.count == 0 and et("(comment_toggle_blockwise_current)") + or et("(comment_toggle_blockwise_count)") + end) + :with_silent() + :with_noremap() + :with_expr() + :with_desc("edit: Toggle comment for block"), + ["n|gc"] = map_cmd("(comment_toggle_linewise)") + :with_silent() + :with_noremap() + :with_desc("edit: Toggle comment for line with operator"), + ["n|gb"] = map_cmd("(comment_toggle_blockwise)") + :with_silent() + :with_noremap() + :with_desc("edit: Toggle comment for block with operator"), + ["x|gc"] = map_cmd("(comment_toggle_linewise_visual)") + :with_silent() + :with_noremap() + :with_desc("edit: Toggle comment for line with selection"), + ["x|gb"] = map_cmd("(comment_toggle_blockwise_visual)") + :with_silent() + :with_noremap() + :with_desc("edit: Toggle comment for block with selection"), + + -- Plugin: diffview.nvim + ["n|gd"] = map_cr("DiffviewOpen"):with_silent():with_noremap():with_desc("git: Show diff"), + ["n|gD"] = map_cr("DiffviewClose"):with_silent():with_noremap():with_desc("git: Close diff"), + + -- Plugin: hop.nvim + ["nv|w"] = map_cmd("HopWordMW"):with_noremap():with_desc("jump: Goto word"), + ["nv|j"] = map_cmd("HopLineMW"):with_noremap():with_desc("jump: Goto line"), + ["nv|k"] = map_cmd("HopLineMW"):with_noremap():with_desc("jump: Goto line"), + ["nv|c"] = map_cmd("HopChar1MW"):with_noremap():with_desc("jump: Goto one char"), + ["nv|C"] = map_cmd("HopChar2MW"):with_noremap():with_desc("jump: Goto two chars"), + + -- Plugin: grug-far + ["n|Ss"] = map_callback(function() + require("grug-far").open() + end) + :with_silent() + :with_noremap() + :with_desc("editn: Toggle search & replace panel"), + ["n|Sp"] = map_callback(function() + require("grug-far").open({ prefills = { search = vim.fn.expand("") } }) + end) + :with_silent() + :with_noremap() + :with_desc("editn: search&replace current word (project)"), + ["v|Sp"] = map_callback(function() + require("grug-far").with_visual_selection() + end) + :with_silent() + :with_noremap() + :with_desc("edit: search & replace current word (project)"), + ["n|Sf"] = map_callback(function() + require("grug-far").open({ prefills = { paths = vim.fn.expand("%") } }) + end) + :with_silent() + :with_noremap() + :with_desc("editn: search & replace current word (file)"), + + -- Plugin: nvim-treehopper + ["o|m"] = map_cu("lua require('tsht').nodes()"):with_silent():with_desc("jump: Operate across syntax tree"), + + -- Plugin: suda.vim + ["n|"] = map_cu("SudaWrite"):with_silent():with_noremap():with_desc("editn: Save file using sudo"), + }, +} + +bind.nvim_load_mapping(mappings.builtins) +bind.nvim_load_mapping(mappings.plugins) diff --git a/.config/mackup/.config/nvim/lua/keymap/helpers.lua b/.config/mackup/.config/nvim/lua/keymap/helpers.lua new file mode 100644 index 0000000..f0c1e44 --- /dev/null +++ b/.config/mackup/.config/nvim/lua/keymap/helpers.lua @@ -0,0 +1,86 @@ +_G._command_panel = function() + require("telescope.builtin").keymaps({ + lhs_filter = function(lhs) + return not string.find(lhs, "Þ") + end, + }) +end + +_G._flash_esc_or_noh = function() + local flash_active, state = pcall(function() + return require("flash.plugins.char").state + end) + if flash_active and state then + state:hide() + else + pcall(vim.cmd.noh) + end +end + +_G._telescope_collections = function(picker_type) + local actions = require("telescope.actions") + local action_state = require("telescope.actions.state") + local conf = require("telescope.config").values + local finder = require("telescope.finders") + local pickers = require("telescope.pickers") + picker_type = picker_type or {} + + local collections = vim.tbl_keys(require("search.tabs").collections) + pickers + .new(picker_type, { + prompt_title = "Telescope Collections", + finder = finder.new_table({ results = collections }), + sorter = conf.generic_sorter(picker_type), + attach_mappings = function(bufnr) + actions.select_default:replace(function() + actions.close(bufnr) + local selection = action_state.get_selected_entry() + require("search").open({ collection = selection[1] }) + end) + + return true + end, + }) + :find() +end + +_G._toggle_inlayhint = function() + local is_enabled = vim.lsp.inlay_hint.is_enabled() + + vim.lsp.inlay_hint.enable(not is_enabled) + vim.notify( + (is_enabled and "Inlay hint disabled successfully" or "Inlay hint enabled successfully"), + vim.log.levels.INFO, + { title = "LSP Inlay Hint" } + ) +end + +local _vt_enabled = require("core.settings").diagnostics_virtual_text +_G._toggle_virtualtext = function() + if vim.diagnostic.is_enabled() then + _vt_enabled = not _vt_enabled + vim.diagnostic[_vt_enabled and "show" or "hide"]() + vim.notify( + (_vt_enabled and "Virtual text is now displayed" or "Virtual text is now hidden"), + vim.log.levels.INFO, + { title = "LSP Diagnostic" } + ) + end +end + +local _lazygit = nil +_G._toggle_lazygit = function() + if vim.fn.executable("lazygit") == 1 then + if not _lazygit then + _lazygit = require("toggleterm.terminal").Terminal:new({ + cmd = "lazygit", + direction = "float", + close_on_exit = true, + hidden = true, + }) + end + _lazygit:toggle() + else + vim.notify("Command [lazygit] not found!", vim.log.levels.ERROR, { title = "toggleterm.nvim" }) + end +end diff --git a/.config/mackup/.config/nvim/lua/keymap/init.lua b/.config/mackup/.config/nvim/lua/keymap/init.lua new file mode 100644 index 0000000..2612027 --- /dev/null +++ b/.config/mackup/.config/nvim/lua/keymap/init.lua @@ -0,0 +1,50 @@ +require("keymap.helpers") +local bind = require("keymap.bind") +local map_cr = bind.map_cr + +local mappings = { + core = { + -- Package manager: lazy.nvim + ["n|ph"] = map_cr("Lazy"):with_silent():with_noremap():with_nowait():with_desc("package: Show"), + ["n|ps"] = map_cr("Lazy sync"):with_silent():with_noremap():with_nowait():with_desc("package: Sync"), + ["n|pu"] = map_cr("Lazy update") + :with_silent() + :with_noremap() + :with_nowait() + :with_desc("package: Update"), + ["n|pi"] = map_cr("Lazy install") + :with_silent() + :with_noremap() + :with_nowait() + :with_desc("package: Install"), + ["n|pl"] = map_cr("Lazy log"):with_silent():with_noremap():with_nowait():with_desc("package: Log"), + ["n|pc"] = map_cr("Lazy check"):with_silent():with_noremap():with_nowait():with_desc("package: Check"), + ["n|pd"] = map_cr("Lazy debug"):with_silent():with_noremap():with_nowait():with_desc("package: Debug"), + ["n|pp"] = map_cr("Lazy profile") + :with_silent() + :with_noremap() + :with_nowait() + :with_desc("package: Profile"), + ["n|pr"] = map_cr("Lazy restore") + :with_silent() + :with_noremap() + :with_nowait() + :with_desc("package: Restore"), + ["n|px"] = map_cr("Lazy clean"):with_silent():with_noremap():with_nowait():with_desc("package: Clean"), + }, +} + +bind.nvim_load_mapping(mappings.core) + +-- Builtin & Plugin keymaps +require("keymap.completion") +require("keymap.editor") +require("keymap.lang") +require("keymap.tool") +require("keymap.ui") + +-- User keymaps +local ok, def = pcall(require, "user.keymap.init") +if ok then + require("modules.utils.keymap").replace(def) +end diff --git a/.config/mackup/.config/nvim/lua/keymap/lang.lua b/.config/mackup/.config/nvim/lua/keymap/lang.lua new file mode 100644 index 0000000..23af635 --- /dev/null +++ b/.config/mackup/.config/nvim/lua/keymap/lang.lua @@ -0,0 +1,16 @@ +local bind = require("keymap.bind") +local map_cr = bind.map_cr + +local mappings = { + plugins = { + -- Plugin: render-markdown.nvim + ["n|"] = map_cr("RenderMarkdown toggle") + :with_noremap() + :with_silent() + :with_desc("tool: toggle markdown preview within nvim"), + -- Plugin: MarkdownPreview + ["n|"] = map_cr("MarkdownPreviewToggle"):with_noremap():with_silent():with_desc("tool: Preview markdown"), + }, +} + +bind.nvim_load_mapping(mappings.plugins) diff --git a/.config/mackup/.config/nvim/lua/keymap/tool.lua b/.config/mackup/.config/nvim/lua/keymap/tool.lua new file mode 100644 index 0000000..c32304a --- /dev/null +++ b/.config/mackup/.config/nvim/lua/keymap/tool.lua @@ -0,0 +1,216 @@ +local vim_path = require("core.global").vim_path +local bind = require("keymap.bind") +local map_cr = bind.map_cr +local map_cu = bind.map_cu +local map_cmd = bind.map_cmd +local map_callback = bind.map_callback +require("keymap.helpers") + +local mappings = { + plugins = { + -- Plugin: edgy + ["n|"] = map_callback(function() + require("edgy").toggle("left") + end) + :with_noremap() + :with_silent() + :with_desc("filetree: Toggle"), + + -- Plugin: vim-fugitive + ["n|gps"] = map_cr("G push"):with_noremap():with_silent():with_desc("git: Push"), + ["n|gpl"] = map_cr("G pull"):with_noremap():with_silent():with_desc("git: Pull"), + ["n|gG"] = map_cu("Git"):with_noremap():with_silent():with_desc("git: Open git-fugitive"), + + -- Plugin: nvim-tree + ["n|nf"] = map_cr("NvimTreeFindFile"):with_noremap():with_silent():with_desc("filetree: Find file"), + ["n|nr"] = map_cr("NvimTreeRefresh"):with_noremap():with_silent():with_desc("filetree: Refresh"), + + -- Plugin: sniprun + ["v|r"] = map_cr("SnipRun"):with_noremap():with_silent():with_desc("tool: Run code by range"), + ["n|r"] = map_cu([[%SnipRun]]):with_noremap():with_silent():with_desc("tool: Run code by file"), + + -- Plugin: toggleterm + ["t|"] = map_cmd([[]]):with_noremap():with_silent(), -- switch to normal mode in terminal. + ["n|"] = map_cr("ToggleTerm direction=horizontal") + :with_noremap() + :with_silent() + :with_desc("terminal: Toggle horizontal"), + ["i|"] = map_cmd("ToggleTerm direction=horizontal") + :with_noremap() + :with_silent() + :with_desc("terminal: Toggle horizontal"), + ["t|"] = map_cmd("ToggleTerm") + :with_noremap() + :with_silent() + :with_desc("terminal: Toggle horizontal"), + ["n|"] = map_cr("ToggleTerm direction=vertical") + :with_noremap() + :with_silent() + :with_desc("terminal: Toggle vertical"), + ["i|"] = map_cmd("ToggleTerm direction=vertical") + :with_noremap() + :with_silent() + :with_desc("terminal: Toggle vertical"), + ["t|"] = map_cmd("ToggleTerm") + :with_noremap() + :with_silent() + :with_desc("terminal: Toggle vertical"), + ["n|"] = map_cr("ToggleTerm direction=vertical") + :with_noremap() + :with_silent() + :with_desc("terminal: Toggle vertical"), + ["i|"] = map_cmd("ToggleTerm direction=vertical") + :with_noremap() + :with_silent() + :with_desc("terminal: Toggle vertical"), + ["t|"] = map_cmd("ToggleTerm"):with_noremap():with_silent():with_desc("terminal: Toggle vertical"), + ["n|"] = map_cr("ToggleTerm direction=float") + :with_noremap() + :with_silent() + :with_desc("terminal: Toggle float"), + ["i|"] = map_cmd("ToggleTerm direction=float") + :with_noremap() + :with_silent() + :with_desc("terminal: Toggle float"), + ["t|"] = map_cmd("ToggleTerm"):with_noremap():with_silent():with_desc("terminal: Toggle float"), + ["n|gg"] = map_callback(function() + _toggle_lazygit() + end) + :with_noremap() + :with_silent() + :with_desc("git: Toggle lazygit"), + + -- Plugin: trouble + ["n|gt"] = map_cr("Trouble diagnostics toggle") + :with_noremap() + :with_silent() + :with_desc("lsp: Toggle trouble list"), + ["n|lw"] = map_cr("Trouble diagnostics toggle") + :with_noremap() + :with_silent() + :with_desc("lsp: Show workspace diagnostics"), + ["n|lp"] = map_cr("Trouble project_diagnostics toggle") + :with_noremap() + :with_silent() + :with_desc("lsp: Show project diagnostics"), + ["n|ld"] = map_cr("Trouble diagnostics toggle filter.buf=0") + :with_noremap() + :with_silent() + :with_desc("lsp: Show document diagnostics"), + + -- Plugin: telescope + ["n|"] = map_callback(function() + _command_panel() + end) + :with_noremap() + :with_silent() + :with_desc("tool: Toggle command panel"), + ["n|fc"] = map_callback(function() + _telescope_collections(require("telescope.themes").get_dropdown()) + end) + :with_noremap() + :with_silent() + :with_desc("tool: Open Telescope collections"), + ["n|ff"] = map_callback(function() + require("search").open({ collection = "file" }) + end) + :with_noremap() + :with_silent() + :with_desc("tool: Find files"), + ["n|fp"] = map_callback(function() + require("search").open({ collection = "pattern" }) + end) + :with_noremap() + :with_silent() + :with_desc("tool: Find patterns"), + ["v|fs"] = map_callback(function() + local opts = vim.fn.getcwd() == vim_path and { additional_args = { "--no-ignore" } } or {} + require("telescope-live-grep-args.shortcuts").grep_visual_selection(opts) + end) + :with_noremap() + :with_silent() + :with_desc("tool: Find word under cursor"), + ["n|fg"] = map_callback(function() + require("search").open({ collection = "git" }) + end) + :with_noremap() + :with_silent() + :with_desc("tool: Locate Git objects"), + ["n|fd"] = map_callback(function() + require("search").open({ collection = "dossier" }) + end) + :with_noremap() + :with_silent() + :with_desc("tool: Retrieve dossiers"), + ["n|fm"] = map_callback(function() + require("search").open({ collection = "misc" }) + end) + :with_noremap() + :with_silent() + :with_desc("tool: Miscellaneous"), + + -- Plugin: dap + ["n|"] = map_callback(function() + require("dap").continue() + end) + :with_noremap() + :with_silent() + :with_desc("debug: Run/Continue"), + ["n|"] = map_callback(function() + require("dap").terminate() + end) + :with_noremap() + :with_silent() + :with_desc("debug: Stop"), + ["n|"] = map_callback(function() + require("dap").toggle_breakpoint() + end) + :with_noremap() + :with_silent() + :with_desc("debug: Toggle breakpoint"), + ["n|"] = map_callback(function() + require("dap").step_into() + end) + :with_noremap() + :with_silent() + :with_desc("debug: Step into"), + ["n|"] = map_callback(function() + require("dap").step_out() + end) + :with_noremap() + :with_silent() + :with_desc("debug: Step out"), + ["n|"] = map_callback(function() + require("dap").step_over() + end) + :with_noremap() + :with_silent() + :with_desc("debug: Step over"), + ["n|db"] = map_callback(function() + require("dap").set_breakpoint(vim.fn.input("Breakpoint condition: ")) + end) + :with_noremap() + :with_silent() + :with_desc("debug: Set breakpoint with condition"), + ["n|dc"] = map_callback(function() + require("dap").run_to_cursor() + end) + :with_noremap() + :with_silent() + :with_desc("debug: Run to cursor"), + ["n|dl"] = map_callback(function() + require("dap").run_last() + end) + :with_noremap() + :with_silent() + :with_desc("debug: Run last"), + ["n|do"] = map_callback(function() + require("dap").repl.open() + end) + :with_noremap() + :with_silent() + :with_desc("debug: Open REPL"), + }, +} + +bind.nvim_load_mapping(mappings.plugins) diff --git a/.config/mackup/.config/nvim/lua/keymap/ui.lua b/.config/mackup/.config/nvim/lua/keymap/ui.lua new file mode 100644 index 0000000..9398196 --- /dev/null +++ b/.config/mackup/.config/nvim/lua/keymap/ui.lua @@ -0,0 +1,171 @@ +local bind = require("keymap.bind") +local map_cr = bind.map_cr +local map_cu = bind.map_cu +local map_cmd = bind.map_cmd +local map_callback = bind.map_callback + +local mappings = { + builtins = { + -- Builtins: Buffer + ["n|bn"] = map_cu("enew"):with_noremap():with_silent():with_desc("buffer: New"), + + -- Builtins: Terminal + ["t|h"] = map_cmd("wincmd h"):with_silent():with_noremap():with_desc("window: Focus left"), + ["t|l"] = map_cmd("wincmd l"):with_silent():with_noremap():with_desc("window: Focus right"), + ["t|j"] = map_cmd("wincmd j"):with_silent():with_noremap():with_desc("window: Focus down"), + ["t|k"] = map_cmd("wincmd k"):with_silent():with_noremap():with_desc("window: Focus up"), + + -- Builtins: Tabpage + ["n|tn"] = map_cr("tabnew"):with_noremap():with_silent():with_desc("tab: Create a new tab"), + ["n|tk"] = map_cr("tabnext"):with_noremap():with_silent():with_desc("tab: Move to next tab"), + ["n|tj"] = map_cr("tabprevious"):with_noremap():with_silent():with_desc("tab: Move to previous tab"), + ["n|to"] = map_cr("tabonly"):with_noremap():with_silent():with_desc("tab: Only keep current tab"), + }, + plugins = { + -- Plugin: nvim-bufdel + ["n|"] = map_cr("BufDel"):with_noremap():with_silent():with_desc("buffer: Close current"), + + -- Plugin: bufferline.nvim + ["n|"] = map_cr("BufferLineCycleNext"):with_noremap():with_silent():with_desc("buffer: Switch to next"), + ["n|"] = map_cr("BufferLineCyclePrev"):with_noremap():with_silent():with_desc("buffer: Switch to prev"), + ["n|"] = map_cr("BufferLineMoveNext") + :with_noremap() + :with_silent() + :with_desc("buffer: Move current to next"), + ["n|"] = map_cr("BufferLineMovePrev") + :with_noremap() + :with_silent() + :with_desc("buffer: Move current to prev"), + ["n|be"] = map_cr("BufferLineSortByExtension"):with_noremap():with_desc("buffer: Sort by extension"), + ["n|bd"] = map_cr("BufferLineSortByDirectory"):with_noremap():with_desc("buffer: Sort by directory"), + ["n|"] = map_cr("BufferLineGoToBuffer 1"):with_noremap():with_silent():with_desc("buffer: Goto buffer 1"), + ["n|"] = map_cr("BufferLineGoToBuffer 2"):with_noremap():with_silent():with_desc("buffer: Goto buffer 2"), + ["n|"] = map_cr("BufferLineGoToBuffer 3"):with_noremap():with_silent():with_desc("buffer: Goto buffer 3"), + ["n|"] = map_cr("BufferLineGoToBuffer 4"):with_noremap():with_silent():with_desc("buffer: Goto buffer 4"), + ["n|"] = map_cr("BufferLineGoToBuffer 5"):with_noremap():with_silent():with_desc("buffer: Goto buffer 5"), + ["n|"] = map_cr("BufferLineGoToBuffer 6"):with_noremap():with_silent():with_desc("buffer: Goto buffer 6"), + ["n|"] = map_cr("BufferLineGoToBuffer 7"):with_noremap():with_silent():with_desc("buffer: Goto buffer 7"), + ["n|"] = map_cr("BufferLineGoToBuffer 8"):with_noremap():with_silent():with_desc("buffer: Goto buffer 8"), + ["n|"] = map_cr("BufferLineGoToBuffer 9"):with_noremap():with_silent():with_desc("buffer: Goto buffer 9"), + + -- Plugin: smart-splits.nvim + ["n|"] = map_cu("SmartResizeLeft") + :with_silent() + :with_noremap() + :with_desc("window: Resize -3 horizontally"), + ["n|"] = map_cu("SmartResizeDown"):with_silent():with_noremap():with_desc("window: Resize -3 vertically"), + ["n|"] = map_cu("SmartResizeUp"):with_silent():with_noremap():with_desc("window: Resize +3 vertically"), + ["n|"] = map_cu("SmartResizeRight") + :with_silent() + :with_noremap() + :with_desc("window: Resize +3 horizontally"), + ["n|"] = map_cu("SmartCursorMoveLeft"):with_silent():with_noremap():with_desc("window: Focus left"), + ["n|"] = map_cu("SmartCursorMoveDown"):with_silent():with_noremap():with_desc("window: Focus down"), + ["n|"] = map_cu("SmartCursorMoveUp"):with_silent():with_noremap():with_desc("window: Focus up"), + ["n|"] = map_cu("SmartCursorMoveRight"):with_silent():with_noremap():with_desc("window: Focus right"), + ["n|Wh"] = map_cu("SmartSwapLeft") + :with_silent() + :with_noremap() + :with_desc("window: Move window leftward"), + ["n|Wj"] = map_cu("SmartSwapDown") + :with_silent() + :with_noremap() + :with_desc("window: Move window downward"), + ["n|Wk"] = map_cu("SmartSwapUp"):with_silent():with_noremap():with_desc("window: Move window upward"), + ["n|Wl"] = map_cu("SmartSwapRight") + :with_silent() + :with_noremap() + :with_desc("window: Move window rightward"), + }, +} + +bind.nvim_load_mapping(mappings.builtins) +bind.nvim_load_mapping(mappings.plugins) + +--- The following code enables this file to be exported --- +--- for use with gitsigns lazy-loaded keymap bindings --- + +local M = {} + +function M.gitsigns(bufnr) + local gitsigns = require("gitsigns") + local map = { + ["n|]g"] = map_callback(function() + if vim.wo.diff then + return "]g" + end + vim.schedule(function() + gitsigns.nav_hunk("next") + end) + return "" + end) + :with_buffer(bufnr) + :with_noremap() + :with_expr() + :with_desc("git: Goto next hunk"), + ["n|[g"] = map_callback(function() + if vim.wo.diff then + return "[g" + end + vim.schedule(function() + gitsigns.nav_hunk("prev") + end) + return "" + end) + :with_buffer(bufnr) + :with_noremap() + :with_expr() + :with_desc("git: Goto prev hunk"), + ["n|gs"] = map_callback(function() + gitsigns.stage_hunk() + end) + :with_buffer(bufnr) + :with_noremap() + :with_desc("git: Toggle staging/unstaging of hunk"), + ["v|gs"] = map_callback(function() + gitsigns.stage_hunk({ vim.fn.line("."), vim.fn.line("v") }) + end) + :with_buffer(bufnr) + :with_noremap() + :with_desc("git: Toggle staging/unstaging of selected hunk"), + ["n|gr"] = map_callback(function() + gitsigns.reset_hunk() + end) + :with_buffer(bufnr) + :with_noremap() + :with_desc("git: Reset hunk"), + ["v|gr"] = map_callback(function() + gitsigns.reset_hunk({ vim.fn.line("."), vim.fn.line("v") }) + end) + :with_buffer(bufnr) + :with_noremap() + :with_desc("git: Reset hunk"), + ["n|gR"] = map_callback(function() + gitsigns.reset_buffer() + end) + :with_buffer(bufnr) + :with_noremap() + :with_desc("git: Reset buffer"), + ["n|gp"] = map_callback(function() + gitsigns.preview_hunk() + end) + :with_buffer(bufnr) + :with_noremap() + :with_desc("git: Preview hunk"), + ["n|gb"] = map_callback(function() + gitsigns.blame_line({ full = true }) + end) + :with_buffer(bufnr) + :with_noremap() + :with_desc("git: Blame line"), + -- Text objects + ["ox|ih"] = map_callback(function() + gitsigns.select_hunk() + end) + :with_buffer(bufnr) + :with_noremap(), + } + bind.nvim_load_mapping(map) +end + +return M diff --git a/.config/mackup/.config/nvim/lua/modules/configs/completion/cmp.lua b/.config/mackup/.config/nvim/lua/modules/configs/completion/cmp.lua new file mode 100644 index 0000000..b9c8b78 --- /dev/null +++ b/.config/mackup/.config/nvim/lua/modules/configs/completion/cmp.lua @@ -0,0 +1,206 @@ +return function() + local icons = { + kind = require("modules.utils.icons").get("kind"), + type = require("modules.utils.icons").get("type"), + cmp = require("modules.utils.icons").get("cmp"), + } + + local border = function(hl) + return { + { "┌", hl }, + { "─", hl }, + { "┐", hl }, + { "│", hl }, + { "┘", hl }, + { "─", hl }, + { "└", hl }, + { "│", hl }, + } + end + + local compare = require("cmp.config.compare") + compare.lsp_scores = function(entry1, entry2) + local diff + if entry1.completion_item.score and entry2.completion_item.score then + diff = (entry2.completion_item.score * entry2.score) - (entry1.completion_item.score * entry1.score) + else + diff = entry2.score - entry1.score + end + return (diff < 0) + end + + local use_copilot = require("core.settings").use_copilot + local comparators = use_copilot == true + and { + require("copilot_cmp.comparators").prioritize, + require("copilot_cmp.comparators").score, + -- require("cmp_tabnine.compare"), + compare.offset, -- Items closer to cursor will have lower priority + compare.exact, + -- compare.scopes, + compare.lsp_scores, + compare.sort_text, + compare.score, + compare.recently_used, + -- compare.locality, -- Items closer to cursor will have higher priority, conflicts with `offset` + require("cmp-under-comparator").under, + compare.kind, + compare.length, + compare.order, + } + or { + -- require("cmp_tabnine.compare"), + compare.offset, -- Items closer to cursor will have lower priority + compare.exact, + -- compare.scopes, + compare.lsp_scores, + compare.sort_text, + compare.score, + compare.recently_used, + -- compare.locality, -- Items closer to cursor will have higher priority, conflicts with `offset` + require("cmp-under-comparator").under, + compare.kind, + compare.length, + compare.order, + } + + local cmp = require("cmp") + require("modules.utils").load_plugin("cmp", { + preselect = cmp.PreselectMode.None, + window = { + completion = { + border = border("PmenuBorder"), + winhighlight = "Normal:Pmenu,CursorLine:PmenuSel,Search:PmenuSel", + scrollbar = false, + }, + documentation = { + border = border("CmpDocBorder"), + winhighlight = "Normal:CmpDoc", + }, + }, + sorting = { + priority_weight = 2, + comparators = comparators, + }, + formatting = { + fields = { "abbr", "kind", "menu" }, + format = function(entry, vim_item) + local lspkind_icons = vim.tbl_deep_extend("force", icons.kind, icons.type, icons.cmp) + -- load lspkind icons + vim_item.kind = + string.format(" %s %s", lspkind_icons[vim_item.kind] or icons.cmp.undefined, vim_item.kind or "") + + -- set up labels for completion entries + vim_item.menu = setmetatable({ + cmp_tabnine = "[TN]", + copilot = "[CPLT]", + buffer = "[BUF]", + orgmode = "[ORG]", + nvim_lsp = "[LSP]", + nvim_lua = "[LUA]", + path = "[PATH]", + tmux = "[TMUX]", + treesitter = "[TS]", + latex_symbols = "[LTEX]", + luasnip = "[SNIP]", + spell = "[SPELL]", + }, { + __index = function() + return "[BTN]" -- builtin/unknown source names + end, + })[entry.source.name] + + -- cut down long results + local label = vim_item.abbr + local truncated_label = vim.fn.strcharpart(label, 0, 80) + if truncated_label ~= label then + vim_item.abbr = truncated_label .. "..." + end + + -- deduplicate results from nvim_lsp + if entry.source.name == "nvim_lsp" then + vim_item.dup = 0 + end + + return vim_item + end, + }, + matching = { + disallow_partial_fuzzy_matching = false, + }, + performance = { + async_budget = 1, + max_view_entries = 120, + }, + -- You can set mappings if you want + mapping = cmp.mapping.preset.insert({ + [""] = cmp.mapping.select_prev_item({ behavior = cmp.SelectBehavior.Select }), + [""] = cmp.mapping.select_next_item({ behavior = cmp.SelectBehavior.Select }), + [""] = cmp.mapping.scroll_docs(-4), + [""] = cmp.mapping.scroll_docs(4), + [""] = cmp.mapping.abort(), + [""] = cmp.mapping(function(fallback) + if cmp.visible() then + cmp.select_next_item({ behavior = cmp.SelectBehavior.Select }) + elseif require("luasnip").expand_or_locally_jumpable() then + require("luasnip").expand_or_jump() + else + fallback() + end + end, { "i", "s" }), + [""] = cmp.mapping(function(fallback) + if cmp.visible() then + cmp.select_prev_item({ behavior = cmp.SelectBehavior.Select }) + elseif require("luasnip").jumpable(-1) then + require("luasnip").jump(-1) + else + fallback() + end + end, { "i", "s" }), + [""] = cmp.mapping({ + i = function(fallback) + if cmp.visible() and cmp.get_active_entry() then + cmp.confirm({ behavior = cmp.ConfirmBehavior.Insert, select = false }) + else + fallback() + end + end, + s = cmp.mapping.confirm({ select = true }), + c = cmp.mapping.confirm({ behavior = cmp.ConfirmBehavior.Insert, select = true }), + }), + }), + snippet = { + expand = function(args) + require("luasnip").lsp_expand(args.body) + end, + }, + -- You should specify your *installed* sources. + sources = { + { name = "nvim_lsp", max_item_count = 350 }, + { name = "nvim_lua" }, + { name = "luasnip" }, + { name = "path" }, + { name = "treesitter" }, + { name = "spell" }, + { name = "tmux" }, + { name = "orgmode" }, + { + name = "buffer", + option = { + get_bufnrs = function() + return vim.api.nvim_buf_line_count(0) < 7500 and vim.api.nvim_list_bufs() or {} + end, + }, + }, + { name = "latex_symbols" }, + { name = "copilot" }, + -- { name = "codeium" }, + -- { name = "cmp_tabnine" }, + }, + experimental = { + ghost_text = { + hl_group = "Whitespace", + }, + }, + }) +end diff --git a/.config/mackup/.config/nvim/lua/modules/configs/completion/codeium.lua b/.config/mackup/.config/nvim/lua/modules/configs/completion/codeium.lua new file mode 100644 index 0000000..229eab6 --- /dev/null +++ b/.config/mackup/.config/nvim/lua/modules/configs/completion/codeium.lua @@ -0,0 +1,3 @@ +return function() + require("modules.utils").load_plugin("codeium", {}) +end diff --git a/.config/mackup/.config/nvim/lua/modules/configs/completion/copilot-cmp.lua b/.config/mackup/.config/nvim/lua/modules/configs/completion/copilot-cmp.lua new file mode 100644 index 0000000..26d1dad --- /dev/null +++ b/.config/mackup/.config/nvim/lua/modules/configs/completion/copilot-cmp.lua @@ -0,0 +1,3 @@ +return function() + require("modules.utils").load_plugin("copilot_cmp", {}) +end diff --git a/.config/mackup/.config/nvim/lua/modules/configs/completion/copilot.lua b/.config/mackup/.config/nvim/lua/modules/configs/completion/copilot.lua new file mode 100644 index 0000000..a6ea78c --- /dev/null +++ b/.config/mackup/.config/nvim/lua/modules/configs/completion/copilot.lua @@ -0,0 +1,28 @@ +return function() + vim.defer_fn(function() + require("modules.utils").load_plugin("copilot", { + cmp = { + enabled = true, + method = "getCompletionsCycling", + }, + panel = { + -- if true, it can interfere with completions in copilot-cmp + enabled = false, + }, + suggestion = { + -- if true, it can interfere with completions in copilot-cmp + enabled = false, + }, + filetypes = { + ["bigfile"] = false, + ["dap-repl"] = false, + ["fugitive"] = false, + ["fugitiveblame"] = false, + ["git"] = false, + ["gitcommit"] = false, + ["log"] = false, + ["toggleterm"] = false, + }, + }) + end, 100) +end diff --git a/.config/mackup/.config/nvim/lua/modules/configs/completion/formatters/clang_format.lua b/.config/mackup/.config/nvim/lua/modules/configs/completion/formatters/clang_format.lua new file mode 100644 index 0000000..a0f81bf --- /dev/null +++ b/.config/mackup/.config/nvim/lua/modules/configs/completion/formatters/clang_format.lua @@ -0,0 +1 @@ +return { "-style={BasedOnStyle: LLVM, IndentWidth: 4}" } diff --git a/.config/mackup/.config/nvim/lua/modules/configs/completion/formatting.lua b/.config/mackup/.config/nvim/lua/modules/configs/completion/formatting.lua new file mode 100644 index 0000000..a64cfe6 --- /dev/null +++ b/.config/mackup/.config/nvim/lua/modules/configs/completion/formatting.lua @@ -0,0 +1,205 @@ +local M = {} + +local settings = require("core.settings") +local disabled_workspaces = settings.format_disabled_dirs +local format_on_save = settings.format_on_save +local format_notify = settings.format_notify +local format_modifications_only = settings.format_modifications_only +local server_formatting_block_list = settings.server_formatting_block_list +local format_timeout = settings.format_timeout + +vim.api.nvim_create_user_command("Format", function() + M.format({ + timeout = format_timeout, + filter = M.format_filter, + }) +end, {}) + +vim.api.nvim_create_user_command("FormatToggle", function() + M.toggle_format_on_save() +end, {}) + +local block_list = settings.formatter_block_list +vim.api.nvim_create_user_command("FormatterToggleFt", function(opts) + if block_list[opts.args] == nil then + vim.notify( + string.format("[LSP] Formatter for [%s] has been recorded in list and disabled.", opts.args), + vim.log.levels.WARN, + { title = "LSP Formatter Warning" } + ) + block_list[opts.args] = true + else + block_list[opts.args] = not block_list[opts.args] + vim.notify( + string.format( + "[LSP] Formatter for [%s] has been %s.", + opts.args, + not block_list[opts.args] and "enabled" or "disabled" + ), + not block_list[opts.args] and vim.log.levels.INFO or vim.log.levels.WARN, + { title = string.format("LSP Formatter %s", not block_list[opts.args] and "Info" or "Warning") } + ) + end +end, { nargs = 1, complete = "filetype" }) + +function M.enable_format_on_save(is_configured) + local opts = { pattern = "*", timeout = format_timeout } + vim.api.nvim_create_augroup("format_on_save", { clear = true }) + vim.api.nvim_create_autocmd("BufWritePre", { + group = "format_on_save", + pattern = opts.pattern, + callback = function() + require("completion.formatting").format({ + timeout_ms = opts.timeout, + filter = M.format_filter, + }) + end, + }) + if not is_configured then + vim.notify( + "Successfully enabled format-on-save", + vim.log.levels.INFO, + { title = "Settings modification success" } + ) + end +end + +function M.disable_format_on_save(is_configured) + pcall(vim.api.nvim_del_augroup_by_name, "format_on_save") + if not is_configured then + vim.notify( + "Successfully disabled format-on-save", + vim.log.levels.INFO, + { title = "Settings modification success" } + ) + end +end + +function M.configure_format_on_save() + if format_on_save then + M.enable_format_on_save(true) + else + M.disable_format_on_save(true) + end +end + +function M.toggle_format_on_save() + local status = pcall(vim.api.nvim_get_autocmds, { + group = "format_on_save", + event = "BufWritePre", + }) + if not status then + M.enable_format_on_save(false) + else + M.disable_format_on_save(false) + end +end + +function M.format_filter(clients) + return vim.tbl_filter(function(client) + local status_ok, formatting_supported = pcall(function() + return client.supports_method("textDocument/formatting") + end) + if status_ok and formatting_supported and client.name == "null-ls" then + return "null-ls" + elseif not server_formatting_block_list[client.name] and status_ok and formatting_supported then + return client.name + end + end, clients) +end + +function M.format(opts) + local filedir = vim.fn.expand("%:p:h") + for i = 1, #disabled_workspaces do + if vim.regex(vim.fs.normalize(disabled_workspaces[i])):match_str(filedir) ~= nil then + vim.notify( + string.format( + "[LSP] Formatting for all files under [%s] has been disabled.", + vim.fs.normalize(disabled_workspaces[i]) + ), + vim.log.levels.WARN, + { title = "LSP Formatter Warning" } + ) + return + end + end + + local bufnr = opts.bufnr or vim.api.nvim_get_current_buf() + local clients = vim.lsp.get_clients({ bufnr = bufnr }) + + if opts.filter then + clients = opts.filter(clients) + elseif opts.id then + clients = vim.tbl_filter(function(client) + return client.id == opts.id + end, clients) + elseif opts.name then + clients = vim.tbl_filter(function(client) + return client.name == opts.name + end, clients) + end + + clients = vim.tbl_filter(function(client) + return client.supports_method("textDocument/formatting") + end, clients) + + if #clients == 0 then + vim.notify( + "[LSP] Format request failed, no matching language servers.", + vim.log.levels.WARN, + { title = "Formatting Failed" } + ) + end + + local timeout_ms = opts.timeout_ms + for _, client in pairs(clients) do + if block_list[vim.bo.filetype] == true then + vim.notify( + string.format( + "[LSP][%s] Formatting for [%s] has been disabled. This file is not being processed.", + client.name, + vim.bo.filetype + ), + vim.log.levels.WARN, + { title = "LSP Formatter Warning" } + ) + return + end + + if + format_modifications_only + and require("lsp-format-modifications").format_modifications(client, bufnr).success + then + if format_notify then + vim.notify( + string.format("[LSP] Format changed lines successfully with %s!", client.name), + vim.log.levels.INFO, + { title = "LSP Range Format Success" } + ) + end + return + end + + -- Fall back to format the whole buffer (even if partial formatting failed) + local params = vim.lsp.util.make_formatting_params(opts.formatting_options) + local result, err = client.request_sync("textDocument/formatting", params, timeout_ms, bufnr) + if result and result.result then + vim.lsp.util.apply_text_edits(result.result, bufnr, client.offset_encoding) + if format_notify then + vim.notify( + string.format("[LSP] Format successfully with %s!", client.name), + vim.log.levels.INFO, + { title = "LSP Format Success" } + ) + end + elseif err then + vim.notify( + string.format("[LSP][%s] %s", client.name, err), + vim.log.levels.ERROR, + { title = "LSP Format Error" } + ) + end + end +end + +return M diff --git a/.config/mackup/.config/nvim/lua/modules/configs/completion/glance.lua b/.config/mackup/.config/nvim/lua/modules/configs/completion/glance.lua new file mode 100644 index 0000000..f2950de --- /dev/null +++ b/.config/mackup/.config/nvim/lua/modules/configs/completion/glance.lua @@ -0,0 +1,83 @@ +return function() + local icons = { ui = require("modules.utils.icons").get("ui", true) } + local actions = require("glance").actions + + require("modules.utils").load_plugin("glance", { + height = 20, + zindex = 50, + preview_win_opts = { + cursorline = true, + number = true, + wrap = true, + }, + border = { + enable = require("core.settings").transparent_background, + top_char = "―", + bottom_char = "―", + }, + list = { + position = "right", + width = 0.33, -- 33% width relative to the active window, min 0.1, max 0.5 + }, + folds = { + folded = true, -- Automatically fold list on startup + fold_closed = icons.ui.ArrowClosed, + fold_open = icons.ui.ArrowOpen, + }, + indent_lines = { enable = true }, + winbar = { enable = true }, + mappings = { + list = { + ["k"] = actions.previous, + ["j"] = actions.next, + [""] = actions.previous, + [""] = actions.next, + [""] = actions.previous_location, -- Bring the cursor to the previous location skipping groups in the list + [""] = actions.next_location, -- Bring the cursor to the next location skipping groups in the list + [""] = actions.preview_scroll_win(8), + [""] = actions.preview_scroll_win(-8), + [""] = actions.jump, + ["v"] = actions.jump_vsplit, + ["s"] = actions.jump_split, + ["t"] = actions.jump_tab, + ["c"] = actions.close_fold, + ["o"] = actions.open_fold, + ["[]"] = actions.enter_win("preview"), -- Focus preview window + ["q"] = actions.close, + ["Q"] = actions.close, + [""] = actions.close, + ["gq"] = actions.quickfix, + }, + preview = { + ["Q"] = actions.close, + ["q"] = actions.close, + ["o"] = actions.jump, + ["v"] = actions.jump_vsplit, + ["s"] = actions.jump_split, + ["t"] = actions.jump_tab, + [""] = actions.previous_location, + [""] = actions.next_location, + ["[]"] = actions.enter_win("list"), -- Focus list window + }, + }, + hooks = { + before_open = function(results, open, _, method) + if #results == 0 then + vim.notify( + "This method is not supported by any of the servers registered for the current buffer", + vim.log.levels.WARN, + { title = "Glance" } + ) + elseif #results == 1 and method == "references" then + vim.notify( + "The identifier under cursor is the only one found", + vim.log.levels.INFO, + { title = "Glance" } + ) + else + open(results) + end + end, + }, + }) +end diff --git a/.config/mackup/.config/nvim/lua/modules/configs/completion/lsp-signature.lua b/.config/mackup/.config/nvim/lua/modules/configs/completion/lsp-signature.lua new file mode 100644 index 0000000..aacc20c --- /dev/null +++ b/.config/mackup/.config/nvim/lua/modules/configs/completion/lsp-signature.lua @@ -0,0 +1,15 @@ +return function() + require("modules.utils").load_plugin("lsp_signature", { + bind = true, + -- TODO: Remove the following line when nvim-cmp#1613 gets resolved + check_completion_visible = false, + floating_window = true, + floating_window_above_cur_line = true, + hi_parameter = "Search", + hint_enable = true, + transparency = nil, -- disabled by default, allow floating win transparent value 1~100 + wrap = true, + zindex = 45, -- avoid overlap with nvim.cmp + handler_opts = { border = "single" }, + }) +end diff --git a/.config/mackup/.config/nvim/lua/modules/configs/completion/lsp.lua b/.config/mackup/.config/nvim/lua/modules/configs/completion/lsp.lua new file mode 100644 index 0000000..ba3c5a8 --- /dev/null +++ b/.config/mackup/.config/nvim/lua/modules/configs/completion/lsp.lua @@ -0,0 +1,23 @@ +return function() + local nvim_lsp = require("lspconfig") + require("completion.neoconf").setup() + require("completion.mason").setup() + require("completion.mason-lspconfig").setup() + + local opts = { + capabilities = require("cmp_nvim_lsp").default_capabilities(vim.lsp.protocol.make_client_capabilities()), + } + -- Setup lsps that are not supported by `mason.nvim` but supported by `nvim-lspconfig` here. + if vim.fn.executable("dart") == 1 then + local ok, _opts = pcall(require, "user.configs.lsp-servers.dartls") + if not ok then + _opts = require("completion.servers.dartls") + end + local final_opts = vim.tbl_deep_extend("keep", _opts, opts) + nvim_lsp.dartls.setup(final_opts) + end + + pcall(require, "user.configs.lsp") + + pcall(vim.cmd.LspStart) -- Start LSPs +end diff --git a/.config/mackup/.config/nvim/lua/modules/configs/completion/lspsaga.lua b/.config/mackup/.config/nvim/lua/modules/configs/completion/lspsaga.lua new file mode 100644 index 0000000..162cdda --- /dev/null +++ b/.config/mackup/.config/nvim/lua/modules/configs/completion/lspsaga.lua @@ -0,0 +1,183 @@ +return function() + require("modules.utils").gen_lspkind_hl() + + local icons = { + cmp = require("modules.utils.icons").get("cmp", true), + diagnostics = require("modules.utils.icons").get("diagnostics", true), + kind = require("modules.utils.icons").get("kind", true), + type = require("modules.utils.icons").get("type", true), + ui = require("modules.utils.icons").get("ui", true), + } + + local function set_sidebar_icons() + -- Set icons for sidebar + vim.diagnostic.config({ + signs = { + text = { + [vim.diagnostic.severity.ERROR] = icons.diagnostics.Error_alt, + [vim.diagnostic.severity.WARN] = icons.diagnostics.Warning_alt, + [vim.diagnostic.severity.INFO] = icons.diagnostics.Information_alt, + [vim.diagnostic.severity.HINT] = icons.diagnostics.Hint_alt, + }, + }, + }) + end + + set_sidebar_icons() + + require("modules.utils").load_plugin("lspsaga", { + -- Breadcrumbs: https://nvimdev.github.io/lspsaga/breadcrumbs/ + symbol_in_winbar = { + enable = false, + separator = " " .. icons.ui.Separator, + hide_keyword = false, + show_file = false, + folder_level = 1, + color_mode = true, + delay = 100, + }, + -- Callhierarchy: https://nvimdev.github.io/lspsaga/callhierarchy/ + callhierarchy = { + layout = "float", + keys = { + edit = "e", + vsplit = "v", + split = "s", + tabe = "t", + quit = "q", + shuttle = "[]", + toggle_or_req = "u", + close = "", + }, + }, + -- Code Action: https://nvimdev.github.io/lspsaga/codeaction/ + code_action = { + num_shortcut = true, + only_in_cursor = false, + show_server_name = true, + extend_gitsigns = false, + keys = { + quit = "q", + exec = "", + }, + }, + -- Diagnostics: https://nvimdev.github.io/lspsaga/diagnostic/ + diagnostic = { + show_code_action = true, + jump_num_shortcut = true, + max_width = 0.5, + max_height = 0.6, + text_hl_follow = true, + border_follow = true, + extend_relatedInformation = true, + show_layout = "float", + show_normal_height = 10, + max_show_width = 0.9, + max_show_height = 0.6, + diagnostic_only_current = false, + keys = { + exec_action = "r", + quit = "q", + toggle_or_jump = "", + quit_in_show = { "q", "" }, + }, + }, + -- Hover: https://nvimdev.github.io/lspsaga/hover/ + hover = { + max_width = 0.45, + max_height = 0.7, + open_link = "gl", + open_cmd = "silent !" .. require("core.settings").external_browser, + }, + -- Impl: https://nvimdev.github.io/lspsaga/implement/ + implement = { + enable = true, + sign = true, + virtual_text = false, + priority = 100, + }, + -- LightBulb: https://nvimdev.github.io/lspsaga/lightbulb/ + lightbulb = { + enable = false, + sign = true, + virtual_text = false, + debounce = 10, + sign_priority = 20, + }, + -- Rename: https://nvimdev.github.io/lspsaga/rename/ + rename = { + in_select = false, + auto_save = false, + project_max_width = 0.5, + project_max_height = 0.5, + keys = { + quit = "", + exec = "", + select = "x", + }, + }, + -- Beacon: https://nvimdev.github.io/lspsaga/misc/#beacon + beacon = { + enable = true, + frequency = 12, + }, + -- Generic UI Options: https://nvimdev.github.io/lspsaga/misc/#generic-ui-options + ui = { + border = "single", -- Can be single, double, rounded, solid, shadow. + devicon = true, + title = true, + expand = icons.ui.ArrowClosed, + collapse = icons.ui.ArrowOpen, + code_action = icons.ui.CodeAction, + actionfix = icons.ui.Spell, + lines = { "┗", "┣", "┃", "━", "┏" }, + imp_sign = icons.kind.Implementation, + kind = { + -- Kind + Class = { icons.kind.Class, "LspKindClass" }, + Constant = { icons.kind.Constant, "LspKindConstant" }, + Constructor = { icons.kind.Constructor, "LspKindConstructor" }, + Enum = { icons.kind.Enum, "LspKindEnum" }, + EnumMember = { icons.kind.EnumMember, "LspKindEnumMember" }, + Event = { icons.kind.Event, "LspKindEvent" }, + Field = { icons.kind.Field, "LspKindField" }, + File = { icons.kind.File, "LspKindFile" }, + Function = { icons.kind.Function, "LspKindFunction" }, + Interface = { icons.kind.Interface, "LspKindInterface" }, + Key = { icons.kind.Keyword, "LspKindKey" }, + Method = { icons.kind.Method, "LspKindMethod" }, + Module = { icons.kind.Module, "LspKindModule" }, + Namespace = { icons.kind.Namespace, "LspKindNamespace" }, + Operator = { icons.kind.Operator, "LspKindOperator" }, + Package = { icons.kind.Package, "LspKindPackage" }, + Property = { icons.kind.Property, "LspKindProperty" }, + Struct = { icons.kind.Struct, "LspKindStruct" }, + TypeParameter = { icons.kind.TypeParameter, "LspKindTypeParameter" }, + Variable = { icons.kind.Variable, "LspKindVariable" }, + -- Type + Array = { icons.type.Array, "LspKindArray" }, + Boolean = { icons.type.Boolean, "LspKindBoolean" }, + Null = { icons.type.Null, "LspKindNull" }, + Number = { icons.type.Number, "LspKindNumber" }, + Object = { icons.type.Object, "LspKindObject" }, + String = { icons.type.String, "LspKindString" }, + -- ccls-specific icons. + TypeAlias = { icons.kind.TypeAlias, "LspKindTypeAlias" }, + Parameter = { icons.kind.Parameter, "LspKindParameter" }, + StaticMethod = { icons.kind.StaticMethod, "LspKindStaticMethod" }, + -- Microsoft-specific icons. + Text = { icons.kind.Text, "LspKindText" }, + Snippet = { icons.kind.Snippet, "LspKindSnippet" }, + Folder = { icons.kind.Folder, "LspKindFolder" }, + Unit = { icons.kind.Unit, "LspKindUnit" }, + Value = { icons.kind.Value, "LspKindValue" }, + }, + }, + -- Scrolling Keymaps: https://nvimdev.github.io/lspsaga/misc/#scrolling-keymaps + scroll_preview = { + scroll_down = "", + scroll_up = "", + }, + request_timeout = 3000, + }) +end diff --git a/.config/mackup/.config/nvim/lua/modules/configs/completion/luasnip.lua b/.config/mackup/.config/nvim/lua/modules/configs/completion/luasnip.lua new file mode 100644 index 0000000..8aafbfd --- /dev/null +++ b/.config/mackup/.config/nvim/lua/modules/configs/completion/luasnip.lua @@ -0,0 +1,21 @@ +return function() + local vim_path = require("core.global").vim_path + local snippet_path = vim_path .. "/snips/" + local user_snippet_path = vim_path .. "/lua/user/snips/" + + require("modules.utils").load_plugin("luasnip", { + history = true, + update_events = "TextChanged,TextChangedI", + delete_check_events = "TextChanged,InsertLeave", + }, false, require("luasnip").config.set_config) + + require("luasnip.loaders.from_vscode").lazy_load({ + paths = { + snippet_path, + user_snippet_path, + }, + }) + require("luasnip.loaders.from_lua").lazy_load() + require("luasnip.loaders.from_vscode").lazy_load() + require("luasnip.loaders.from_snipmate").lazy_load() +end diff --git a/.config/mackup/.config/nvim/lua/modules/configs/completion/mason-lspconfig.lua b/.config/mackup/.config/nvim/lua/modules/configs/completion/mason-lspconfig.lua new file mode 100644 index 0000000..9e2b188 --- /dev/null +++ b/.config/mackup/.config/nvim/lua/modules/configs/completion/mason-lspconfig.lua @@ -0,0 +1,95 @@ +local M = {} + +M.setup = function() + local diagnostics_virtual_text = require("core.settings").diagnostics_virtual_text + local diagnostics_level = require("core.settings").diagnostics_level + + local nvim_lsp = require("lspconfig") + local mason_lspconfig = require("mason-lspconfig") + require("lspconfig.ui.windows").default_options.border = "rounded" + + require("modules.utils").load_plugin("mason-lspconfig", { + ensure_installed = require("core.settings").lsp_deps, + }) + + vim.lsp.handlers["textDocument/publishDiagnostics"] = vim.lsp.with(vim.lsp.diagnostic.on_publish_diagnostics, { + signs = true, + underline = true, + virtual_text = diagnostics_virtual_text and { + severity = { + min = vim.diagnostic.severity[diagnostics_level], + }, + } or false, + -- set update_in_insert to false because it was enabled by lspsaga + update_in_insert = false, + }) + + local opts = { + capabilities = vim.tbl_deep_extend( + "force", + vim.lsp.protocol.make_client_capabilities(), + require("cmp_nvim_lsp").default_capabilities() + ), + } + ---A handler to setup all servers defined under `completion/servers/*.lua` + ---@param lsp_name string + local function mason_lsp_handler(lsp_name) + -- rust_analyzer is configured using mrcjkb/rustaceanvim + -- warn users if they have set it up manually + if lsp_name == "rust_analyzer" then + local config_exist = pcall(require, "completion.servers." .. lsp_name) + if config_exist then + vim.notify( + [[ +`rust_analyzer` is configured independently via `mrcjkb/rustaceanvim`. To get rid of this warning, +please REMOVE your LSP configuration (rust_analyzer.lua) from the `servers` directory and configure +`rust_analyzer` using the appropriate init options provided by `rustaceanvim` instead.]], + vim.log.levels.WARN, + { title = "nvim-lspconfig" } + ) + end + return + end + + local ok, custom_handler = pcall(require, "user.configs.lsp-servers." .. lsp_name) + local default_ok, default_handler = pcall(require, "completion.servers." .. lsp_name) + -- Use preset if there is no user definition + if not ok then + ok, custom_handler = default_ok, default_handler + end + + if not ok then + -- Default to use factory config for server(s) that doesn't include a spec + nvim_lsp[lsp_name].setup(opts) + return + elseif type(custom_handler) == "function" then + --- Case where language server requires its own setup + --- Make sure to call require("lspconfig")[lsp_name].setup() in the function + --- See `clangd.lua` for example. + custom_handler(opts) + elseif type(custom_handler) == "table" then + nvim_lsp[lsp_name].setup( + vim.tbl_deep_extend( + "force", + opts, + type(default_handler) == "table" and default_handler or {}, + custom_handler + ) + ) + else + vim.notify( + string.format( + "Failed to setup [%s].\n\nServer definition under `completion/servers` must return\neither a fun(opts) or a table (got '%s' instead)", + lsp_name, + type(custom_handler) + ), + vim.log.levels.ERROR, + { title = "nvim-lspconfig" } + ) + end + end + + mason_lspconfig.setup_handlers({ mason_lsp_handler }) +end + +return M diff --git a/.config/mackup/.config/nvim/lua/modules/configs/completion/mason-null-ls.lua b/.config/mackup/.config/nvim/lua/modules/configs/completion/mason-null-ls.lua new file mode 100644 index 0000000..d077fec --- /dev/null +++ b/.config/mackup/.config/nvim/lua/modules/configs/completion/mason-null-ls.lua @@ -0,0 +1,12 @@ +local M = {} + +M.setup = function() + require("modules.utils").load_plugin("mason-null-ls", { + ensure_installed = require("core.settings").null_ls_deps, + automatic_installation = false, + automatic_setup = true, + handlers = {}, + }) +end + +return M diff --git a/.config/mackup/.config/nvim/lua/modules/configs/completion/mason.lua b/.config/mackup/.config/nvim/lua/modules/configs/completion/mason.lua new file mode 100644 index 0000000..e28831f --- /dev/null +++ b/.config/mackup/.config/nvim/lua/modules/configs/completion/mason.lua @@ -0,0 +1,96 @@ +local M = {} + +M.setup = function() + local is_windows = require("core.global").is_windows + + local mason_registry = require("mason-registry") + require("lspconfig.ui.windows").default_options.border = "rounded" + + local icons = { + ui = require("modules.utils.icons").get("ui", true), + misc = require("modules.utils.icons").get("misc", true), + } + + require("modules.utils").load_plugin("mason", { + ui = { + border = "single", + icons = { + package_pending = icons.ui.Modified_alt, + package_installed = icons.ui.Check, + package_uninstalled = icons.misc.Ghost, + }, + keymaps = { + toggle_server_expand = "", + install_server = "i", + update_server = "u", + check_server_version = "c", + update_all_servers = "U", + check_outdated_servers = "C", + uninstall_server = "X", + cancel_installation = "", + }, + }, + }) + + -- Additional plugins for pylsp + mason_registry:on( + "package:install:success", + vim.schedule_wrap(function(pkg) + if pkg.name ~= "python-lsp-server" then + return + end + + local venv = vim.fn.stdpath("data") .. "/mason/packages/python-lsp-server/venv" + local python = is_windows and venv .. "/Scripts/python.exe" or venv .. "/bin/python" + local black = is_windows and venv .. "/Scripts/black.exe" or venv .. "/bin/black" + local ruff = is_windows and venv .. "/Scripts/ruff.exe" or venv .. "/bin/ruff" + + require("plenary.job") + :new({ + command = python, + args = { + "-m", + "pip", + "install", + "-U", + "--disable-pip-version-check", + "python-lsp-black", + "python-lsp-ruff", + "pylsp-rope", + }, + cwd = venv, + env = { VIRTUAL_ENV = venv }, + on_exit = function() + if vim.fn.executable(black) == 1 and vim.fn.executable(ruff) == 1 then + vim.notify( + "Finished installing pylsp plugins", + vim.log.levels.INFO, + { title = "[lsp] Install Status" } + ) + else + vim.notify( + "Failed to install pylsp plugins. [Executable not found]", + vim.log.levels.ERROR, + { title = "[lsp] Install Failure" } + ) + end + end, + on_start = function() + vim.notify( + "Now installing pylsp plugins...", + vim.log.levels.INFO, + { title = "[lsp] Install Status", timeout = 6000 } + ) + end, + on_stderr = function(_, msg_stream) + if msg_stream then + vim.notify(msg_stream, vim.log.levels.ERROR, { title = "[lsp] Install Failure" }) + end + end, + }) + :start() + end) + ) +end + +return M diff --git a/.config/mackup/.config/nvim/lua/modules/configs/completion/neoconf.lua b/.config/mackup/.config/nvim/lua/modules/configs/completion/neoconf.lua new file mode 100644 index 0000000..4db9cc7 --- /dev/null +++ b/.config/mackup/.config/nvim/lua/modules/configs/completion/neoconf.lua @@ -0,0 +1,20 @@ +local M = {} + +M.setup = function() + require("modules.utils").load_plugin("neoconf", { + -- send new configuration to lsp clients when changing json settings + live_reload = true, + -- name of the local settings files + local_settings = ".neoconf.json", + -- name of the global settings file in your Neovim config directory + global_settings = "neoconf.json", + -- import existing settings from other plugins + import = { + vscode = true, -- local .vscode/settings.json + coc = true, -- global/local coc-settings.json + nlsp = true, -- global/local nlsp-settings.nvim json settings + }, + }) +end + +return M diff --git a/.config/mackup/.config/nvim/lua/modules/configs/completion/null-ls.lua b/.config/mackup/.config/nvim/lua/modules/configs/completion/null-ls.lua new file mode 100644 index 0000000..d699e55 --- /dev/null +++ b/.config/mackup/.config/nvim/lua/modules/configs/completion/null-ls.lua @@ -0,0 +1,77 @@ +return function() + local null_ls = require("null-ls") + local btns = null_ls.builtins + + ---Return formatter args required by `extra_args` + ---@param formatter_name string + ---@return table|nil + local function formatter_args(formatter_name) + local ok, args = pcall(require, "user.configs.formatters." .. formatter_name) + if not ok then + args = require("completion.formatters." .. formatter_name) + end + return args + end + + -- Please set additional flags for the supported servers here + -- Don't specify any config here if you are using the default one. + local sources = { + btns.formatting.clang_format.with({ + filetypes = { "c", "cpp", "objc", "objcpp", "cs", "cuda", "proto" }, + extra_args = formatter_args("clang_format"), + }), + btns.formatting.prettier.with({ + filetypes = { + "vue", + "typescript", + "javascript", + "typescriptreact", + "javascriptreact", + "yaml", + "html", + "css", + "scss", + "sh", + "markdown", + }, + }), + } + require("modules.utils").load_plugin("null-ls", { + border = "rounded", + debug = false, + log_level = "warn", + update_in_insert = false, + sources = sources, + default_timeout = require("core.settings").format_timeout, + }) + + require("completion.mason-null-ls").setup() + + -- Setup usercmd to register/deregister available source(s) + local function _gen_completion() + local sources_cont = null_ls.get_source({ + filetype = vim.bo.filetype, + }) + local completion_items = {} + for _, server in pairs(sources_cont) do + table.insert(completion_items, server.name) + end + return completion_items + end + vim.api.nvim_create_user_command("NullLsToggle", function(opts) + if vim.tbl_contains(_gen_completion(), opts.args) then + null_ls.toggle({ name = opts.args }) + else + vim.notify( + string.format("[Null-ls] Unable to find any registered source named [%s].", opts.args), + vim.log.levels.ERROR, + { title = "Null-ls Internal Error" } + ) + end + end, { + nargs = 1, + complete = _gen_completion, + }) + + require("completion.formatting").configure_format_on_save() +end diff --git a/.config/mackup/.config/nvim/lua/modules/configs/completion/servers/bashls.lua b/.config/mackup/.config/nvim/lua/modules/configs/completion/servers/bashls.lua new file mode 100644 index 0000000..cc12751 --- /dev/null +++ b/.config/mackup/.config/nvim/lua/modules/configs/completion/servers/bashls.lua @@ -0,0 +1,5 @@ +-- https://github.com/neovim/nvim-lspconfig/blob/master/lua/lspconfig/configs/bashls.lua +return { + cmd = { "bash-language-server", "start" }, + filetypes = { "bash", "sh" }, +} diff --git a/.config/mackup/.config/nvim/lua/modules/configs/completion/servers/clangd.lua b/.config/mackup/.config/nvim/lua/modules/configs/completion/servers/clangd.lua new file mode 100644 index 0000000..a1ccb82 --- /dev/null +++ b/.config/mackup/.config/nvim/lua/modules/configs/completion/servers/clangd.lua @@ -0,0 +1,79 @@ +local function switch_source_header_splitcmd(bufnr, splitcmd) + bufnr = require("lspconfig").util.validate_bufnr(bufnr) + local clangd_client = require("lspconfig").util.get_active_client_by_name(bufnr, "clangd") + local params = { uri = vim.uri_from_bufnr(bufnr) } + if clangd_client then + clangd_client.request("textDocument/switchSourceHeader", params, function(err, result) + if err then + error(tostring(err)) + end + if not result then + vim.notify("Corresponding file can’t be determined", vim.log.levels.ERROR, { title = "LSP Error!" }) + return + end + vim.api.nvim_command(splitcmd .. " " .. vim.uri_to_fname(result)) + end) + else + vim.notify( + "Method textDocument/switchSourceHeader is not supported by any active server on this buffer", + vim.log.levels.ERROR, + { title = "LSP Error!" } + ) + end +end + +local function get_binary_path_list(binaries) + local path_list = {} + for _, binary in ipairs(binaries) do + local path = vim.fn.exepath(binary) + if path ~= "" then + table.insert(path_list, path) + end + end + return table.concat(path_list, ",") +end + +-- https://github.com/neovim/nvim-lspconfig/blob/master/lua/lspconfig/configs/clangd.lua +return function(options) + require("lspconfig").clangd.setup({ + on_attach = options.on_attach, + capabilities = vim.tbl_deep_extend("keep", { offsetEncoding = { "utf-16", "utf-8" } }, options.capabilities), + single_file_support = true, + cmd = { + "clangd", + "-j=12", + "--enable-config", + "--background-index", + "--pch-storage=memory", + -- You MUST set this arg ↓ to your c/cpp compiler location (if not included)! + "--query-driver=" .. get_binary_path_list({ "clang++", "clang", "gcc", "g++" }), + "--clang-tidy", + "--all-scopes-completion", + "--completion-style=detailed", + "--header-insertion-decorators", + "--header-insertion=iwyu", + "--limit-references=3000", + "--limit-results=350", + }, + commands = { + ClangdSwitchSourceHeader = { + function() + switch_source_header_splitcmd(0, "edit") + end, + description = "Open source/header in current buffer", + }, + ClangdSwitchSourceHeaderVSplit = { + function() + switch_source_header_splitcmd(0, "vsplit") + end, + description = "Open source/header in a new vsplit", + }, + ClangdSwitchSourceHeaderSplit = { + function() + switch_source_header_splitcmd(0, "split") + end, + description = "Open source/header in a new split", + }, + }, + }) +end diff --git a/.config/mackup/.config/nvim/lua/modules/configs/completion/servers/dartls.lua b/.config/mackup/.config/nvim/lua/modules/configs/completion/servers/dartls.lua new file mode 100644 index 0000000..bbfdac9 --- /dev/null +++ b/.config/mackup/.config/nvim/lua/modules/configs/completion/servers/dartls.lua @@ -0,0 +1,12 @@ +-- https://github.com/neovim/nvim-lspconfig/blob/master/lua/lspconfig/configs/dartls.lua +return { + cmd = { "dart", "language-server", "--protocol=lsp" }, + filetypes = { "dart" }, + init_options = { + closingLabels = true, + flutterOutline = true, + onlyAnalyzeProjectsWithOpenFiles = true, + outline = true, + suggestFromUnimportedLibraries = true, + }, +} diff --git a/.config/mackup/.config/nvim/lua/modules/configs/completion/servers/gopls.lua b/.config/mackup/.config/nvim/lua/modules/configs/completion/servers/gopls.lua new file mode 100644 index 0000000..861d027 --- /dev/null +++ b/.config/mackup/.config/nvim/lua/modules/configs/completion/servers/gopls.lua @@ -0,0 +1,50 @@ +-- https://github.com/neovim/nvim-lspconfig/blob/master/lua/lspconfig/configs/gopls.lua +return { + cmd = { "gopls", "-remote.debug=:0", "-remote=auto" }, + filetypes = { "go", "gomod", "gosum", "gotmpl", "gohtmltmpl", "gotexttmpl" }, + flags = { allow_incremental_sync = true, debounce_text_changes = 500 }, + capabilities = { + textDocument = { + completion = { + contextSupport = true, + dynamicRegistration = true, + completionItem = { + commitCharactersSupport = true, + deprecatedSupport = true, + preselectSupport = true, + insertReplaceSupport = true, + labelDetailsSupport = true, + snippetSupport = true, + documentationFormat = { "markdown", "plaintext" }, + resolveSupport = { + properties = { + "documentation", + "details", + "additionalTextEdits", + }, + }, + }, + }, + }, + }, + settings = { + gopls = { + staticcheck = true, + semanticTokens = true, + usePlaceholders = true, + completeUnimported = true, + symbolMatcher = "Fuzzy", + buildFlags = { "-tags", "integration" }, + semanticTokenTypes = { string = false }, + codelenses = { + generate = true, + gc_details = true, + test = true, + tidy = true, + vendor = true, + regenerate_cgo = true, + upgrade_dependency = true, + }, + }, + }, +} diff --git a/.config/mackup/.config/nvim/lua/modules/configs/completion/servers/html.lua b/.config/mackup/.config/nvim/lua/modules/configs/completion/servers/html.lua new file mode 100644 index 0000000..fa8f9bd --- /dev/null +++ b/.config/mackup/.config/nvim/lua/modules/configs/completion/servers/html.lua @@ -0,0 +1,12 @@ +-- https://github.com/vscode-langservers/vscode-html-languageserver-bin +return { + cmd = { "html-languageserver", "--stdio" }, + filetypes = { "html" }, + init_options = { + configurationSection = { "html", "css", "javascript" }, + embeddedLanguages = { css = true, javascript = true }, + }, + settings = {}, + single_file_support = true, + flags = { debounce_text_changes = 500 }, +} diff --git a/.config/mackup/.config/nvim/lua/modules/configs/completion/servers/jsonls.lua b/.config/mackup/.config/nvim/lua/modules/configs/completion/servers/jsonls.lua new file mode 100644 index 0000000..7e8295d --- /dev/null +++ b/.config/mackup/.config/nvim/lua/modules/configs/completion/servers/jsonls.lua @@ -0,0 +1,55 @@ +-- https://github.com/neovim/nvim-lspconfig/blob/master/lua/lspconfig/configs/jsonls.lua +return { + flags = { debounce_text_changes = 500 }, + settings = { + json = { + -- Schemas https://www.schemastore.org + schemas = { + { + fileMatch = { "package.json" }, + url = "https://json.schemastore.org/package.json", + }, + { + fileMatch = { "tsconfig*.json" }, + url = "https://json.schemastore.org/tsconfig.json", + }, + { + fileMatch = { + ".prettierrc", + ".prettierrc.json", + "prettier.config.json", + }, + url = "https://json.schemastore.org/prettierrc.json", + }, + { + fileMatch = { ".eslintrc", ".eslintrc.json" }, + url = "https://json.schemastore.org/eslintrc.json", + }, + { + fileMatch = { + ".babelrc", + ".babelrc.json", + "babel.config.json", + }, + url = "https://json.schemastore.org/babelrc.json", + }, + { + fileMatch = { "lerna.json" }, + url = "https://json.schemastore.org/lerna.json", + }, + { + fileMatch = { + ".stylelintrc", + ".stylelintrc.json", + "stylelint.config.json", + }, + url = "http://json.schemastore.org/stylelintrc.json", + }, + { + fileMatch = { "/.github/workflows/*" }, + url = "https://json.schemastore.org/github-workflow.json", + }, + }, + }, + }, +} diff --git a/.config/mackup/.config/nvim/lua/modules/configs/completion/servers/lua_ls.lua b/.config/mackup/.config/nvim/lua/modules/configs/completion/servers/lua_ls.lua new file mode 100644 index 0000000..7571a08 --- /dev/null +++ b/.config/mackup/.config/nvim/lua/modules/configs/completion/servers/lua_ls.lua @@ -0,0 +1,25 @@ +-- https://github.com/neovim/nvim-lspconfig/blob/master/lua/lspconfig/configs/lua_ls.lua +return { + settings = { + Lua = { + runtime = { version = "LuaJIT" }, + diagnostics = { + globals = { "vim" }, + disable = { "different-requires", "undefined-field" }, + }, + workspace = { + library = { + vim.fn.expand("$VIMRUNTIME/lua"), + vim.fn.expand("$VIMRUNTIME/lua/vim/lsp"), + }, + maxPreload = 100000, + preloadFileSize = 10000, + }, + hint = { enable = true, setType = true }, + format = { enable = false }, + telemetry = { enable = false }, + -- Do not override treesitter lua highlighting with lua_ls's highlighting + semantic = { enable = false }, + }, + }, +} diff --git a/.config/mackup/.config/nvim/lua/modules/configs/completion/servers/pylsp.lua b/.config/mackup/.config/nvim/lua/modules/configs/completion/servers/pylsp.lua new file mode 100644 index 0000000..0c98c37 --- /dev/null +++ b/.config/mackup/.config/nvim/lua/modules/configs/completion/servers/pylsp.lua @@ -0,0 +1,46 @@ +-- https://github.com/neovim/nvim-lspconfig/blob/master/lua/lspconfig/configs/pylsp.lua +return { + cmd = { "pylsp" }, + filetypes = { "python" }, + settings = { + pylsp = { + plugins = { + -- Lint + ruff = { + enabled = true, + select = { + -- enable pycodestyle + "E", + -- enable pyflakes + "F", + }, + ignore = { + -- ignore E501 (line too long) + -- "E501", + -- ignore F401 (imported but unused) + -- "F401", + }, + extendSelect = { "I" }, + severities = { + -- Hint, Information, Warning, Error + F401 = "I", + E501 = "I", + }, + }, + flake8 = { enabled = false }, + pyflakes = { enabled = false }, + pycodestyle = { enabled = false }, + mccabe = { enabled = false }, + + -- Code refactor + rope = { enabled = true }, + + -- Formatting + black = { enabled = true }, + pyls_isort = { enabled = false }, + autopep8 = { enabled = false }, + yapf = { enabled = false }, + }, + }, + }, +} diff --git a/.config/mackup/.config/nvim/lua/modules/configs/completion/tabnine.lua b/.config/mackup/.config/nvim/lua/modules/configs/completion/tabnine.lua new file mode 100644 index 0000000..0509616 --- /dev/null +++ b/.config/mackup/.config/nvim/lua/modules/configs/completion/tabnine.lua @@ -0,0 +1,3 @@ +return function() + require("cmp_tabnine.config"):setup({ max_line = 1000, max_num_results = 20, sort = true }) +end diff --git a/.config/mackup/.config/nvim/lua/modules/configs/editor/align.lua b/.config/mackup/.config/nvim/lua/modules/configs/editor/align.lua new file mode 100644 index 0000000..43c50d8 --- /dev/null +++ b/.config/mackup/.config/nvim/lua/modules/configs/editor/align.lua @@ -0,0 +1,11 @@ +return function() + require("modules.utils").load_plugin("mini.align", { + -- Whether to disable showing non-error feedback + silent = false, + -- Module mappings. Use `''` (empty string) to disable one. + mappings = { + start = "gea", + start_with_preview = "geA", + }, + }) +end diff --git a/.config/mackup/.config/nvim/lua/modules/configs/editor/autoclose.lua b/.config/mackup/.config/nvim/lua/modules/configs/editor/autoclose.lua new file mode 100644 index 0000000..a43888f --- /dev/null +++ b/.config/mackup/.config/nvim/lua/modules/configs/editor/autoclose.lua @@ -0,0 +1,39 @@ +return function() + require("modules.utils").load_plugin("autoclose", { + keys = { + ["("] = { escape = false, close = true, pair = "()" }, + ["["] = { escape = false, close = true, pair = "[]" }, + ["{"] = { escape = false, close = true, pair = "{}" }, + + ["<"] = { escape = true, close = true, pair = "<>", enabled_filetypes = { "rust" } }, + [">"] = { escape = true, close = false, pair = "<>" }, + [")"] = { escape = true, close = false, pair = "()" }, + ["]"] = { escape = true, close = false, pair = "[]" }, + ["}"] = { escape = true, close = false, pair = "{}" }, + + ['"'] = { escape = true, close = true, pair = '""' }, + ["`"] = { escape = true, close = true, pair = "``" }, + ["'"] = { escape = true, close = true, pair = "''", disabled_filetypes = { "rust" } }, + }, + options = { + disable_when_touch = false, + disabled_filetypes = { + "alpha", + "bigfile", + "checkhealth", + "dap-repl", + "diff", + "help", + "log", + "notify", + "NvimTree", + "Outline", + "qf", + "TelescopePrompt", + "toggleterm", + "undotree", + "vimwiki", + }, + }, + }) +end diff --git a/.config/mackup/.config/nvim/lua/modules/configs/editor/autotag.lua b/.config/mackup/.config/nvim/lua/modules/configs/editor/autotag.lua new file mode 100644 index 0000000..42dcd97 --- /dev/null +++ b/.config/mackup/.config/nvim/lua/modules/configs/editor/autotag.lua @@ -0,0 +1,9 @@ +return function() + require("modules.utils").load_plugin("nvim-ts-autotag", { + opts = { + enable_close = true, -- Auto close tags + enable_rename = true, -- Auto rename pairs of tags + enable_close_on_slash = false, -- Auto close on trailing ` + current = true, + -- for the current window, label targets closer to the cursor first + distance = true, + }, + modes = { + search = { enabled = false }, + -- options used when flash is activated through + -- `f`, `F`, `t`, `T`, `;` and `,` motions + char = { + enabled = true, + -- hide after jump when not using jump labels + autohide = false, + -- show jump labels + jump_labels = false, + -- set to `false` to use the current line only + multi_line = true, + -- When using jump labels, don't use these keys + -- This allows using those keys directly after the motion + label = { exclude = "hjkliardc" }, + }, + }, + }) +end diff --git a/.config/mackup/.config/nvim/lua/modules/configs/editor/grug-far.lua b/.config/mackup/.config/nvim/lua/modules/configs/editor/grug-far.lua new file mode 100644 index 0000000..4af4ea1 --- /dev/null +++ b/.config/mackup/.config/nvim/lua/modules/configs/editor/grug-far.lua @@ -0,0 +1,20 @@ +return function() + vim.g.maplocalleader = "," + require("modules.utils").load_plugin("grug-far", { + engine = "ripgrep", + engines = { + ripgrep = { + path = "rg", + showReplaceDiff = true, + placeholders = { + enabled = true, + }, + }, + }, + windowCreationCommand = "bot split", + disableBufferLineNumbers = false, + icons = { + enabled = true, + }, + }) +end diff --git a/.config/mackup/.config/nvim/lua/modules/configs/editor/highlight-colors.lua b/.config/mackup/.config/nvim/lua/modules/configs/editor/highlight-colors.lua new file mode 100644 index 0000000..06a0f6a --- /dev/null +++ b/.config/mackup/.config/nvim/lua/modules/configs/editor/highlight-colors.lua @@ -0,0 +1,31 @@ +return function() + require("modules.utils").load_plugin("nvim-highlight-colors", { + render = "background", + enable_hex = true, + enable_short_hex = true, + enable_rgb = true, + enable_hsl = true, + enable_var_usage = true, + enable_named_colors = false, + enable_tailwind = false, + -- Exclude filetypes or buftypes from highlighting + exclude_filetypes = { + "alpha", + "bigfile", + "dap-repl", + "fugitive", + "git", + "notify", + "NvimTree", + "Outline", + "TelescopePrompt", + "toggleterm", + "undotree", + }, + exclude_buftypes = { + "nofile", + "prompt", + "terminal", + }, + }) +end diff --git a/.config/mackup/.config/nvim/lua/modules/configs/editor/hop.lua b/.config/mackup/.config/nvim/lua/modules/configs/editor/hop.lua new file mode 100644 index 0000000..d52fa5b --- /dev/null +++ b/.config/mackup/.config/nvim/lua/modules/configs/editor/hop.lua @@ -0,0 +1,3 @@ +return function() + require("modules.utils").load_plugin("hop", { keys = "etovxqpdygfblzhckisuran" }) +end diff --git a/.config/mackup/.config/nvim/lua/modules/configs/editor/matchup.lua b/.config/mackup/.config/nvim/lua/modules/configs/editor/matchup.lua new file mode 100644 index 0000000..64cd28c --- /dev/null +++ b/.config/mackup/.config/nvim/lua/modules/configs/editor/matchup.lua @@ -0,0 +1,5 @@ +return function() + vim.g.matchup_transmute_enabled = 1 + vim.g.matchup_surround_enabled = 1 + vim.g.matchup_matchparen_offscreen = { method = "popup" } +end diff --git a/.config/mackup/.config/nvim/lua/modules/configs/editor/persisted.lua b/.config/mackup/.config/nvim/lua/modules/configs/editor/persisted.lua new file mode 100644 index 0000000..2f1f434 --- /dev/null +++ b/.config/mackup/.config/nvim/lua/modules/configs/editor/persisted.lua @@ -0,0 +1,13 @@ +return function() + require("modules.utils").load_plugin("persisted", { + save_dir = vim.fn.expand(vim.fn.stdpath("data") .. "/sessions/"), + autostart = true, + -- Set `lazy = false` in `plugins/editor.lua` to enable this + autoload = false, + follow_cwd = true, + use_git_branch = true, + should_save = function() + return vim.bo.filetype == "alpha" and false or true + end, + }) +end diff --git a/.config/mackup/.config/nvim/lua/modules/configs/editor/rainbow_delims.lua b/.config/mackup/.config/nvim/lua/modules/configs/editor/rainbow_delims.lua new file mode 100644 index 0000000..d2e681d --- /dev/null +++ b/.config/mackup/.config/nvim/lua/modules/configs/editor/rainbow_delims.lua @@ -0,0 +1,53 @@ +return function() + ---@param threshold number @Use global strategy if nr of lines exceeds this value + local function init_strategy(threshold) + return function() + -- Disable on very large files + local line_count = vim.api.nvim_buf_line_count(0) + if line_count > 7500 then + return nil + end + + -- Disable on parser error + local errors = 200 + vim.treesitter.get_parser():for_each_tree(function(lt) + if lt:root():has_error() and errors >= 0 then + errors = errors - 1 + end + end) + if errors < 0 then + return nil + end + + return line_count > threshold and require("rainbow-delimiters").strategy["global"] + or require("rainbow-delimiters").strategy["local"] + end + end + + vim.g.rainbow_delimiters = { + strategy = { + [""] = init_strategy(500), + c = init_strategy(300), + cpp = init_strategy(300), + lua = init_strategy(500), + vimdoc = init_strategy(300), + vim = init_strategy(300), + }, + query = { + [""] = "rainbow-delimiters", + latex = "rainbow-blocks", + javascript = "rainbow-delimiters-react", + }, + highlight = { + "RainbowDelimiterRed", + "RainbowDelimiterOrange", + "RainbowDelimiterYellow", + "RainbowDelimiterGreen", + "RainbowDelimiterBlue", + "RainbowDelimiterCyan", + "RainbowDelimiterViolet", + }, + } + + require("modules.utils").load_plugin("rainbow_delimiters", nil, true) +end diff --git a/.config/mackup/.config/nvim/lua/modules/configs/editor/suda.lua b/.config/mackup/.config/nvim/lua/modules/configs/editor/suda.lua new file mode 100644 index 0000000..d70aa61 --- /dev/null +++ b/.config/mackup/.config/nvim/lua/modules/configs/editor/suda.lua @@ -0,0 +1,5 @@ +return function() + vim.g["suda#prompt"] = "Enter administrator password: " + + require("modules.utils").load_plugin("suda", nil, true) +end diff --git a/.config/mackup/.config/nvim/lua/modules/configs/editor/treesitter.lua b/.config/mackup/.config/nvim/lua/modules/configs/editor/treesitter.lua new file mode 100644 index 0000000..5b25ebe --- /dev/null +++ b/.config/mackup/.config/nvim/lua/modules/configs/editor/treesitter.lua @@ -0,0 +1,66 @@ +return vim.schedule_wrap(function() + local use_ssh = require("core.settings").use_ssh + + vim.api.nvim_set_option_value("foldmethod", "expr", {}) + vim.api.nvim_set_option_value("foldexpr", "nvim_treesitter#foldexpr()", {}) + + require("modules.utils").load_plugin("nvim-treesitter", { + ensure_installed = require("core.settings").treesitter_deps, + highlight = { + enable = true, + disable = function(ft, bufnr) + if + vim.tbl_contains({ "gitcommit" }, ft) + or (vim.api.nvim_buf_line_count(bufnr) > 7500 and ft ~= "vimdoc") + then + return true + end + + local ok, is_large_file = pcall(vim.api.nvim_buf_get_var, bufnr, "bigfile_disable_treesitter") + return ok and is_large_file + end, + additional_vim_regex_highlighting = false, + }, + textobjects = { + select = { + enable = true, + lookahead = true, + keymaps = { + ["af"] = "@function.outer", + ["if"] = "@function.inner", + ["ac"] = "@class.outer", + ["ic"] = "@class.inner", + }, + }, + move = { + enable = true, + set_jumps = true, + goto_next_start = { + ["]["] = "@function.outer", + ["]m"] = "@class.outer", + }, + goto_next_end = { + ["]]"] = "@function.outer", + ["]M"] = "@class.outer", + }, + goto_previous_start = { + ["[["] = "@function.outer", + ["[m"] = "@class.outer", + }, + goto_previous_end = { + ["[]"] = "@function.outer", + ["[M"] = "@class.outer", + }, + }, + }, + indent = { enable = true }, + matchup = { enable = true }, + }, false, require("nvim-treesitter.configs").setup) + require("nvim-treesitter.install").prefer_git = true + if use_ssh then + local parsers = require("nvim-treesitter.parsers").get_parser_configs() + for _, parser in pairs(parsers) do + parser.install_info.url = parser.install_info.url:gsub("https://github.com/", "git@github.com:") + end + end +end) diff --git a/.config/mackup/.config/nvim/lua/modules/configs/editor/ts-context-commentstring.lua b/.config/mackup/.config/nvim/lua/modules/configs/editor/ts-context-commentstring.lua new file mode 100644 index 0000000..ebefadc --- /dev/null +++ b/.config/mackup/.config/nvim/lua/modules/configs/editor/ts-context-commentstring.lua @@ -0,0 +1,7 @@ +return function() + vim.g.skip_ts_context_commentstring_module = true + require("modules.utils").load_plugin("ts_context_commentstring", { + -- Whether to update the `commentstring` on the `CursorHold` autocmd + enable_autocmd = false, + }) +end diff --git a/.config/mackup/.config/nvim/lua/modules/configs/editor/ts-context.lua b/.config/mackup/.config/nvim/lua/modules/configs/editor/ts-context.lua new file mode 100644 index 0000000..ba96e03 --- /dev/null +++ b/.config/mackup/.config/nvim/lua/modules/configs/editor/ts-context.lua @@ -0,0 +1,12 @@ +return function() + require("modules.utils").load_plugin("treesitter-context", { + enable = true, + max_lines = 3, -- How many lines the window should span. Values <= 0 mean no limit. + min_window_height = 0, -- Minimum editor window height to enable context. Values <= 0 mean no limit. + line_numbers = true, + multiline_threshold = 20, -- Maximum number of lines to collapse for a single context line + trim_scope = "outer", -- Which context lines to discard if `max_lines` is exceeded. Choices: 'inner', 'outer' + mode = "cursor", -- Line used to calculate context. Choices: 'cursor', 'topline' + zindex = 50, -- Ensure compatibility with Glance's preview window + }) +end diff --git a/.config/mackup/.config/nvim/lua/modules/configs/lang/bqf.lua b/.config/mackup/.config/nvim/lua/modules/configs/lang/bqf.lua new file mode 100644 index 0000000..9c80bd2 --- /dev/null +++ b/.config/mackup/.config/nvim/lua/modules/configs/lang/bqf.lua @@ -0,0 +1,9 @@ +return function() + require("modules.utils").load_plugin("bqf", { + preview = { + border = "single", + wrap = true, + winblend = 0, + }, + }) +end diff --git a/.config/mackup/.config/nvim/lua/modules/configs/lang/crates-keymap.lua b/.config/mackup/.config/nvim/lua/modules/configs/lang/crates-keymap.lua new file mode 100644 index 0000000..cf1584c --- /dev/null +++ b/.config/mackup/.config/nvim/lua/modules/configs/lang/crates-keymap.lua @@ -0,0 +1,126 @@ +local bind = require("keymap.bind") +local map_callback = bind.map_callback + +local crates = require("crates") +local crates_keymap = { + ["n|ct"] = map_callback(function() + crates.toggle() + end) + :with_noremap() + :with_silent() + :with_buffer(0) + :with_desc("crates: Toggle spec activities"), + ["n|cr"] = map_callback(function() + crates.reload() + end) + :with_noremap() + :with_silent() + :with_buffer(0) + :with_desc("crates: Reload crate specs"), + + ["n|cs"] = map_callback(function() + crates.show_popup() + end) + :with_noremap() + :with_silent() + :with_buffer(0) + :with_desc("crates: Toggle pop-up window"), + ["n|cv"] = map_callback(function() + crates.show_versions_popup() + crates.show_popup() + end) + :with_noremap() + :with_silent() + :with_buffer(0) + :with_desc("crates: Select spec versions"), + ["n|cf"] = map_callback(function() + crates.show_features_popup() + crates.show_popup() + end) + :with_noremap() + :with_silent() + :with_buffer(0) + :with_desc("crates: Select spec features"), + ["n|cd"] = map_callback(function() + crates.show_dependencies_popup() + crates.show_popup() + end) + :with_noremap() + :with_silent() + :with_buffer(0) + :with_desc("crates: Show project dependencies"), + + ["n|cu"] = map_callback(function() + crates.update_crate() + end) + :with_noremap() + :with_silent() + :with_buffer(0) + :with_desc("crates: Update current crate's spec"), + ["v|cu"] = map_callback(function() + crates.update_crates() + end) + :with_noremap() + :with_silent() + :with_buffer(0) + :with_desc("crates: Update selected crate's spec"), + ["n|ca"] = map_callback(function() + crates.update_all_crates() + end) + :with_noremap() + :with_silent() + :with_buffer(0) + :with_desc("crates: Update all crates' specs"), + ["n|cU"] = map_callback(function() + crates.upgrade_crate() + end) + :with_noremap() + :with_silent() + :with_buffer(0) + :with_desc("crates: Upgrade current crate"), + ["v|cU"] = map_callback(function() + crates.upgrade_crates() + end) + :with_noremap() + :with_silent() + :with_buffer(0) + :with_desc("crates: Upgrade selected crates"), + ["n|cA"] = map_callback(function() + crates.upgrade_all_crates() + end) + :with_noremap() + :with_silent() + :with_buffer(0) + :with_desc("crates: Upgrade all crates"), + + ["n|cH"] = map_callback(function() + crates.open_homepage() + end) + :with_noremap() + :with_silent() + :with_buffer(0) + :with_desc("crates: Open current crate's homepage"), + ["n|cR"] = map_callback(function() + crates.open_repository() + end) + :with_noremap() + :with_silent() + :with_buffer(0) + :with_desc("crates: Open current crate's repository"), + ["n|cD"] = map_callback(function() + crates.open_documentation() + end) + :with_noremap() + :with_silent() + :with_buffer(0) + :with_desc("crates: Open current crate's documentation"), + ["n|cC"] = map_callback(function() + crates.open_crates_io() + end) + :with_noremap() + :with_silent() + :with_buffer(0) + :with_desc("crates: Browse current crate on crates.io"), +} + +bind.nvim_load_mapping(crates_keymap) diff --git a/.config/mackup/.config/nvim/lua/modules/configs/lang/crates.lua b/.config/mackup/.config/nvim/lua/modules/configs/lang/crates.lua new file mode 100644 index 0000000..d2babd9 --- /dev/null +++ b/.config/mackup/.config/nvim/lua/modules/configs/lang/crates.lua @@ -0,0 +1,87 @@ +return function() + local icons = { + diagnostics = require("modules.utils.icons").get("diagnostics", true), + git = require("modules.utils.icons").get("git", true), + misc = require("modules.utils.icons").get("misc", true), + ui = require("modules.utils.icons").get("ui", true), + kind = require("modules.utils.icons").get("kind", true), + } + + require("modules.utils").load_plugin("crates", { + smart_insert = true, + insert_closing_quote = true, + autoload = true, + autoupdate = true, + autoupdate_throttle = 250, + loading_indicator = true, + date_format = "%Y-%m-%d", + thousands_separator = ",", + notification_title = "Crates", + curl_args = { "-sL", "--retry", "1" }, + text = { + loading = " " .. icons.misc.Watch .. "Loading", + version = " " .. icons.ui.Check .. "%s", + prerelease = " " .. icons.diagnostics.Warning_alt .. "%s", + yanked = " " .. icons.diagnostics.Error .. "%s", + nomatch = " " .. icons.diagnostics.Question .. "No match", + upgrade = " " .. icons.diagnostics.Hint_alt .. "%s", + error = " " .. icons.diagnostics.Error .. "Error fetching crate", + }, + popup = { + autofocus = false, + hide_on_select = true, + copy_register = '"', + style = "minimal", + border = "rounded", + show_version_date = true, + show_dependency_version = true, + max_height = 30, + min_width = 20, + padding = 1, + text = { + title = icons.ui.Package .. "%s", + description = "%s", + created_label = icons.misc.Added .. "created" .. " ", + created = "%s", + updated_label = icons.misc.ManUp .. "updated" .. " ", + updated = "%s", + downloads_label = icons.ui.CloudDownload .. "downloads ", + downloads = "%s", + homepage_label = icons.misc.Campass .. "homepage ", + homepage = "%s", + repository_label = icons.git.Repo .. "repository ", + repository = "%s", + documentation_label = icons.diagnostics.Information_alt .. "documentation ", + documentation = "%s", + crates_io_label = icons.ui.Package .. "crates.io ", + crates_io = "%s", + categories_label = icons.kind.Class .. "categories ", + keywords_label = icons.kind.Keyword .. "keywords ", + version = " %s", + prerelease = icons.diagnostics.Warning_alt .. "%s prerelease", + yanked = icons.diagnostics.Error .. "%s yanked", + version_date = " %s", + feature = " %s", + enabled = icons.ui.Play .. "%s", + transitive = icons.ui.List .. "%s", + normal_dependencies_title = icons.kind.Interface .. "Dependencies", + build_dependencies_title = icons.misc.Gavel .. "Build dependencies", + dev_dependencies_title = icons.misc.Glass .. "Dev dependencies", + dependency = " %s", + optional = icons.ui.BigUnfilledCircle .. "%s", + dependency_version = " %s", + loading = " " .. icons.misc.Watch, + }, + }, + completion = { + insert_closing_quote = true, + text = { + prerelease = " " .. icons.diagnostics.Warning_alt .. "pre-release ", + yanked = " " .. icons.diagnostics.Error_alt .. "yanked ", + }, + }, + }) + + -- Set buffer-local keymaps + require("lang.crates-keymap") +end diff --git a/.config/mackup/.config/nvim/lua/modules/configs/lang/go.lua b/.config/mackup/.config/nvim/lua/modules/configs/lang/go.lua new file mode 100644 index 0000000..8ca7b03 --- /dev/null +++ b/.config/mackup/.config/nvim/lua/modules/configs/lang/go.lua @@ -0,0 +1,21 @@ +return function() + require("modules.utils").load_plugin("go", { + -- By default, we've turned off these options to prevent clashes with our gopls config + icons = false, + diagnostic = false, + lsp_cfg = false, + lsp_gofumpt = false, + lsp_keymaps = false, + lsp_codelens = false, + lsp_document_formatting = false, + lsp_inlay_hints = { enable = false }, + -- DAP-related settings are also turned off here for the same reason + dap_debug = false, + dap_debug_keymap = false, + textobjects = false, + -- Miscellaneous options to seamlessly integrate with other plugins + trouble = true, + luasnip = false, + run_in_floaterm = false, + }) +end diff --git a/.config/mackup/.config/nvim/lua/modules/configs/lang/render-markdown.lua b/.config/mackup/.config/nvim/lua/modules/configs/lang/render-markdown.lua new file mode 100644 index 0000000..65ad80f --- /dev/null +++ b/.config/mackup/.config/nvim/lua/modules/configs/lang/render-markdown.lua @@ -0,0 +1,21 @@ +return function() + require("modules.utils").load_plugin("render-markdown", { + -- Whether Markdown should be rendered by default or not + enabled = true, + -- Maximum file size (in MB) that this plugin will attempt to render + -- Any file larger than this will effectively be ignored + max_file_size = 2.0, + -- Milliseconds that must pass before updating marks, updates occur + -- within the context of the visible window, not the entire buffer + debounce = 100, + -- Vim modes that will show a rendered view of the markdown file + -- All other modes will be uneffected by this plugin + render_modes = { "n", "c", "t" }, + -- This enables hiding any added text on the line the cursor is on + -- This does have a performance penalty as we must listen to the 'CursorMoved' event + anti_conceal = { enabled = true }, + -- The level of logs to write to file: vim.fn.stdpath('state') .. '/render-markdown.log' + -- Only intended to be used for plugin development / debugging + log_level = "error", + }) +end diff --git a/.config/mackup/.config/nvim/lua/modules/configs/lang/rust.lua b/.config/mackup/.config/nvim/lua/modules/configs/lang/rust.lua new file mode 100644 index 0000000..cdcc1c7 --- /dev/null +++ b/.config/mackup/.config/nvim/lua/modules/configs/lang/rust.lua @@ -0,0 +1,12 @@ +return function() + vim.g.rustaceanvim = { + -- Disable automatic DAP configuration to avoid conflicts with previous user configs + dap = { + adapter = false, + configuration = false, + autoload_configurations = false, + }, + } + + require("modules.utils").load_plugin("rustaceanvim", nil, true) +end diff --git a/.config/mackup/.config/nvim/lua/modules/configs/tool/dap/clients/codelldb.lua b/.config/mackup/.config/nvim/lua/modules/configs/tool/dap/clients/codelldb.lua new file mode 100644 index 0000000..64124c6 --- /dev/null +++ b/.config/mackup/.config/nvim/lua/modules/configs/tool/dap/clients/codelldb.lua @@ -0,0 +1,47 @@ +-- https://github.com/mfussenegger/nvim-dap/wiki/C-C---Rust-(via--codelldb) +return function() + local dap = require("dap") + local utils = require("modules.utils.dap") + local is_windows = require("core.global").is_windows + + dap.adapters.codelldb = { + type = "server", + port = "${port}", + executable = { + command = vim.fn.exepath("codelldb"), -- Find codelldb on $PATH + args = { "--port", "${port}" }, + detached = is_windows and false or true, + }, + } + dap.configurations.c = { + { + name = "Debug", + type = "codelldb", + request = "launch", + program = utils.input_exec_path(), + cwd = "${workspaceFolder}", + stopOnEntry = false, + terminal = "integrated", + }, + { + name = "Debug (with args)", + type = "codelldb", + request = "launch", + program = utils.input_exec_path(), + args = utils.input_args(), + cwd = "${workspaceFolder}", + stopOnEntry = false, + terminal = "integrated", + }, + { + name = "Attach to a running process", + type = "codelldb", + request = "attach", + program = utils.input_exec_path(), + stopOnEntry = false, + waitFor = true, + }, + } + dap.configurations.cpp = dap.configurations.c + dap.configurations.rust = dap.configurations.c +end diff --git a/.config/mackup/.config/nvim/lua/modules/configs/tool/dap/clients/delve.lua b/.config/mackup/.config/nvim/lua/modules/configs/tool/dap/clients/delve.lua new file mode 100644 index 0000000..6f02344 --- /dev/null +++ b/.config/mackup/.config/nvim/lua/modules/configs/tool/dap/clients/delve.lua @@ -0,0 +1,100 @@ +-- https://github.com/mfussenegger/nvim-dap/wiki/Debug-Adapter-installation#go +-- https://github.com/golang/vscode-go/blob/master/docs/debugging.md +return function() + local dap = require("dap") + local utils = require("modules.utils.dap") + + if not require("mason-registry").is_installed("go-debug-adapter") then + vim.notify( + "Automatically installing `go-debug-adapter` for go debugging", + vim.log.levels.INFO, + { title = "nvim-dap" } + ) + + local go_dbg = require("mason-registry").get_package("go-debug-adapter") + go_dbg:install():once( + "closed", + vim.schedule_wrap(function() + if go_dbg:is_installed() then + vim.notify("Successfully installed `go-debug-adapter`", vim.log.levels.INFO, { title = "nvim-dap" }) + end + end) + ) + end + + dap.adapters.go = { + type = "executable", + command = "node", + args = { + require("mason-registry").get_package("go-debug-adapter"):get_install_path() + .. "/extension/dist/debugAdapter.js", + }, + } + dap.configurations.go = { + { + type = "go", + name = "Debug (file)", + request = "launch", + cwd = "${workspaceFolder}", + program = utils.input_file_path(), + console = "integratedTerminal", + dlvToolPath = vim.fn.exepath("dlv"), + showLog = true, + showRegisters = true, + stopOnEntry = false, + }, + { + type = "go", + name = "Debug (file with args)", + request = "launch", + cwd = "${workspaceFolder}", + program = utils.input_file_path(), + args = utils.input_args(), + console = "integratedTerminal", + dlvToolPath = vim.fn.exepath("dlv"), + showLog = true, + showRegisters = true, + stopOnEntry = false, + }, + { + type = "go", + name = "Debug (executable)", + request = "launch", + cwd = "${workspaceFolder}", + program = utils.input_exec_path(), + args = utils.input_args(), + console = "integratedTerminal", + dlvToolPath = vim.fn.exepath("dlv"), + mode = "exec", + showLog = true, + showRegisters = true, + stopOnEntry = false, + }, + { + type = "go", + name = "Debug (test file)", + request = "launch", + cwd = "${workspaceFolder}", + program = utils.input_file_path(), + console = "integratedTerminal", + dlvToolPath = vim.fn.exepath("dlv"), + mode = "test", + showLog = true, + showRegisters = true, + stopOnEntry = false, + }, + { + type = "go", + name = "Debug (using go.mod)", + request = "launch", + cwd = "${workspaceFolder}", + program = "./${relativeFileDirname}", + console = "integratedTerminal", + dlvToolPath = vim.fn.exepath("dlv"), + mode = "test", + showLog = true, + showRegisters = true, + stopOnEntry = false, + }, + } +end diff --git a/.config/mackup/.config/nvim/lua/modules/configs/tool/dap/clients/lldb.lua b/.config/mackup/.config/nvim/lua/modules/configs/tool/dap/clients/lldb.lua new file mode 100644 index 0000000..8461c77 --- /dev/null +++ b/.config/mackup/.config/nvim/lua/modules/configs/tool/dap/clients/lldb.lua @@ -0,0 +1,36 @@ +-- https://github.com/mfussenegger/nvim-dap/wiki/Debug-Adapter-installation#ccrust-via-lldb-vscode +return function() + local dap = require("dap") + local utils = require("modules.utils.dap") + + dap.adapters.lldb = { + type = "executable", + command = vim.fn.exepath("lldb-vscode"), -- Find lldb-vscode on $PATH + } + dap.configurations.c = { + { + name = "Launch", + type = "lldb", + request = "launch", + program = utils.input_exec_path(), + cwd = "${workspaceFolder}", + args = utils.input_args(), + env = utils.get_env(), + + -- if you change `runInTerminal` to true, you might need to change the yama/ptrace_scope setting: + -- + -- echo 0 | sudo tee /proc/sys/kernel/yama/ptrace_scope + -- + -- Otherwise you might get the following error: + -- + -- Error on launch: Failed to attach to the target process + -- + -- But you should be aware of the implications: + -- https://www.kernel.org/doc/html/latest/admin-guide/LSM/Yama.html + runInTerminal = false, + }, + } + + dap.configurations.cpp = dap.configurations.c + dap.configurations.rust = dap.configurations.c +end diff --git a/.config/mackup/.config/nvim/lua/modules/configs/tool/dap/clients/python.lua b/.config/mackup/.config/nvim/lua/modules/configs/tool/dap/clients/python.lua new file mode 100644 index 0000000..3ff35e5 --- /dev/null +++ b/.config/mackup/.config/nvim/lua/modules/configs/tool/dap/clients/python.lua @@ -0,0 +1,74 @@ +-- https://github.com/mfussenegger/nvim-dap/wiki/Debug-Adapter-installation#python +-- https://github.com/microsoft/debugpy/wiki/Debug-configuration-settings +return function() + local dap = require("dap") + local utils = require("modules.utils.dap") + local is_windows = require("core.global").is_windows + local debugpy_root = require("mason-registry").get_package("debugpy"):get_install_path() + + dap.adapters.python = function(callback, config) + if config.request == "attach" then + local port = (config.connect or config).port + local host = (config.connect or config).host or "127.0.0.1" + callback({ + type = "server", + port = assert(port, "`connect.port` is required for a python `attach` configuration"), + host = host, + options = { source_filetype = "python" }, + }) + else + callback({ + type = "executable", + command = is_windows and debugpy_root .. "/venv/Scripts/pythonw.exe" + or debugpy_root .. "/venv/bin/python", + args = { "-m", "debugpy.adapter" }, + options = { source_filetype = "python" }, + }) + end + end + dap.configurations.python = { + { + -- The first three options are required by nvim-dap + type = "python", -- the type here established the link to the adapter definition: `dap.adapters.python` + request = "launch", + name = "Debug", + -- Options below are for debugpy, see https://github.com/microsoft/debugpy/wiki/Debug-configuration-settings for supported options + console = "integratedTerminal", + program = utils.input_file_path(), + pythonPath = function() + local venv = vim.env.CONDA_PREFIX + if venv then + return is_windows and venv .. "/Scripts/pythonw.exe" or venv .. "/bin/python" + else + return is_windows and "pythonw.exe" or "python3" + end + end, + }, + { + -- NOTE: This setting is for people using venv + type = "python", + request = "launch", + name = "Debug (using venv)", + -- Options below are for debugpy, see https://github.com/microsoft/debugpy/wiki/Debug-configuration-settings for supported options + console = "integratedTerminal", + program = utils.input_file_path(), + pythonPath = function() + -- Prefer the venv that is defined by the designated environment variable. + local cwd, venv = vim.fn.getcwd(), os.getenv("VIRTUAL_ENV") + local python = venv and (is_windows and venv .. "/Scripts/pythonw.exe" or venv .. "/bin/python") or "" + if vim.fn.executable(python) == 1 then + return python + end + + -- Otherwise, fall back to check if there are any local venvs available. + venv = vim.fn.isdirectory(cwd .. "/venv") == 1 and cwd .. "/venv" or cwd .. "/.venv" + python = is_windows and venv .. "/Scripts/pythonw.exe" or venv .. "/bin/python" + if vim.fn.executable(python) == 1 then + return python + else + return is_windows and "pythonw.exe" or "python3" + end + end, + }, + } +end diff --git a/.config/mackup/.config/nvim/lua/modules/configs/tool/dap/dap-keymap.lua b/.config/mackup/.config/nvim/lua/modules/configs/tool/dap/dap-keymap.lua new file mode 100644 index 0000000..bdaf08d --- /dev/null +++ b/.config/mackup/.config/nvim/lua/modules/configs/tool/dap/dap-keymap.lua @@ -0,0 +1,21 @@ +local M = {} + +local bind = require("keymap.bind") +local map_cmd = bind.map_cmd + +local did_load_debug_mappings = false +local debug_keymap = { + ["nv|K"] = map_cmd("lua require('dapui').eval()") + :with_noremap() + :with_nowait() + :with_desc("Evaluate expression under cursor"), +} + +function M.load_extras() + if not did_load_debug_mappings then + require("modules.utils.keymap").amend("Debugging", "_debugging", debug_keymap) + did_load_debug_mappings = true + end +end + +return M diff --git a/.config/mackup/.config/nvim/lua/modules/configs/tool/dap/dapui.lua b/.config/mackup/.config/nvim/lua/modules/configs/tool/dap/dapui.lua new file mode 100644 index 0000000..ab14dbc --- /dev/null +++ b/.config/mackup/.config/nvim/lua/modules/configs/tool/dap/dapui.lua @@ -0,0 +1,72 @@ +return function() + local icons = { + ui = require("modules.utils.icons").get("ui"), + dap = require("modules.utils.icons").get("dap"), + } + + require("modules.utils").load_plugin("dapui", { + force_buffers = true, + icons = { + expanded = icons.ui.ArrowOpen, + collapsed = icons.ui.ArrowClosed, + current_frame = icons.ui.Indicator, + }, + mappings = { + -- Use a table to apply multiple mappings + edit = "e", + expand = { "", "<2-LeftMouse>" }, + open = "o", + remove = "d", + repl = "r", + toggle = "t", + }, + layouts = { + { + elements = { + -- Provide as ID strings or tables with "id" and "size" keys + { + id = "scopes", + size = 0.3, -- Can be float or integer > 1 + }, + { id = "watches", size = 0.3 }, + { id = "stacks", size = 0.3 }, + { id = "breakpoints", size = 0.1 }, + }, + size = 0.3, + position = "right", + }, + { + elements = { + { id = "console", size = 0.55 }, + { id = "repl", size = 0.45 }, + }, + position = "bottom", + size = 0.25, + }, + }, + controls = { + enabled = true, + -- Display controls in this session + element = "repl", + icons = { + pause = icons.dap.Pause, + play = icons.dap.Play, + step_into = icons.dap.StepInto, + step_over = icons.dap.StepOver, + step_out = icons.dap.StepOut, + step_back = icons.dap.StepBack, + run_last = icons.dap.RunLast, + terminate = icons.dap.Terminate, + }, + }, + floating = { + max_height = nil, -- These can be integers or a float between 0 and 1. + max_width = nil, -- Floats will be treated as percentage of your screen. + border = "single", -- Border style. Can be "single", "double" or "rounded" + mappings = { + close = { "q", "" }, + }, + }, + render = { indent = 1, max_value_lines = 85 }, + }) +end diff --git a/.config/mackup/.config/nvim/lua/modules/configs/tool/dap/init.lua b/.config/mackup/.config/nvim/lua/modules/configs/tool/dap/init.lua new file mode 100644 index 0000000..f2fa42a --- /dev/null +++ b/.config/mackup/.config/nvim/lua/modules/configs/tool/dap/init.lua @@ -0,0 +1,84 @@ +return function() + local dap = require("dap") + local dapui = require("dapui") + local mason_dap = require("mason-nvim-dap") + + local icons = { dap = require("modules.utils.icons").get("dap") } + local colors = require("modules.utils").get_palette() + local mappings = require("tool.dap.dap-keymap") + + -- Initialize debug hooks + _G._debugging = false + local function debug_init_cb() + _G._debugging = true + mappings.load_extras() + dapui.open({ reset = true }) + end + local function debug_terminate_cb() + if _debugging then + _G._debugging = false + dapui.close() + end + end + dap.listeners.after.event_initialized["dapui_config"] = debug_init_cb + dap.listeners.before.event_terminated["dapui_config"] = debug_terminate_cb + dap.listeners.before.event_exited["dapui_config"] = debug_terminate_cb + dap.listeners.before.disconnect["dapui_config"] = debug_terminate_cb + + -- We need to override nvim-dap's default highlight groups, AFTER requiring nvim-dap for catppuccin. + vim.api.nvim_set_hl(0, "DapStopped", { fg = colors.green }) + + vim.fn.sign_define( + "DapBreakpoint", + { text = icons.dap.Breakpoint, texthl = "DapBreakpoint", linehl = "", numhl = "" } + ) + vim.fn.sign_define( + "DapBreakpointCondition", + { text = icons.dap.BreakpointCondition, texthl = "DapBreakpoint", linehl = "", numhl = "" } + ) + vim.fn.sign_define("DapStopped", { text = icons.dap.Stopped, texthl = "DapStopped", linehl = "", numhl = "" }) + vim.fn.sign_define( + "DapBreakpointRejected", + { text = icons.dap.BreakpointRejected, texthl = "DapBreakpoint", linehl = "", numhl = "" } + ) + vim.fn.sign_define("DapLogPoint", { text = icons.dap.LogPoint, texthl = "DapLogPoint", linehl = "", numhl = "" }) + + ---A handler to setup all clients defined under `tool/dap/clients/*.lua` + ---@param config table + local function mason_dap_handler(config) + local dap_name = config.name + local ok, custom_handler = pcall(require, "user.configs.dap-clients." .. dap_name) + if not ok then + -- Use preset if there is no user definition + ok, custom_handler = pcall(require, "tool.dap.clients." .. dap_name) + end + if not ok then + -- Default to use factory config for clients(s) that doesn't include a spec + mason_dap.default_setup(config) + return + elseif type(custom_handler) == "function" then + -- Case where the protocol requires its own setup + -- Make sure to set + -- * dap.adpaters. = { your config } + -- * dap.configurations. = { your config } + -- See `codelldb.lua` for a concrete example. + custom_handler(config) + else + vim.notify( + string.format( + "Failed to setup [%s].\n\nClient definition under `tool/dap/clients` must return\na fun(opts) (got '%s' instead)", + config.name, + type(custom_handler) + ), + vim.log.levels.ERROR, + { title = "nvim-dap" } + ) + end + end + + require("modules.utils").load_plugin("mason-nvim-dap", { + ensure_installed = require("core.settings").dap_deps, + automatic_installation = true, + handlers = { mason_dap_handler }, + }) +end diff --git a/.config/mackup/.config/nvim/lua/modules/configs/tool/dropbar.lua b/.config/mackup/.config/nvim/lua/modules/configs/tool/dropbar.lua new file mode 100644 index 0000000..e09666a --- /dev/null +++ b/.config/mackup/.config/nvim/lua/modules/configs/tool/dropbar.lua @@ -0,0 +1,131 @@ +return function() + local icons = { + kind = require("modules.utils.icons").get("kind", true), + type = require("modules.utils.icons").get("type", true), + misc = require("modules.utils.icons").get("misc", true), + ui = require("modules.utils.icons").get("ui", true), + } + local utils = require("dropbar.utils") + local sources = require("dropbar.sources") + -- Custom source to display only the leaf filename in the dropbar + sources.symbols = { + get_symbols = function(buf, win, cursor) + local symbols = sources.path.get_symbols(buf, win, cursor) + return { symbols[#symbols] } + end, + } + + require("modules.utils").load_plugin("dropbar", { + bar = { + hover = false, + truncate = true, + pick = { pivots = "etovxqpdygfblzhckisuran" }, + sources = function(buf) + if vim.bo[buf].ft == "markdown" then + return { + sources.symbols, + sources.markdown, + } + end + if vim.bo[buf].buftype == "terminal" then + return { + sources.terminal, + } + end + return { + sources.symbols, + utils.source.fallback({ + sources.lsp, + sources.treesitter, + }), + } + end, + }, + sources = { + terminal = { + name = function(buf) + local name = vim.api.nvim_buf_get_name(buf) + local term = select(2, require("toggleterm.terminal").identify(name)) + -- Trying to "snag" a display name from toggleterm + if term then + return term.display_name or term.name + else + return name + end + end, + }, + }, + icons = { + enable = true, + kinds = { + symbols = { + -- Type + Array = icons.type.Array, + Boolean = icons.type.Boolean, + Null = icons.type.Null, + Number = icons.type.Number, + Object = icons.type.Object, + String = icons.type.String, + Text = icons.type.String, + + -- Kind + BreakStatement = icons.kind.Break, + Call = icons.kind.Call, + CaseStatement = icons.kind.Case, + Class = icons.kind.Class, + Color = icons.kind.Color, + Constant = icons.kind.Constant, + Constructor = icons.kind.Constructor, + ContinueStatement = icons.kind.Continue, + Declaration = icons.kind.Declaration, + Delete = icons.kind.Delete, + DoStatement = icons.kind.Loop, + Enum = icons.kind.Enum, + EnumMember = icons.kind.EnumMember, + Event = icons.kind.Event, + Field = icons.kind.Field, + File = icons.kind.File, + ForStatement = icons.kind.Loop, + Function = icons.kind.Function, + Identifier = icons.kind.Variable, + Interface = icons.kind.Interface, + Keyword = icons.kind.Keyword, + List = icons.kind.List, + Lsp = icons.misc.LspAvailable, + Method = icons.kind.Method, + Module = icons.kind.Module, + Namespace = icons.kind.Namespace, + Operator = icons.kind.Operator, + Package = icons.kind.Package, + Pair = icons.kind.List, + Property = icons.kind.Property, + Reference = icons.kind.Reference, + Regex = icons.kind.Regex, + Repeat = icons.kind.Loop, + Scope = icons.kind.Statement, + Snippet = icons.kind.Snippet, + Statement = icons.kind.Statement, + Struct = icons.kind.Struct, + SwitchStatement = icons.kind.Switch, + Type = icons.kind.Interface, + TypeParameter = icons.kind.TypeParameter, + Unit = icons.kind.Unit, + Value = icons.kind.Value, + Variable = icons.kind.Variable, + WhileStatement = icons.kind.Loop, + + -- Microsoft-specific icons + Folder = icons.kind.Folder, + + -- ccls-specific icons + Macro = icons.kind.Macro, + Terminal = icons.kind.Terminal, + }, + }, + ui = { + bar = { separator = "  " }, + menu = { indicator = icons.ui.ArrowClosed }, + }, + }, + }) +end diff --git a/.config/mackup/.config/nvim/lua/modules/configs/tool/fcitx5.lua b/.config/mackup/.config/nvim/lua/modules/configs/tool/fcitx5.lua new file mode 100644 index 0000000..c8b10e1 --- /dev/null +++ b/.config/mackup/.config/nvim/lua/modules/configs/tool/fcitx5.lua @@ -0,0 +1,19 @@ +return function() + require("modules.utils").load_plugin("fcitx5", { + msg = nil, -- string | nil: printed when startup is completed + imname = { -- fcitx5.Imname | nil: imnames on each mode set as prior. See `:h map-table` for more in-depth information. + norm = nil, -- string | nil: imname to set in normal mode. if nil, will restore the mode on exit. + ins = nil, + cmd = nil, + vis = nil, + sel = nil, + opr = nil, + term = nil, + lang = nil, + }, + remember_prior = true, -- boolean: if true, it remembers the mode on exit and restore it when entering the mode again. + -- if false, uses what was set in config. + define_autocmd = true, -- boolean: if true, defines autocmd at `ModeChanged` to switch fcitx5 mode. + log = "warn", -- string: log level (default: warn) + }) +end diff --git a/.config/mackup/.config/nvim/lua/modules/configs/tool/nvim-tree.lua b/.config/mackup/.config/nvim/lua/modules/configs/tool/nvim-tree.lua new file mode 100644 index 0000000..fcf5288 --- /dev/null +++ b/.config/mackup/.config/nvim/lua/modules/configs/tool/nvim-tree.lua @@ -0,0 +1,201 @@ +return function() + local icons = { + diagnostics = require("modules.utils.icons").get("diagnostics"), + documents = require("modules.utils.icons").get("documents"), + git = require("modules.utils.icons").get("git"), + ui = require("modules.utils.icons").get("ui"), + } + + require("modules.utils").load_plugin("nvim-tree", { + auto_reload_on_write = true, + create_in_closed_folder = false, + disable_netrw = false, + hijack_cursor = true, + hijack_netrw = true, + hijack_unnamed_buffer_when_opening = true, + open_on_tab = false, + respect_buf_cwd = false, + sort_by = "name", + sync_root_with_cwd = true, + on_attach = function(bufnr) + require("nvim-tree.api").config.mappings.default_on_attach(bufnr) + vim.keymap.del("n", "", { buffer = bufnr }) + end, + view = { + adaptive_size = false, + centralize_selection = false, + width = 30, + side = "left", + preserve_window_proportions = false, + number = false, + relativenumber = false, + signcolumn = "yes", + float = { + enable = false, + open_win_config = { + relative = "editor", + border = "rounded", + width = 30, + height = 30, + row = 1, + col = 1, + }, + }, + }, + renderer = { + add_trailing = false, + group_empty = true, + highlight_git = true, + full_name = false, + highlight_opened_files = "none", + special_files = { "Cargo.toml", "Makefile", "README.md", "readme.md", "CMakeLists.txt" }, + symlink_destination = true, + indent_markers = { + enable = true, + icons = { + corner = "└ ", + edge = "│ ", + item = "│ ", + none = " ", + }, + }, + root_folder_label = ":.:s?.*?/..?", + icons = { + webdev_colors = true, + git_placement = "after", + show = { + file = true, + folder = true, + folder_arrow = true, + git = true, + }, + padding = " ", + symlink_arrow = " 󰁔 ", + glyphs = { + default = icons.documents.Default, -- + symlink = icons.documents.Symlink, -- + bookmark = icons.ui.Bookmark, + git = { + unstaged = icons.git.Mod_alt, + staged = icons.git.Add, --󰄬 + unmerged = icons.git.Unmerged, + renamed = icons.git.Rename, --󰁔 + untracked = icons.git.Untracked, -- "󰞋" + deleted = icons.git.Remove, -- + ignored = icons.git.Ignore, --◌ + }, + folder = { + arrow_open = icons.ui.ArrowOpen, + arrow_closed = icons.ui.ArrowClosed, + -- arrow_open = "", + -- arrow_closed = "", + default = icons.ui.Folder, + open = icons.ui.FolderOpen, + empty = icons.ui.EmptyFolder, + empty_open = icons.ui.EmptyFolderOpen, + symlink = icons.ui.SymlinkFolder, + symlink_open = icons.ui.FolderOpen, + }, + }, + }, + }, + hijack_directories = { + enable = true, + auto_open = true, + }, + update_focused_file = { + enable = true, + update_root = true, + ignore_list = {}, + }, + filters = { + dotfiles = false, + custom = { ".DS_Store" }, + exclude = {}, + }, + actions = { + use_system_clipboard = true, + change_dir = { + enable = true, + global = false, + }, + open_file = { + quit_on_open = false, + resize_window = false, + window_picker = { + enable = true, + chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890", + exclude = { + buftype = { + "help", + "nofile", + "prompt", + "quickfix", + "terminal", + }, + filetype = { + "dap-repl", + "diff", + "fugitive", + "fugitiveblame", + "git", + "notify", + "NvimTree", + "Outline", + "qf", + "TelescopePrompt", + "toggleterm", + "undotree", + }, + }, + }, + }, + remove_file = { + close_window = true, + }, + }, + diagnostics = { + enable = false, + show_on_dirs = false, + debounce_delay = 50, + icons = { + hint = icons.diagnostics.Hint_alt, + info = icons.diagnostics.Information_alt, + warning = icons.diagnostics.Warning_alt, + error = icons.diagnostics.Error_alt, + }, + }, + filesystem_watchers = { + enable = true, + debounce_delay = 50, + }, + git = { + enable = true, + ignore = false, + show_on_dirs = true, + timeout = 400, + }, + trash = { + cmd = "gio trash", + require_confirm = true, + }, + live_filter = { + prefix = "[FILTER]: ", + always_show_folders = true, + }, + log = { + enable = false, + truncate = false, + types = { + all = false, + config = false, + copy_paste = false, + dev = false, + diagnostics = false, + git = false, + profile = false, + watcher = false, + }, + }, + }) +end diff --git a/.config/mackup/.config/nvim/lua/modules/configs/tool/project.lua b/.config/mackup/.config/nvim/lua/modules/configs/tool/project.lua new file mode 100644 index 0000000..3d77ab7 --- /dev/null +++ b/.config/mackup/.config/nvim/lua/modules/configs/tool/project.lua @@ -0,0 +1,13 @@ +return function() + require("modules.utils").load_plugin("project_nvim", { + manual_mode = false, + detection_methods = { "lsp", "pattern" }, + patterns = { ".git", "_darcs", ".hg", ".bzr", ".svn", "Makefile", "package.json" }, + ignore_lsp = { "null-ls", "copilot" }, + exclude_dirs = {}, + show_hidden = false, + silent_chdir = true, + scope_chdir = "global", + datapath = vim.fn.stdpath("data"), + }) +end diff --git a/.config/mackup/.config/nvim/lua/modules/configs/tool/search.lua b/.config/mackup/.config/nvim/lua/modules/configs/tool/search.lua new file mode 100644 index 0000000..ec84cd7 --- /dev/null +++ b/.config/mackup/.config/nvim/lua/modules/configs/tool/search.lua @@ -0,0 +1,151 @@ +return function() + local builtin = require("telescope.builtin") + local extensions = require("telescope").extensions + local vim_path = require("core.global").vim_path + + require("modules.utils").load_plugin("search", { + collections = { + -- Search using filenames + file = { + initial_tab = 1, + tabs = { + { + name = "Files", + tele_func = function(opts) + opts = opts or {} + if vim.fn.getcwd() == vim_path then + builtin.find_files(vim.tbl_deep_extend("force", opts, { no_ignore = true })) + elseif vim.fn.isdirectory(".git") == 1 then + builtin.git_files(opts) + else + builtin.find_files(opts) + end + end, + }, + { + name = "Frecency", + tele_func = function() + extensions.frecency.frecency() + end, + }, + { + name = "Oldfiles", + tele_func = function() + builtin.oldfiles() + end, + }, + { + name = "Buffers", + tele_func = function() + builtin.buffers() + end, + }, + }, + }, + -- Search using patterns + pattern = { + initial_tab = 1, + tabs = { + { + name = "Word in project", + tele_func = function() + local opts = {} + if vim.fn.getcwd() == vim_path then + opts["additional_args"] = { "--no-ignore" } + end + extensions.live_grep_args.live_grep_args(opts) + end, + }, + { + name = "Word under cursor", + tele_func = function(opts) + opts = opts or {} + if vim.fn.getcwd() == vim_path then + opts["additional_args"] = { "--no-ignore" } + end + builtin.grep_string(opts) + end, + }, + }, + }, + -- Search Git objects (branches, commits) + git = { + initial_tab = 1, + tabs = { + { + name = "Branches", + tele_func = function() + builtin.git_branches() + end, + }, + { + name = "Commits", + tele_func = function() + builtin.git_commits() + end, + }, + { + name = "Commit content", + tele_func = function() + extensions.advanced_git_search.search_log_content() + end, + }, + { + name = "Diff current file with commit", + tele_func = function() + extensions.advanced_git_search.diff_commit_file() + end, + }, + }, + }, + -- Retrieve dossiers + dossier = { + initial_tab = 1, + tabs = { + { + name = "Sessions", + tele_func = function() + extensions.persisted.persisted() + end, + }, + { + name = "Projects", + tele_func = function() + extensions.projects.projects({}) + end, + }, + { + name = "Zoxide", + tele_func = function() + extensions.zoxide.list() + end, + }, + }, + }, + -- Miscellaneous + misc = { + initial_tab = 1, + tabs = { + { + name = "Colorschemes", + tele_func = function() + builtin.colorscheme({ enable_preview = true }) + end, + }, + { + name = "Notify", + tele_func = function() + extensions.notify.notify() + end, + }, + { + name = "Undo History", + tele_func = function() + extensions.undo.undo() + end, + }, + }, + }, + }, + }) +end diff --git a/.config/mackup/.config/nvim/lua/modules/configs/tool/smartyank.lua b/.config/mackup/.config/nvim/lua/modules/configs/tool/smartyank.lua new file mode 100644 index 0000000..551ae6f --- /dev/null +++ b/.config/mackup/.config/nvim/lua/modules/configs/tool/smartyank.lua @@ -0,0 +1,24 @@ +return function() + require("modules.utils").load_plugin("smartyank", { + highlight = { + enabled = false, -- highlight yanked text + higroup = "IncSearch", -- highlight group of yanked text + timeout = 2000, -- timeout for clearing the highlight + }, + clipboard = { + enabled = true, + }, + tmux = { + enabled = true, + -- remove `-w` to disable copy to host client's clipboard + cmd = { "tmux", "set-buffer", "-w" }, + }, + osc52 = { + enabled = true, + escseq = "tmux", -- use tmux escape sequence, only enable if you're using remote tmux and have issues (see #4) + ssh_only = true, -- false to OSC52 yank also in local sessions + silent = false, -- true to disable the "n chars copied" echo + echo_hl = "Directory", -- highlight group of the OSC52 echo message + }, + }) +end diff --git a/.config/mackup/.config/nvim/lua/modules/configs/tool/sniprun.lua b/.config/mackup/.config/nvim/lua/modules/configs/tool/sniprun.lua new file mode 100644 index 0000000..78cb979 --- /dev/null +++ b/.config/mackup/.config/nvim/lua/modules/configs/tool/sniprun.lua @@ -0,0 +1,27 @@ +return function() + require("modules.utils").load_plugin("sniprun", { + selected_interpreters = {}, -- " use those instead of the default for the current filetype + repl_enable = {}, -- " enable REPL-like behavior for the given interpreters + repl_disable = {}, -- " disable REPL-like behavior for the given interpreters + interpreter_options = {}, -- " intepreter-specific options, consult docs / :SnipInfo + -- " you can combo different display modes as desired + display = { + "TempFloatingWindowOk", -- display ok results in the floating window + "NvimNotifyErr", -- display err results with the nvim-notify plugin + -- "Classic", -- display results in the command line" + -- "VirtualText", -- display results in virtual text" + -- "LongTempFloatingWindow", -- display results in the long floating window + -- "Terminal" -- display results in a vertical split + -- "TerminalWithCode" -- display results and code history in a vertical split + }, + display_options = { + terminal_width = 45, + notification_timeout = 5000, + }, + -- " miscellaneous compatibility/adjustement settings + inline_messages = 0, -- " inline_message (0/1) is a one-line way to display messages + -- " to workaround sniprun not being able to display anything + borders = "single", -- " display borders around floating windows + -- " possible values are 'none', 'single', 'double', or 'shadow' + }) +end diff --git a/.config/mackup/.config/nvim/lua/modules/configs/tool/telescope.lua b/.config/mackup/.config/nvim/lua/modules/configs/tool/telescope.lua new file mode 100644 index 0000000..eb096fb --- /dev/null +++ b/.config/mackup/.config/nvim/lua/modules/configs/tool/telescope.lua @@ -0,0 +1,94 @@ +return function() + local icons = { ui = require("modules.utils.icons").get("ui", true) } + local lga_actions = require("telescope-live-grep-args.actions") + + require("modules.utils").load_plugin("telescope", { + defaults = { + vimgrep_arguments = { + "rg", + "--no-heading", + "--with-filename", + "--line-number", + "--column", + "--smart-case", + }, + initial_mode = "insert", + prompt_prefix = " " .. icons.ui.Telescope .. " ", + selection_caret = icons.ui.ChevronRight, + scroll_strategy = "limit", + results_title = false, + layout_strategy = "horizontal", + path_display = { "absolute" }, + selection_strategy = "reset", + sorting_strategy = "ascending", + color_devicons = true, + file_ignore_patterns = { ".git/", ".cache", "build/", "%.class", "%.pdf", "%.mkv", "%.mp4", "%.zip" }, + layout_config = { + horizontal = { + prompt_position = "top", + preview_width = 0.55, + results_width = 0.8, + }, + vertical = { + mirror = false, + }, + width = 0.85, + height = 0.92, + preview_cutoff = 120, + }, + file_previewer = require("telescope.previewers").vim_buffer_cat.new, + grep_previewer = require("telescope.previewers").vim_buffer_vimgrep.new, + qflist_previewer = require("telescope.previewers").vim_buffer_qflist.new, + file_sorter = require("telescope.sorters").get_fuzzy_file, + generic_sorter = require("telescope.sorters").get_generic_fuzzy_sorter, + buffer_previewer_maker = require("telescope.previewers").buffer_previewer_maker, + }, + extensions = { + fzf = { + fuzzy = false, + override_generic_sorter = true, + override_file_sorter = true, + case_mode = "smart_case", + }, + frecency = { + show_scores = true, + show_unindexed = true, + ignore_patterns = { "*.git/*", "*/tmp/*" }, + }, + live_grep_args = { + auto_quoting = true, -- enable/disable auto-quoting + mappings = { -- extend mappings + i = { + [""] = lga_actions.quote_prompt(), + [""] = lga_actions.quote_prompt({ postfix = " --iglob " }), + }, + }, + }, + undo = { + side_by_side = true, + mappings = { + i = { + [""] = require("telescope-undo.actions").yank_additions, + [""] = require("telescope-undo.actions").yank_deletions, + [""] = require("telescope-undo.actions").restore, + }, + }, + }, + advanced_git_search = { + diff_plugin = "diffview", + git_flags = { "-c", "delta.side-by-side=true" }, + entry_default_author_or_date = "author", -- one of "author" or "date" + }, + }, + }) + + require("telescope").load_extension("frecency") + require("telescope").load_extension("fzf") + require("telescope").load_extension("live_grep_args") + require("telescope").load_extension("notify") + require("telescope").load_extension("projects") + require("telescope").load_extension("undo") + require("telescope").load_extension("zoxide") + require("telescope").load_extension("persisted") + require("telescope").load_extension("advanced_git_search") +end diff --git a/.config/mackup/.config/nvim/lua/modules/configs/tool/toggleterm.lua b/.config/mackup/.config/nvim/lua/modules/configs/tool/toggleterm.lua new file mode 100644 index 0000000..4cee6cf --- /dev/null +++ b/.config/mackup/.config/nvim/lua/modules/configs/tool/toggleterm.lua @@ -0,0 +1,41 @@ +return function() + require("modules.utils").load_plugin("toggleterm", { + -- size can be a number or function which is passed the current terminal + size = function(term) + if term.direction == "horizontal" then + return vim.o.lines * 0.30 + elseif term.direction == "vertical" then + return vim.o.columns * 0.40 + end + end, + on_open = function() + -- Prevent infinite calls from freezing neovim. + -- Only set these options specific to this terminal buffer. + vim.api.nvim_set_option_value("foldmethod", "manual", { scope = "local" }) + vim.api.nvim_set_option_value("foldexpr", "0", { scope = "local" }) + end, + highlights = { + Normal = { + link = "Normal", + }, + NormalFloat = { + link = "NormalFloat", + }, + FloatBorder = { + link = "FloatBorder", + }, + }, + open_mapping = false, -- [[]], + hide_numbers = true, -- hide the number column in toggleterm buffers + shade_filetypes = {}, + shade_terminals = false, + shading_factor = "1", -- the degree by which to darken to terminal colour, default: 1 for dark backgrounds, 3 for light + start_in_insert = true, + persist_mode = false, + insert_mappings = true, -- whether or not the open mapping applies in insert mode + persist_size = true, + direction = "horizontal", + close_on_exit = true, -- close the terminal window when the process exits + shell = vim.o.shell, -- change the default shell + }) +end diff --git a/.config/mackup/.config/nvim/lua/modules/configs/tool/trouble.lua b/.config/mackup/.config/nvim/lua/modules/configs/tool/trouble.lua new file mode 100644 index 0000000..6a9bbfc --- /dev/null +++ b/.config/mackup/.config/nvim/lua/modules/configs/tool/trouble.lua @@ -0,0 +1,38 @@ +return function() + local icons = { + ui = require("modules.utils.icons").get("ui", true), + } + + require("modules.utils").load_plugin("trouble", { + auto_open = false, + auto_close = false, + auto_jump = false, + auto_preview = true, + auto_refresh = true, + focus = false, -- do not focus the window when opened + follow = true, + restore = true, + icons = { + indent = { + fold_open = icons.ui.ArrowOpen, + fold_closed = icons.ui.ArrowClosed, + }, + folder_closed = icons.ui.Folder, + folder_open = icons.ui.FolderOpen, + }, + modes = { + project_diagnostics = { + mode = "diagnostics", + filter = { + any = { + { + function(item) + return item.filename:find(vim.fn.getcwd(), 1, true) + end, + }, + }, + }, + }, + }, + }) +end diff --git a/.config/mackup/.config/nvim/lua/modules/configs/tool/which-key.lua b/.config/mackup/.config/nvim/lua/modules/configs/tool/which-key.lua new file mode 100644 index 0000000..e04e701 --- /dev/null +++ b/.config/mackup/.config/nvim/lua/modules/configs/tool/which-key.lua @@ -0,0 +1,75 @@ +return function() + local icons = { + ui = require("modules.utils.icons").get("ui"), + misc = require("modules.utils.icons").get("misc"), + git = require("modules.utils.icons").get("git", true), + cmp = require("modules.utils.icons").get("cmp", true), + } + + require("modules.utils").load_plugin("which-key", { + preset = "classic", + delay = vim.o.timeoutlen, + triggers = { + { "", mode = "nixso" }, + }, + plugins = { + marks = true, + registers = true, + spelling = { + enabled = true, + suggestions = 20, + }, + presets = { + motions = false, + operators = false, + text_objects = true, + windows = true, + nav = true, + z = true, + g = true, + }, + }, + win = { + border = "none", + padding = { 1, 2 }, + wo = { winblend = 0 }, + }, + expand = 1, + icons = { + group = "", + rules = false, + colors = false, + breadcrumb = icons.ui.Separator, + separator = icons.misc.Vbar, + keys = { + C = "C-", + M = "A-", + S = "S-", + BS = " ", + CR = " ", + NL = " ", + Esc = " ", + Tab = " ", + Up = " ", + Down = " ", + Left = " ", + Right = " ", + Space = " ", + ScrollWheelUp = " ", + ScrollWheelDown = " ", + }, + }, + spec = { + { "g", group = icons.git.Git .. "Git" }, + { "d", group = icons.ui.Bug .. " Debug" }, + { "s", group = icons.cmp.tmux .. "Session" }, + { "b", group = icons.ui.Buffer .. " Buffer" }, + { "S", group = icons.ui.Search .. " Search" }, + { "W", group = icons.ui.Window .. " Window" }, + { "p", group = icons.ui.Package .. " Package" }, + { "l", group = icons.misc.LspAvailable .. " Lsp" }, + { "f", group = icons.ui.Telescope .. " Fuzzy Find" }, + { "n", group = icons.ui.FolderOpen .. " Nvim Tree" }, + }, + }) +end diff --git a/.config/mackup/.config/nvim/lua/modules/configs/tool/wilder.lua b/.config/mackup/.config/nvim/lua/modules/configs/tool/wilder.lua new file mode 100644 index 0000000..45105b3 --- /dev/null +++ b/.config/mackup/.config/nvim/lua/modules/configs/tool/wilder.lua @@ -0,0 +1,65 @@ +return function() + local wilder = require("wilder") + local icons = { ui = require("modules.utils.icons").get("ui") } + + wilder.set_option("use_python_remote_plugin", 0) + wilder.set_option("pipeline", { + wilder.branch( + wilder.cmdline_pipeline({ use_python = 0, fuzzy = 1, fuzzy_filter = wilder.lua_fzy_filter() }), + wilder.vim_search_pipeline(), + { + wilder.check(function(_, x) + return x == "" + end), + wilder.history(), + wilder.result({ + draw = { + function(_, x) + return icons.ui.Calendar .. " " .. x + end, + }, + }), + } + ), + }) + + local popupmenu_renderer = wilder.popupmenu_renderer(wilder.popupmenu_border_theme({ + border = "rounded", + highlights = { + default = "Pmenu", + border = "PmenuBorder", -- highlight to use for the border + accent = wilder.make_hl("WilderAccent", "CmpItemAbbr", "CmpItemAbbrMatch"), + }, + empty_message = wilder.popupmenu_empty_message_with_spinner(), + highlighter = wilder.lua_fzy_highlighter(), + left = { + " ", + wilder.popupmenu_devicons(), + wilder.popupmenu_buffer_flags({ + flags = " a + ", + icons = { ["+"] = icons.ui.Pencil, a = icons.ui.Indicator, h = icons.ui.File }, + }), + }, + right = { + " ", + wilder.popupmenu_scrollbar(), + }, + })) + local wildmenu_renderer = wilder.wildmenu_renderer({ + apply_incsearch_fix = false, + highlighter = wilder.lua_fzy_highlighter(), + separator = " | ", + left = { " ", wilder.wildmenu_spinner(), " " }, + right = { " ", wilder.wildmenu_index() }, + }) + wilder.set_option( + "renderer", + wilder.renderer_mux({ + [":"] = popupmenu_renderer, + ["/"] = wildmenu_renderer, + substitute = wildmenu_renderer, + }) + ) + + require("modules.utils").load_plugin("wilder", { modes = { ":", "/", "?" } }) +end diff --git a/.config/mackup/.config/nvim/lua/modules/configs/ui/alpha.lua b/.config/mackup/.config/nvim/lua/modules/configs/ui/alpha.lua new file mode 100644 index 0000000..befcbd2 --- /dev/null +++ b/.config/mackup/.config/nvim/lua/modules/configs/ui/alpha.lua @@ -0,0 +1,138 @@ +return function() + local dashboard = require("alpha.themes.dashboard") + require("modules.utils").gen_alpha_hl() + + dashboard.section.header.val = require("core.settings").dashboard_image + dashboard.section.header.opts.hl = "AlphaHeader" + + local function button(sc, txt, leader_txt, keybind, keybind_opts) + local sc_after = sc:gsub("%s", ""):gsub(leader_txt, "") + + local opts = { + position = "center", + shortcut = sc, + cursor = 5, + width = 50, + align_shortcut = "right", + hl = "AlphaButtons", + hl_shortcut = "AlphaShortcut", + } + + if nil == keybind then + keybind = sc_after + end + keybind_opts = vim.F.if_nil(keybind_opts, { noremap = true, silent = true, nowait = true }) + opts.keymap = { "n", sc_after, keybind, keybind_opts } + + local function on_press() + -- local key = vim.api.nvim_replace_termcodes(keybind .. '', true, false, true) + local key = vim.api.nvim_replace_termcodes(sc_after .. "", true, false, true) + vim.api.nvim_feedkeys(key, "t", false) + end + + return { + type = "button", + val = txt, + on_press = on_press, + opts = opts, + } + end + + local leader = " " + local icons = { + documents = require("modules.utils.icons").get("documents", true), + git = require("modules.utils.icons").get("git", true), + ui = require("modules.utils.icons").get("ui", true), + misc = require("modules.utils.icons").get("misc", true), + } + + dashboard.section.buttons.val = { + button( + "space f c", + icons.misc.Neovim .. "Telescope collections", + leader, + nil, + { noremap = true, silent = true, nowait = true } + ), + button( + "space f f", + icons.documents.FileFind .. "Find files", + leader, + nil, + { noremap = true, silent = true, nowait = true } + ), + button( + "space f d", + icons.ui.FolderWithHeart .. "Retrieve dossiers", + leader, + nil, + { noremap = true, silent = true, nowait = true } + ), + button( + "space f p", + icons.documents.Word .. "Find patterns", + leader, + nil, + { noremap = true, silent = true, nowait = true } + ), + button( + "space f g", + icons.git.Git .. "Locate Git objects", + leader, + nil, + { noremap = true, silent = true, nowait = true } + ), + button( + "space f m", + icons.misc.Ghost .. "Miscellaneous artifacts", + leader, + nil, + { noremap = true, silent = true, nowait = true } + ), + } + dashboard.section.buttons.opts.hl = "AlphaButtons" + + local function footer() + local stats = require("lazy").stats() + local ms = (math.floor(stats.startuptime * 100 + 0.5) / 100) + return "  Have Fun with neovim" + .. " 󰀨 v" + .. vim.version().major + .. "." + .. vim.version().minor + .. "." + .. vim.version().patch + .. " 󰂖 " + .. stats.count + .. " plugins in " + .. ms + .. "ms" + end + + dashboard.section.footer.val = footer() + dashboard.section.footer.opts.hl = "AlphaFooter" + + local head_butt_padding = 2 + local occu_height = #dashboard.section.header.val + 2 * #dashboard.section.buttons.val + head_butt_padding + local header_padding = math.max(0, math.ceil((vim.fn.winheight(0) - occu_height) * 0.25)) + local foot_butt_padding = 1 + + dashboard.config.layout = { + { type = "padding", val = header_padding }, + dashboard.section.header, + { type = "padding", val = head_butt_padding }, + dashboard.section.buttons, + { type = "padding", val = foot_butt_padding }, + dashboard.section.footer, + } + + require("modules.utils").load_plugin("alpha", dashboard.opts) + + vim.api.nvim_create_autocmd("User", { + pattern = "LazyVimStarted", + callback = function() + dashboard.section.footer.val = footer() + pcall(vim.cmd.AlphaRedraw) + end, + }) +end diff --git a/.config/mackup/.config/nvim/lua/modules/configs/ui/bufferline.lua b/.config/mackup/.config/nvim/lua/modules/configs/ui/bufferline.lua new file mode 100644 index 0000000..5898e18 --- /dev/null +++ b/.config/mackup/.config/nvim/lua/modules/configs/ui/bufferline.lua @@ -0,0 +1,73 @@ +return function() + local icons = { ui = require("modules.utils.icons").get("ui") } + + local opts = { + options = { + number = nil, + close_command = "BufDel! %d", + right_mouse_command = "BufDel! %d", + modified_icon = icons.ui.Modified, + buffer_close_icon = icons.ui.Close, + left_trunc_marker = icons.ui.Left, + right_trunc_marker = icons.ui.Right, + max_name_length = 20, + max_prefix_length = 13, + tab_size = 20, + color_icons = true, + show_buffer_icons = true, + show_buffer_close_icons = true, + show_close_icon = true, + show_tab_indicators = true, + enforce_regular_tabs = false, + persist_buffer_sort = true, + always_show_bufferline = true, + separator_style = "thin", + diagnostics = "nvim_lsp", + diagnostics_indicator = function(count) + return "(" .. count .. ")" + end, + offsets = { + { + filetype = "NvimTree", + text = "File Explorer", + text_align = "center", + padding = 0, + }, + { + filetype = "trouble", + text = "LSP Outline", + text_align = "center", + padding = 0, + }, + }, + }, + -- Change bufferline's highlights here! See `:h bufferline-highlights` for detailed explanation. + -- Note: If you use catppuccin then modify the colors below! + highlights = {}, + } + + if vim.g.colors_name:find("catppuccin") then + local cp = require("modules.utils").get_palette() -- Get the palette. + + local catppuccin_hl_overwrite = { + highlights = require("catppuccin.groups.integrations.bufferline").get({ + styles = { "italic", "bold" }, + custom = { + all = { + -- Hint + hint = { fg = cp.rosewater }, + hint_visible = { fg = cp.rosewater }, + hint_selected = { fg = cp.rosewater }, + hint_diagnostic = { fg = cp.rosewater }, + hint_diagnostic_visible = { fg = cp.rosewater }, + hint_diagnostic_selected = { fg = cp.rosewater }, + }, + }, + }), + } + + opts = vim.tbl_deep_extend("force", opts, catppuccin_hl_overwrite) + end + + require("modules.utils").load_plugin("bufferline", opts) +end diff --git a/.config/mackup/.config/nvim/lua/modules/configs/ui/catppuccin.lua b/.config/mackup/.config/nvim/lua/modules/configs/ui/catppuccin.lua new file mode 100644 index 0000000..231a494 --- /dev/null +++ b/.config/mackup/.config/nvim/lua/modules/configs/ui/catppuccin.lua @@ -0,0 +1,160 @@ +return function() + local transparent_background = require("core.settings").transparent_background + local clear = {} + + require("modules.utils").load_plugin("catppuccin", { + background = { light = "latte", dark = "mocha" }, -- latte, frappe, macchiato, mocha + dim_inactive = { + enabled = false, + -- Dim inactive splits/windows/buffers. + -- NOT recommended if you use old palette (a.k.a., mocha). + shade = "dark", + percentage = 0.15, + }, + transparent_background = transparent_background, + show_end_of_buffer = false, -- show the '~' characters after the end of buffers + term_colors = true, + compile_path = vim.fn.stdpath("cache") .. "/catppuccin", + styles = { + comments = { "italic" }, + functions = { "bold" }, + keywords = { "italic" }, + operators = { "bold" }, + conditionals = { "bold" }, + loops = { "bold" }, + booleans = { "bold", "italic" }, + numbers = {}, + types = {}, + strings = {}, + variables = {}, + properties = {}, + }, + integrations = { + cmp = true, + dap = true, + dap_ui = true, + diffview = true, + dropbar = { enabled = true, color_mode = true }, + fidget = true, + flash = true, + fzf = true, + gitsigns = true, + grug_far = true, + hop = true, + indent_blankline = { enabled = true, colored_indent_levels = true }, + lsp_saga = true, + lsp_trouble = true, + markdown = true, + mason = true, + mini = { enabled = true, indentscope_color = "" }, + native_lsp = { + enabled = true, + virtual_text = { + errors = { "italic" }, + hints = { "italic" }, + warnings = { "italic" }, + information = { "italic" }, + }, + underlines = { + errors = { "underline" }, + hints = { "underline" }, + warnings = { "underline" }, + information = { "underline" }, + }, + }, + notify = true, + nvimtree = true, + rainbow_delimiters = true, + render_markdown = true, + semantic_tokens = true, + telescope = { enabled = true, style = "nvchad" }, + treesitter = true, + treesitter_context = true, + which_key = true, + }, + color_overrides = {}, + highlight_overrides = { + ---@param cp palette + all = function(cp) + return { + -- For base configs + NormalFloat = { fg = cp.text, bg = transparent_background and cp.none or cp.mantle }, + FloatBorder = { + fg = transparent_background and cp.blue or cp.mantle, + bg = transparent_background and cp.none or cp.mantle, + }, + CursorLineNr = { fg = cp.green }, + + -- For native lsp configs + DiagnosticVirtualTextError = { bg = cp.none }, + DiagnosticVirtualTextWarn = { bg = cp.none }, + DiagnosticVirtualTextInfo = { bg = cp.none }, + DiagnosticVirtualTextHint = { bg = cp.none }, + LspInfoBorder = { link = "FloatBorder" }, + + -- For mason.nvim + MasonNormal = { link = "NormalFloat" }, + + -- For indent-blankline + IblIndent = { fg = cp.surface0 }, + IblScope = { fg = cp.surface2, style = { "bold" } }, + + -- For nvim-cmp and wilder.nvim + Pmenu = { fg = cp.overlay2, bg = transparent_background and cp.none or cp.base }, + PmenuBorder = { fg = cp.surface1, bg = transparent_background and cp.none or cp.base }, + PmenuSel = { bg = cp.green, fg = cp.base }, + CmpItemAbbr = { fg = cp.overlay2 }, + CmpItemAbbrMatch = { fg = cp.blue, style = { "bold" } }, + CmpDoc = { link = "NormalFloat" }, + CmpDocBorder = { + fg = transparent_background and cp.surface1 or cp.mantle, + bg = transparent_background and cp.none or cp.mantle, + }, + + -- For fidget + FidgetTask = { bg = cp.none, fg = cp.surface2 }, + FidgetTitle = { fg = cp.blue, style = { "bold" } }, + + -- For nvim-notify + NotifyBackground = { bg = cp.base }, + + -- For nvim-tree + NvimTreeRootFolder = { fg = cp.pink }, + NvimTreeIndentMarker = { fg = cp.surface2 }, + + -- For trouble.nvim + TroubleNormal = { bg = transparent_background and cp.none or cp.base }, + TroubleNormalNC = { bg = transparent_background and cp.none or cp.base }, + + -- For telescope.nvim + TelescopeMatching = { fg = cp.lavender }, + TelescopeResultsDiffAdd = { fg = cp.green }, + TelescopeResultsDiffChange = { fg = cp.yellow }, + TelescopeResultsDiffDelete = { fg = cp.red }, + + -- For glance.nvim + GlanceWinBarFilename = { fg = cp.subtext1, style = { "bold" } }, + GlanceWinBarFilepath = { fg = cp.subtext0, style = { "italic" } }, + GlanceWinBarTitle = { fg = cp.teal, style = { "bold" } }, + GlanceListCount = { fg = cp.lavender }, + GlanceListFilepath = { link = "Comment" }, + GlanceListFilename = { fg = cp.blue }, + GlanceListMatch = { fg = cp.lavender, style = { "bold" } }, + GlanceFoldIcon = { fg = cp.green }, + + -- For nvim-treehopper + TSNodeKey = { + fg = cp.peach, + bg = transparent_background and cp.none or cp.base, + style = { "bold", "underline" }, + }, + + -- For treesitter + ["@keyword.return"] = { fg = cp.pink, style = clear }, + ["@error.c"] = { fg = cp.none, style = clear }, + ["@error.cpp"] = { fg = cp.none, style = clear }, + } + end, + }, + }) +end diff --git a/.config/mackup/.config/nvim/lua/modules/configs/ui/edgy.lua b/.config/mackup/.config/nvim/lua/modules/configs/ui/edgy.lua new file mode 100644 index 0000000..823428a --- /dev/null +++ b/.config/mackup/.config/nvim/lua/modules/configs/ui/edgy.lua @@ -0,0 +1,76 @@ +return function() + local trouble_filter = function(position) + return function(_, win) + return vim.w[win].trouble + and vim.w[win].trouble.position == position + and vim.w[win].trouble.type == "split" + and vim.w[win].trouble.relative == "editor" + and not vim.w[win].trouble_preview + end + end + + require("modules.utils").load_plugin("edgy", { + close_when_all_hidden = true, + exit_when_last = true, + wo = { winbar = false }, + keys = { + ["q"] = false, + ["Q"] = false, + [""] = false, + [""] = function(win) + win:resize("height", -2) + end, + [""] = function(win) + win:resize("height", 2) + end, + [""] = function(win) + win:resize("width", -2) + end, + [""] = function(win) + win:resize("width", 2) + end, + }, + bottom = { + { ft = "qf", size = { height = 0.3 } }, + { + ft = "toggleterm", + size = { height = 0.3 }, + filter = function(_, win) + return vim.w[win].relative == "" + end, + }, + { + ft = "help", + size = { height = 0.3 }, + filter = function(buf) + return vim.bo[buf].buftype == "help" + end, + }, + }, + left = { + { + ft = "NvimTree", + pinned = true, + open = "NvimTreeOpen", + size = { width = 30 }, + }, + }, + right = { + { + ft = "trouble", + pinned = true, + size = { height = 0.6, width = 0.3 }, + open = "Trouble symbols toggle win.position=right", + filter = trouble_filter("right"), + }, + { + ft = "trouble", + pinned = true, + collapsed = true, + size = { height = 0.4, width = 0.3 }, + open = "Trouble lsp toggle win.position=right", + filter = trouble_filter("right"), + }, + }, + }) +end diff --git a/.config/mackup/.config/nvim/lua/modules/configs/ui/fidget.lua b/.config/mackup/.config/nvim/lua/modules/configs/ui/fidget.lua new file mode 100644 index 0000000..ee920a3 --- /dev/null +++ b/.config/mackup/.config/nvim/lua/modules/configs/ui/fidget.lua @@ -0,0 +1,25 @@ +return function() + local icons = { + ui = require("modules.utils.icons").get("ui"), + } + + require("modules.utils").load_plugin("fidget", { + progress = { + suppress_on_insert = false, -- Suppress new messages while in insert mode + ignore_done_already = false, -- Ignore new tasks that are already complete + ignore = { "null-ls" }, -- List of LSP servers to ignore + display = { + render_limit = 5, -- How many LSP messages to show at once + done_ttl = 2, -- How long a message should persist after completion + done_icon = icons.ui.Accepted, -- Icon shown when all LSP progress tasks are complete + }, + }, + notification = { + override_vim_notify = false, -- Automatically override vim.notify() with Fidget + window = { + winblend = 0, -- Background color opacity in the notification window + zindex = 75, -- Stacking priority of the notification window + }, + }, + }) +end diff --git a/.config/mackup/.config/nvim/lua/modules/configs/ui/gitsigns.lua b/.config/mackup/.config/nvim/lua/modules/configs/ui/gitsigns.lua new file mode 100644 index 0000000..de14cd5 --- /dev/null +++ b/.config/mackup/.config/nvim/lua/modules/configs/ui/gitsigns.lua @@ -0,0 +1,23 @@ +return function() + local mapping = require("keymap.ui") + require("modules.utils").load_plugin("gitsigns", { + signs = { + add = { text = "┃" }, + change = { text = "┃" }, + delete = { text = "_" }, + topdelete = { text = "‾" }, + changedelete = { text = "~" }, + untracked = { text = "┆" }, + }, + auto_attach = true, + on_attach = mapping.gitsigns, + signcolumn = true, + sign_priority = 6, + update_debounce = 100, + word_diff = false, + current_line_blame = true, + diff_opts = { internal = true }, + watch_gitdir = { follow_files = true }, + current_line_blame_opts = { delay = 1000, virt_text = true, virtual_text_pos = "eol" }, + }) +end diff --git a/.config/mackup/.config/nvim/lua/modules/configs/ui/indent-blankline.lua b/.config/mackup/.config/nvim/lua/modules/configs/ui/indent-blankline.lua new file mode 100644 index 0000000..169a56f --- /dev/null +++ b/.config/mackup/.config/nvim/lua/modules/configs/ui/indent-blankline.lua @@ -0,0 +1,578 @@ +return function() + -- This list delineates the per-language nodes used for guiding |ibl| in highlighting the current scope + -- It is extracted from each language's `indents.scm` file + -- NOTE: Only a subset of the supported programming languages is included + -- If your preferred language isn't listed, you can add it to the user config + local nodes = { + bibtex = { + "entry", + }, + c = { + "case_statement", + "compound_literal_expression", + "enumerator_list", + "field_declaration_list", + "initializer_list", + "init_declarator", + }, + cmake = { + "block_def", + "foreach_loop", + "function_def", + "if_condition", + "macro_def", + "normal_command", + "while_loop", + }, + cpp = { + "case_statement", + "compound_literal_expression", + "condition_clause", + "enumerator_list", + "field_declaration_list", + "field_initializer_list", + "init_declarator", + "initializer_list", + "namespace_definition", + }, + css = { + "block", + "declaration", + }, + d = { + "aggregate_body", + "block_statement", + "case_statement", + "expression_statement", + "function_body", + "parameters", + "scope_statement", + "template_parameters", + }, + dart = { + "arguments", + "class_body", + "formal_parameter", + "formal_parameter_list", + "function_body", + "function_expression_body", + "initializers", + "list_literal", + "return_statement", + "switch_block", + }, + dot = { + "block", + "attr_list", + }, + ecma = { + "arguments", + "array", + "binary_expression", + "call_expression", + "class_body", + "export_clause", + "formal_parameters", + "named_imports", + "object", + "object_pattern", + "parenthesized_expression", + "return_statement", + "switch_case", + "switch_default", + "switch_statement", + "template_substitution", + "ternary_expression", + }, + elixir = { + "arguments", + "block", + "do_block", + "list", + "map", + "tuple", + }, + firrtl = { + "memory", + }, + fortran = { + "derived_type_definition", + "do_loop_statement", + "enum", + "function", + "if_statement", + "module", + "program", + "subroutine", + "where_statement", + }, + gleam = { + "anonymous_function", + "assert", + "case", + "constant", + "external_function", + "function", + "import", + "let", + "list", + "constant", + "function", + "type_definition", + "type_alias", + "todo", + "tuple", + }, + go = { + "call_expression", + "communication_case", + "const_declaration", + "default_case", + "expression_case", + "import_declaration", + "literal_value", + "parameter_list", + "struct_type", + "type_case", + "type_declaration", + "var_declaration", + }, + html = { + "start_tag", + "self_closing_tag", + }, + java = { + "annotation_argument_list", + "annotation_type_body", + "argument_list", + "array_initializer", + "class_body", + "constructor_body", + "element_value_array_initializer", + "enum_body", + "formal_parameters", + "interface_body", + "method_invocation", + "switch_block", + }, + javascript = { + "arguments", + "array", + "binary_expression", + "call_expression", + "class_body", + "export_clause", + "formal_parameters", + "jsx_expression", + "jsx_self_closing_element", + "named_imports", + "object", + "object_pattern", + "parenthesized_expression", + "return_statement", + "switch_case", + "switch_default", + "switch_statement", + "template_substitution", + "ternary_expression", + }, + julia = { + "assignment", + "call_expression", + "compound_statement", + "comprehension_expression", + "for_binding", + "if_statement", + "matrix_expression", + "parenthesized_expression", + "struct_definition", + "tuple_expression", + "vector_expression", + }, + just = { + "external_command", + "recipe", + "string", + }, + linkerscript = { + "memory_command", + "output_section", + "phdrs_command", + "sections_command", + }, + lua = { + "arguments", + "field", + "method_index_expression", + "return_statement", + "table_constructor", + }, + matlab = { + "class_definition", + "enumeration", + "events", + "for_statement", + "if_statement", + "methods", + "properties", + "switch_statement", + "try_statement", + "while_statement", + }, + ninja = { + "build", + "pool", + "rule", + }, + ocaml = { + "application_expression", + "do_clause", + "external", + "field_expression", + "if_expression", + "list_expression", + "parenthesized_expression", + "record_declaration", + "record_expression", + "try_expression", + "type_binding", + "value_specification", + }, + pascal = { + "arrInitializer", + "block", + "declArgs", + "declClass", + "declConsts", + "declProc", + "declTypes", + "declUses", + "declVars", + "defaultValue", + "exprArgs", + "exprBrackets", + "exprParens", + "exprSubscript", + "recInitializer", + "statement", + }, + php = { + "arguments", + "array_creation_expression", + "binary_expression", + "case_statement", + "compound_statement", + "declaration_list", + "default_statement", + "enum_declaration_list", + "formal_parameters", + "match_block", + "member_call_expression", + "parenthesized_expression", + "return_statement", + "switch_block", + }, + python = { + "binary_operator", + "case_clause", + "concatenated_string", + "for_statement", + "generator_expression", + "if_statement", + "import_from_statement", + "lambda", + "list_pattern", + "match_statement", + "parenthesized_expression", + "try_statement", + "tuple_pattern", + "while_statement", + "with_statement", + }, + query = { + "list", + "predicate", + }, + r = { + "brace_list", + "call", + "paren_list", + "pipe", + "special", + }, + readline = { + "conditional_construct", + }, + ruby = { + "argument_list", + "array", + "assignment", + "begin", + "call", + "case", + "for", + "hash", + "if", + "module", + "parenthesized_statements", + "singleton_class", + "singleton_method", + "unless", + "until", + "while", + }, + rust = { + "arguments", + "array_expression", + "assignment_expression", + "call_expression", + "enum_variant_list", + "field_declaration_list", + "macro_definition", + "match_block", + "mod_item", + "ordered_field_declaration_list", + "parameters", + "struct_expression", + "struct_pattern", + "token_repetition", + "token_tree", + "trait_item", + "tuple_expression", + "tuple_pattern", + "tuple_struct_pattern", + "tuple_type", + "use_list", + "where_clause", + }, + scss = { + "block", + "declaration", + "each_statement", + "mixin_statement", + "while_statement", + }, + sql = { + "case", + "column_definitions", + "cte", + "insert", + "select", + "subquery", + "when_clause", + }, + ssh_config = { + "host_declaration", + "match_declaration", + }, + swift = { + "array_literal", + "array_type", + "assignment", + "call_expression", + "class_body", + "computed_getter", + "computed_property", + "computed_setter", + "control_transfer_statement", + "deinit_declaration", + "dictionary_literal", + "dictionary_type", + "didset_clause", + "enum_class_body", + "init_declaration", + "lambda_literal", + "protocol_body", + "subscript_declaration", + "tuple_expression", + "tuple_type", + "type_parameters", + "willset_clause", + "willset_didset_block", + }, + tablegen = { + "assert", + "value_suffix", + }, + tcl = { + "braced_word_simple", + "command", + "command_substitution", + "conditional", + "foreach", + "namespace", + "procedure", + "try", + "while", + }, + teal = { + "record_declaration", + "function_body", + "table_constructor", + "return_statement", + "while_statement", + }, + terraform = { + "block", + "function_call", + "object", + "tuple", + }, + textproto = { + "message_list", + "message_value", + "scalar_list", + }, + toml = { + "array", + "inline_table", + }, + typescript = { + "arguments", + "array", + "binary_expression", + "call_expression", + "class_body", + "enum_declaration", + "export_clause", + "formal_parameters", + "interface_declaration", + "named_imports", + "object", + "object_pattern", + "object_type", + "parenthesized_expression", + "return_statement", + "switch_case", + "switch_default", + "switch_statement", + "template_substitution", + "ternary_expression", + }, + vue = { + "start_tag", + }, + xml = { + "element", + }, + zig = { + "Block", + "ContainerDecl", + "InitList", + "SwitchExpr", + }, + } + + require("modules.utils").load_plugin("ibl", { + enabled = true, + debounce = 200, + indent = { + char = "│", + tab_char = "│", + smart_indent_cap = true, + priority = 2, + }, + whitespace = { remove_blankline_trail = true }, + -- Note: The `scope` field requires treesitter to be set up + scope = { + enabled = true, + char = "┃", + show_start = false, + show_end = false, + injected_languages = true, + priority = 1000, + include = { + node_type = { + angular = nodes.html, + arduino = nodes.cpp, + astro = nodes.html, + bibtex = nodes.bibtex, + c = nodes.c, + cmake = nodes.cmake, + cpp = nodes.cpp, + css = nodes.css, + cuda = nodes.cpp, + d = nodes.d, + dart = nodes.dart, + dot = nodes.dot, + ecma = nodes.ecma, + elixir = nodes.elixir, + firrtl = nodes.firrtl, + fortran = nodes.fortran, + glsl = nodes.c, + gleam = nodes.gleam, + go = nodes.go, + hlsl = nodes.cpp, + html = nodes.html, + java = nodes.java, + javascript = nodes.javascript, + julia = nodes.julia, + just = nodes.just, + linkerscript = nodes.linkerscript, + lua = nodes.lua, + luau = nodes.lua, + matlab = nodes.matlab, + ninja = nodes.ninja, + objc = nodes.c, + ocaml = nodes.ocaml, + ocaml_interface = nodes.ocaml, + pascal = nodes.pascal, + php = nodes.php, + python = nodes.python, + query = nodes.query, + r = nodes.r, + readline = nodes.readline, + ruby = nodes.ruby, + rust = nodes.rust, + scss = nodes.scss, + sql = nodes.sql, + ssh_config = nodes.ssh_config, + swift = nodes.swift, + tablegen = nodes.tablegen, + tcl = nodes.tcl, + teal = nodes.teal, + terraform = nodes.terraform, + textproto = nodes.textproto, + toml = nodes.toml, + typescript = nodes.typescript, + vue = nodes.vue, + xml = nodes.xml, + zig = nodes.zig, + }, + }, + }, + exclude = { + buftypes = { + "help", + "nofile", + "prompt", + "quickfix", + "terminal", + }, + filetypes = { + "", -- for all buffers without a file type + "alpha", + "bigfile", + "checkhealth", + "dap-repl", + "diff", + "fugitive", + "fugitiveblame", + "git", + "gitcommit", + "help", + "log", + "markdown", + "notify", + "NvimTree", + "Outline", + "qf", + "TelescopePrompt", + "text", + "toggleterm", + "undotree", + "vimwiki", + }, + }, + }) +end diff --git a/.config/mackup/.config/nvim/lua/modules/configs/ui/lualine.lua b/.config/mackup/.config/nvim/lua/modules/configs/ui/lualine.lua new file mode 100644 index 0000000..5d6be24 --- /dev/null +++ b/.config/mackup/.config/nvim/lua/modules/configs/ui/lualine.lua @@ -0,0 +1,348 @@ +return function() + local has_catppuccin = vim.g.colors_name:find("catppuccin") ~= nil + local colors = require("modules.utils").get_palette() + local icons = { + diagnostics = require("modules.utils.icons").get("diagnostics", true), + git = require("modules.utils.icons").get("git", true), + git_nosep = require("modules.utils.icons").get("git"), + misc = require("modules.utils.icons").get("misc", true), + ui = require("modules.utils.icons").get("ui", true), + } + + local function custom_theme() + vim.api.nvim_create_autocmd("ColorScheme", { + group = vim.api.nvim_create_augroup("LualineColorScheme", { clear = true }), + pattern = "*", + callback = function() + has_catppuccin = vim.g.colors_name:find("catppuccin") ~= nil + require("lualine").setup({ options = { theme = custom_theme() } }) + end, + }) + + if has_catppuccin then + colors = require("modules.utils").get_palette() + local universal_bg = require("core.settings").transparent_background and "NONE" or colors.mantle + return { + normal = { + a = { fg = colors.lavender, bg = colors.surface0, gui = "bold" }, + b = { fg = colors.text, bg = universal_bg }, + c = { fg = colors.text, bg = universal_bg }, + }, + command = { + a = { fg = colors.peach, bg = colors.surface0, gui = "bold" }, + }, + insert = { + a = { fg = colors.green, bg = colors.surface0, gui = "bold" }, + }, + visual = { + a = { fg = colors.flamingo, bg = colors.surface0, gui = "bold" }, + }, + terminal = { + a = { fg = colors.teal, bg = colors.surface0, gui = "bold" }, + }, + replace = { + a = { fg = colors.red, bg = colors.surface0, gui = "bold" }, + }, + inactive = { + a = { fg = colors.subtext0, bg = universal_bg, gui = "bold" }, + b = { fg = colors.subtext0, bg = universal_bg }, + c = { fg = colors.subtext0, bg = universal_bg }, + }, + } + else + return "auto" + end + end + + local conditionals = { + has_enough_room = function() + return vim.o.columns > 100 + end, + has_comp_before = function() + return vim.bo.filetype ~= "" + end, + has_git = function() + local gitdir = vim.fs.find(".git", { + limit = 1, + upward = true, + type = "directory", + path = vim.fn.expand("%:p:h"), + }) + return #gitdir > 0 + end, + } + + ---@class lualine_hlgrp + ---@field fg string + ---@field bg string + ---@field gui string? + local utils = { + force_centering = function() + return "%=" + end, + abbreviate_path = function(path) + local home = require("core.global").home + if path:find(home, 1, true) == 1 then + path = "~" .. path:sub(#home + 1) + end + return path + end, + ---Generate `color` for any component + ---@param fg string @Foreground hl group + ---@param gen_bg boolean @Generate guibg from hl group |StatusLine|? + ---@param special_nobg boolean @Disable guibg for transparent backgrounds? + ---@param bg string? @Background hl group + ---@param gui string? @GUI highlight arguments + ---@return nil|fun():lualine_hlgrp + gen_hl = function(fg, gen_bg, special_nobg, bg, gui) + if has_catppuccin then + return function() + local guifg = colors[fg] + local guibg = gen_bg and require("modules.utils").hl_to_rgb("StatusLine", true, colors.mantle) + or colors[bg] + local nobg = special_nobg and require("core.settings").transparent_background + return { + fg = guifg and guifg or colors.none, + bg = (guibg and not nobg) and guibg or colors.none, + gui = gui and gui or nil, + } + end + else + -- Return `nil` if the theme is user-defined + return nil + end + end, + } + + local function diff_source() + local gitsigns = vim.b.gitsigns_status_dict + if gitsigns then + return { + added = gitsigns.added, + modified = gitsigns.changed, + removed = gitsigns.removed, + } + end + end + + local components = { + separator = { -- use as section separators + function() + return "│" + end, + padding = 0, + color = utils.gen_hl("surface1", true, true), + separator = { left = "", right = "" }, + }, + + file_status = { + function() + local function is_new_file() + local filename = vim.fn.expand("%") + return filename ~= "" and vim.bo.buftype == "" and vim.fn.filereadable(filename) == 0 + end + + local symbols = {} + if vim.bo.modified then + table.insert(symbols, "[+]") + end + if vim.bo.modifiable == false then + table.insert(symbols, "[-]") + end + if vim.bo.readonly == true then + table.insert(symbols, "[RO]") + end + if is_new_file() then + table.insert(symbols, "[New]") + end + return #symbols > 0 and table.concat(symbols, "") or "" + end, + padding = { left = -1, right = 1 }, + cond = conditionals.has_comp_before, + }, + + lsp = { + function() + local buf_ft = vim.bo.filetype + local clients = vim.lsp.get_clients({ bufnr = vim.api.nvim_get_current_buf() }) + local lsp_lists = {} + local available_servers = {} + if next(clients) == nil then + return icons.misc.NoActiveLsp -- No server available + end + for _, client in ipairs(clients) do + local filetypes = client.config.filetypes + local client_name = client.name + if filetypes and vim.fn.index(filetypes, buf_ft) ~= -1 then + -- Avoid adding servers that already exists. + if not lsp_lists[client_name] then + lsp_lists[client_name] = true + table.insert(available_servers, client_name) + end + end + end + return next(available_servers) == nil and icons.misc.NoActiveLsp + or string.format("%s[%s]", icons.misc.LspAvailable, table.concat(available_servers, ", ")) + end, + color = utils.gen_hl("blue", true, true, nil, "bold"), + cond = conditionals.has_enough_room, + }, + + python_venv = { + function() + local function env_cleanup(venv) + if string.find(venv, "/") then + local final_venv = venv + for w in venv:gmatch("([^/]+)") do + final_venv = w + end + venv = final_venv + end + return venv + end + + if vim.bo.filetype == "python" then + local venv = os.getenv("CONDA_DEFAULT_ENV") + if venv then + return icons.misc.PyEnv .. env_cleanup(venv) + end + venv = os.getenv("VIRTUAL_ENV") + if venv then + return icons.misc.PyEnv .. env_cleanup(venv) + end + end + return "" + end, + color = utils.gen_hl("green", true, true), + cond = conditionals.has_enough_room, + }, + + tabwidth = { + function() + return icons.ui.Tab .. vim.bo.tabstop + end, + padding = 1, + }, + + cwd = { + function() + return icons.ui.FolderWithHeart .. utils.abbreviate_path(vim.fs.normalize(vim.fn.getcwd())) + end, + color = utils.gen_hl("subtext0", true, true, nil, "bold"), + }, + + file_location = { + function() + local cursorline = vim.fn.line(".") + local cursorcol = vim.fn.virtcol(".") + local filelines = vim.fn.line("$") + local position + if cursorline == 1 then + position = "Top" + elseif cursorline == filelines then + position = "Bot" + else + position = string.format("%2d%%%%", math.floor(cursorline / filelines * 100)) + end + return string.format("%s · %3d:%-2d", position, cursorline, cursorcol) + end, + }, + } + + require("modules.utils").load_plugin("lualine", { + options = { + icons_enabled = true, + theme = custom_theme(), + disabled_filetypes = { statusline = { "alpha" } }, + component_separators = "", + section_separators = { left = "", right = "" }, + }, + sections = { + lualine_a = { "mode" }, + lualine_b = { + { + "filetype", + colored = true, + icon_only = false, + icon = { align = "left" }, + }, + components.file_status, + vim.tbl_extend("force", components.separator, { + cond = function() + return conditionals.has_git() and conditionals.has_comp_before() + end, + }), + }, + lualine_c = { + { + "branch", + icon = icons.git_nosep.Branch, + color = utils.gen_hl("subtext0", true, true, nil, "bold"), + cond = conditionals.has_git, + }, + { + "diff", + symbols = { + added = icons.git.Add, + modified = icons.git.Mod_alt, + removed = icons.git.Remove, + }, + source = diff_source, + colored = false, + color = utils.gen_hl("subtext0", true, true), + cond = conditionals.has_git, + padding = { right = 1 }, + }, + + { utils.force_centering }, + { + "diagnostics", + sources = { "nvim_diagnostic" }, + sections = { "error", "warn", "info", "hint" }, + symbols = { + error = icons.diagnostics.Error, + warn = icons.diagnostics.Warning, + info = icons.diagnostics.Information, + hint = icons.diagnostics.Hint_alt, + }, + }, + components.lsp, + }, + lualine_x = { + { + "encoding", + show_bomb = true, + fmt = string.upper, + padding = { left = 1 }, + cond = conditionals.has_enough_room, + }, + { + "fileformat", + symbols = { + unix = "LF", + dos = "CRLF", + mac = "CR", -- Legacy macOS + }, + padding = { left = 1 }, + }, + components.tabwidth, + }, + lualine_y = { + components.separator, + components.python_venv, + components.cwd, + }, + lualine_z = { components.file_location }, + }, + inactive_sections = { + lualine_a = {}, + lualine_b = {}, + lualine_c = { "filename" }, + lualine_x = { "location" }, + lualine_y = {}, + lualine_z = {}, + }, + tabline = {}, + extensions = {}, + }) +end diff --git a/.config/mackup/.config/nvim/lua/modules/configs/ui/neoscroll.lua b/.config/mackup/.config/nvim/lua/modules/configs/ui/neoscroll.lua new file mode 100644 index 0000000..9b1ae90 --- /dev/null +++ b/.config/mackup/.config/nvim/lua/modules/configs/ui/neoscroll.lua @@ -0,0 +1,24 @@ +return function() + require("modules.utils").load_plugin("neoscroll", { + -- All these keys will be mapped to their corresponding default scrolling animation + mappings = { + "", + "", + "", + "", + "", + "", + "zt", + "zz", + "zb", + }, + hide_cursor = true, -- Hide cursor while scrolling + stop_eof = true, -- Stop at when scrolling downwards + use_local_scrolloff = false, -- Use the local scope of scrolloff instead of the global scope + respect_scrolloff = false, -- Stop scrolling when the cursor reaches the scrolloff margin of the file + cursor_scrolls_alone = true, -- The cursor will keep on scrolling even if the window cannot scroll further + easing_function = nil, -- Default easing function + pre_hook = nil, -- Function to run before the scrolling animation starts + post_hook = nil, -- Function to run after the scrolling animation ends + }) +end diff --git a/.config/mackup/.config/nvim/lua/modules/configs/ui/notify.lua b/.config/mackup/.config/nvim/lua/modules/configs/ui/notify.lua new file mode 100644 index 0000000..a3dd3b6 --- /dev/null +++ b/.config/mackup/.config/nvim/lua/modules/configs/ui/notify.lua @@ -0,0 +1,41 @@ +return function() + local notify = require("notify") + local icons = { + diagnostics = require("modules.utils.icons").get("diagnostics"), + ui = require("modules.utils.icons").get("ui"), + } + + require("modules.utils").load_plugin("notify", { + ---@usage Animation style one of { "fade", "slide", "fade_in_slide_out", "static" } + stages = "fade", + ---@usage Function called when a new window is opened, use for changing win settings/config + on_open = function(win) + vim.api.nvim_set_option_value("winblend", 0, { scope = "local", win = win }) + vim.api.nvim_win_set_config(win, { zindex = 90 }) + end, + ---@usage Function called when a window is closed + on_close = nil, + ---@usage timeout for notifications in ms, default 5000 + timeout = 2000, + -- @usage User render fps value + fps = 20, + -- Render function for notifications. See notify-render() + render = "default", + ---@usage highlight behind the window for stages that change opacity + background_colour = "NotifyBackground", + ---@usage minimum width for notification windows + minimum_width = 50, + ---@usage notifications with level lower than this would be ignored. [ERROR > WARN > INFO > DEBUG > TRACE] + level = "INFO", + ---@usage Icons for the different levels + icons = { + ERROR = icons.diagnostics.Error, + WARN = icons.diagnostics.Warning, + INFO = icons.diagnostics.Information, + DEBUG = icons.ui.Bug, + TRACE = icons.ui.Pencil, + }, + }) + + vim.notify = notify +end diff --git a/.config/mackup/.config/nvim/lua/modules/configs/ui/paint.lua b/.config/mackup/.config/nvim/lua/modules/configs/ui/paint.lua new file mode 100644 index 0000000..5747cc2 --- /dev/null +++ b/.config/mackup/.config/nvim/lua/modules/configs/ui/paint.lua @@ -0,0 +1,20 @@ +return function() + require("modules.utils").load_plugin("paint", { + ---type PaintHighlight[] + highlights = { + { + -- filter can be a table of buffer options that should match, + -- or a function called with buf as param that should return true. + -- The example below will paint @something in comments with Constant + filter = { filetype = "lua" }, + pattern = "%s*%-%-%-%s*(@%w+)", + hl = "Constant", + }, + { + filter = { filetype = "python" }, + pattern = "%s*([_%w]+:)", + hl = "Constant", + }, + }, + }) +end diff --git a/.config/mackup/.config/nvim/lua/modules/configs/ui/scrollview.lua b/.config/mackup/.config/nvim/lua/modules/configs/ui/scrollview.lua new file mode 100644 index 0000000..ef11b59 --- /dev/null +++ b/.config/mackup/.config/nvim/lua/modules/configs/ui/scrollview.lua @@ -0,0 +1,24 @@ +return function() + local icons = { diagnostics = require("modules.utils.icons").get("diagnostics", true) } + + require("modules.utils").load_plugin("scrollview", { + mode = "virtual", + winblend = 0, + signs_on_startup = { "diagnostics", "folds", "marks", "search", "spell" }, + diagnostics_error_symbol = icons.diagnostics.Error, + diagnostics_warn_symbol = icons.diagnostics.Warning, + diagnostics_info_symbol = icons.diagnostics.Information, + diagnostics_hint_symbol = icons.diagnostics.Hint, + excluded_filetypes = { + "alpha", + "fugitive", + "git", + "notify", + "NvimTree", + "Outline", + "TelescopePrompt", + "toggleterm", + "undotree", + }, + }) +end diff --git a/.config/mackup/.config/nvim/lua/modules/configs/ui/splits.lua b/.config/mackup/.config/nvim/lua/modules/configs/ui/splits.lua new file mode 100644 index 0000000..891d01e --- /dev/null +++ b/.config/mackup/.config/nvim/lua/modules/configs/ui/splits.lua @@ -0,0 +1,14 @@ +return function() + require("modules.utils").load_plugin("smart-splits", { + -- Ignored buffer types (only while resizing) + ignored_buftypes = { + "nofile", + "quickfix", + "prompt", + }, + -- Ignored filetypes (only while resizing) + ignored_filetypes = { "NvimTree" }, + -- the default number of lines/columns to resize by at a time + default_amount = 3, + }) +end diff --git a/.config/mackup/.config/nvim/lua/modules/configs/ui/todo.lua b/.config/mackup/.config/nvim/lua/modules/configs/ui/todo.lua new file mode 100644 index 0000000..ebdef8e --- /dev/null +++ b/.config/mackup/.config/nvim/lua/modules/configs/ui/todo.lua @@ -0,0 +1,58 @@ +return function() + local icons = { + diagnostics = require("modules.utils.icons").get("diagnostics"), + ui = require("modules.utils.icons").get("ui"), + } + + require("modules.utils").load_plugin("todo-comments", { + signs = false, -- show icons in the signs column + keywords = { + FIX = { + icon = icons.ui.Bug, + color = "error", + alt = { "FIXME", "BUG", "FIXIT", "ISSUE" }, + }, + TODO = { icon = icons.ui.Accepted, color = "info" }, + -- HACK = { icon = icons.ui.Fire, color = "warning" }, + WARN = { icon = icons.diagnostics.Warning, color = "warning", alt = { "WARNING", "XXX" } }, + PERF = { icon = icons.ui.Perf, alt = { "OPTIM", "PERFORMANCE", "OPTIMIZE" } }, + NOTE = { icon = icons.ui.Note, color = "hint", alt = { "INFO" } }, + TEST = { icon = icons.ui.Lock, color = "test", alt = { "TESTING", "PASSED", "FAILED" } }, + }, + gui_style = { + fg = "NONE", + bg = "BOLD", + }, + merge_keywords = true, + highlight = { + multiline = false, + keyword = "wide", -- "fg", "bg", "wide", "wide_bg", "wide_fg" or empty. + after = "", + comments_only = true, + max_line_len = 500, + exclude = { + "alpha", + "bigfile", + "checkhealth", + "dap-repl", + "diff", + "help", + "log", + "notify", + "NvimTree", + "Outline", + "qf", + "TelescopePrompt", + "toggleterm", + "undotree", + }, + }, + colors = { + error = { "DiagnosticError", "ErrorMsg", "#DC2626" }, + warning = { "DiagnosticWarn", "WarningMsg", "#FBBF24" }, + info = { "DiagnosticInfo", "#2563EB" }, + hint = { "DiagnosticHint", "#F5C2E7" }, + default = { "Conditional", "#7C3AED" }, + }, + }) +end diff --git a/.config/mackup/.config/nvim/lua/modules/plugins/completion.lua b/.config/mackup/.config/nvim/lua/modules/plugins/completion.lua new file mode 100644 index 0000000..277e3d1 --- /dev/null +++ b/.config/mackup/.config/nvim/lua/modules/plugins/completion.lua @@ -0,0 +1,89 @@ +local completion = {} +local use_copilot = require("core.settings").use_copilot + +completion["neovim/nvim-lspconfig"] = { + lazy = true, + event = { "CursorHold", "CursorHoldI" }, + config = require("completion.lsp"), + dependencies = { + { "williamboman/mason.nvim" }, + { "williamboman/mason-lspconfig.nvim" }, + { "folke/neoconf.nvim" }, + { + "Jint-lzxy/lsp_signature.nvim", + config = require("completion.lsp-signature"), + }, + }, +} +completion["nvimdev/lspsaga.nvim"] = { + lazy = true, + event = "LspAttach", + config = require("completion.lspsaga"), + dependencies = { "nvim-tree/nvim-web-devicons" }, +} +completion["DNLHC/glance.nvim"] = { + lazy = true, + event = "LspAttach", + config = require("completion.glance"), +} +completion["joechrisellis/lsp-format-modifications.nvim"] = { + lazy = true, + event = "LspAttach", +} +completion["nvimtools/none-ls.nvim"] = { + lazy = true, + event = { "CursorHold", "CursorHoldI" }, + config = require("completion.null-ls"), + dependencies = { + "nvim-lua/plenary.nvim", + "jay-babu/mason-null-ls.nvim", + }, +} +completion["hrsh7th/nvim-cmp"] = { + lazy = true, + event = "InsertEnter", + config = require("completion.cmp"), + dependencies = { + { + "L3MON4D3/LuaSnip", + build = "make install_jsregexp", + config = require("completion.luasnip"), + dependencies = { "rafamadriz/friendly-snippets" }, + }, + { "lukas-reineke/cmp-under-comparator" }, + { "saadparwaiz1/cmp_luasnip" }, + { "hrsh7th/cmp-nvim-lsp" }, + { "hrsh7th/cmp-nvim-lua" }, + { "andersevenrud/cmp-tmux" }, + { "hrsh7th/cmp-path" }, + { "f3fora/cmp-spell" }, + { "hrsh7th/cmp-buffer" }, + { "kdheepak/cmp-latex-symbols" }, + { "ray-x/cmp-treesitter", commit = "c8e3a74" }, + -- { "tzachar/cmp-tabnine", build = "./install.sh", config = require("completion.tabnine") }, + -- { + -- "jcdickinson/codeium.nvim", + -- dependencies = { + -- "nvim-lua/plenary.nvim", + -- "MunifTanjim/nui.nvim", + -- }, + -- config = require("completion.codeium"), + -- }, + }, +} +if use_copilot then + completion["zbirenbaum/copilot.lua"] = { + lazy = true, + cmd = "Copilot", + event = "InsertEnter", + config = require("completion.copilot"), + dependencies = { + { + "zbirenbaum/copilot-cmp", + config = require("completion.copilot-cmp"), + }, + }, + } +end + +return completion diff --git a/.config/mackup/.config/nvim/lua/modules/plugins/editor.lua b/.config/mackup/.config/nvim/lua/modules/plugins/editor.lua new file mode 100644 index 0000000..3623525 --- /dev/null +++ b/.config/mackup/.config/nvim/lua/modules/plugins/editor.lua @@ -0,0 +1,129 @@ +local editor = {} + +editor["olimorris/persisted.nvim"] = { + lazy = true, + cmd = { + "SessionToggle", + "SessionStart", + "SessionStop", + "SessionSave", + "SessionLoad", + "SessionLoadLast", + "SessionLoadFromFile", + "SessionDelete", + }, + config = require("editor.persisted"), +} +editor["m4xshen/autoclose.nvim"] = { + lazy = true, + event = "InsertEnter", + config = require("editor.autoclose"), +} +editor["pteroctopus/faster.nvim"] = { + lazy = false, + cond = require("core.settings").load_big_files_faster, +} +editor["ojroques/nvim-bufdel"] = { + lazy = true, + cmd = { "BufDel", "BufDelAll", "BufDelOthers" }, +} +-- NOTE: `flash.nvim` is a powerful plugin that can be used as partial or complete replacements for: +-- > `hop.nvim`, +-- > `wilder.nvim` +-- > `nvim-treehopper` +-- Considering its steep learning curve as well as backward compatibility issues... +-- > We have no plan to remove the above plugins for the time being. +-- But as usual, you can always tweak the plugin to your liking. +editor["folke/flash.nvim"] = { + lazy = true, + event = { "CursorHold", "CursorHoldI" }, + config = require("editor.flash"), +} +editor["numToStr/Comment.nvim"] = { + lazy = true, + event = { "CursorHold", "CursorHoldI" }, + config = require("editor.comment"), +} +editor["sindrets/diffview.nvim"] = { + lazy = true, + cmd = { "DiffviewOpen", "DiffviewClose" }, + config = require("editor.diffview"), +} +editor["echasnovski/mini.align"] = { + lazy = true, + event = { "CursorHold", "CursorHoldI" }, + config = require("editor.align"), +} +editor["echasnovski/mini.cursorword"] = { + lazy = true, + event = { "BufReadPost", "BufAdd", "BufNewFile" }, + config = require("editor.cursorword"), +} +editor["smoka7/hop.nvim"] = { + lazy = true, + version = "*", + event = { "CursorHold", "CursorHoldI" }, + config = require("editor.hop"), +} +editor["brenoprata10/nvim-highlight-colors"] = { + lazy = true, + event = { "CursorHold", "CursorHoldI" }, + config = require("editor.highlight-colors"), +} +editor["romainl/vim-cool"] = { + lazy = true, + event = { "CursorMoved", "InsertEnter" }, +} +editor["lambdalisue/suda.vim"] = { + lazy = true, + cmd = { "SudaRead", "SudaWrite" }, + init = require("editor.suda"), +} +editor["tpope/vim-sleuth"] = { + lazy = true, + event = { "BufNewFile", "BufReadPost", "BufFilePost" }, +} +editor["MagicDuck/grug-far.nvim"] = { + lazy = true, + cmd = "GrugFar", + config = require("editor.grug-far"), +} +---------------------------------------------------------------------- +--  :treesitter related plugins -- +---------------------------------------------------------------------- +editor["nvim-treesitter/nvim-treesitter"] = { + lazy = true, + build = function() + if #vim.api.nvim_list_uis() > 0 then + vim.api.nvim_command([[TSUpdate]]) + end + end, + event = "BufReadPre", + config = require("editor.treesitter"), + dependencies = { + { "mfussenegger/nvim-treehopper" }, + { "nvim-treesitter/nvim-treesitter-textobjects" }, + { + "andymass/vim-matchup", + init = require("editor.matchup"), + }, + { + "windwp/nvim-ts-autotag", + config = require("editor.autotag"), + }, + { + "hiphish/rainbow-delimiters.nvim", + config = require("editor.rainbow_delims"), + }, + { + "nvim-treesitter/nvim-treesitter-context", + config = require("editor.ts-context"), + }, + { + "JoosepAlviste/nvim-ts-context-commentstring", + config = require("editor.ts-context-commentstring"), + }, + }, +} + +return editor diff --git a/.config/mackup/.config/nvim/lua/modules/plugins/lang.lua b/.config/mackup/.config/nvim/lua/modules/plugins/lang.lua new file mode 100644 index 0000000..5b5bc62 --- /dev/null +++ b/.config/mackup/.config/nvim/lua/modules/plugins/lang.lua @@ -0,0 +1,49 @@ +local lang = {} + +lang["kevinhwang91/nvim-bqf"] = { + lazy = true, + ft = "qf", + config = require("lang.bqf"), + dependencies = { + { "junegunn/fzf", build = ":call fzf#install()" }, + }, +} +lang["ray-x/go.nvim"] = { + lazy = true, + ft = { "go", "gomod", "gosum" }, + build = ":GoInstallBinaries", + config = require("lang.go"), + dependencies = { "ray-x/guihua.lua" }, +} +lang["mrcjkb/rustaceanvim"] = { + lazy = true, + ft = "rust", + version = "*", + init = require("lang.rust"), + dependencies = { "nvim-lua/plenary.nvim" }, +} +lang["Saecki/crates.nvim"] = { + lazy = true, + event = "BufReadPost Cargo.toml", + config = require("lang.crates"), + dependencies = { "nvim-lua/plenary.nvim" }, +} +lang["MeanderingProgrammer/render-markdown.nvim"] = { + lazy = true, + ft = "markdown", + config = require("lang.render-markdown"), + dependencies = { + "nvim-tree/nvim-web-devicons", + "nvim-treesitter/nvim-treesitter", + }, +} +lang["iamcco/markdown-preview.nvim"] = { + lazy = true, + ft = "markdown", + build = ":call mkdp#util#install()", +} +lang["chrisbra/csv.vim"] = { + lazy = true, + ft = "csv", +} +return lang diff --git a/.config/mackup/.config/nvim/lua/modules/plugins/tool.lua b/.config/mackup/.config/nvim/lua/modules/plugins/tool.lua new file mode 100644 index 0000000..37be1ed --- /dev/null +++ b/.config/mackup/.config/nvim/lua/modules/plugins/tool.lua @@ -0,0 +1,140 @@ +local tool = {} + +tool["tpope/vim-fugitive"] = { + lazy = true, + cmd = { "Git", "G" }, +} +-- This is specifically for fcitx5 users who code in languages other than English +-- tool["pysan3/fcitx5.nvim"] = { +-- lazy = true, +-- event = "BufReadPost", +-- cond = vim.fn.executable("fcitx5-remote") == 1, +-- config = require("tool.fcitx5"), +-- } +tool["Bekaboo/dropbar.nvim"] = { + lazy = false, + config = require("tool.dropbar"), + dependencies = { + "nvim-tree/nvim-web-devicons", + "nvim-telescope/telescope-fzf-native.nvim", + }, +} +tool["nvim-tree/nvim-tree.lua"] = { + lazy = true, + cmd = { + "NvimTreeToggle", + "NvimTreeOpen", + "NvimTreeFindFile", + "NvimTreeFindFileToggle", + "NvimTreeRefresh", + }, + config = require("tool.nvim-tree"), +} +tool["ibhagwan/smartyank.nvim"] = { + lazy = true, + event = "BufReadPost", + config = require("tool.smartyank"), +} +tool["michaelb/sniprun"] = { + lazy = true, + -- You need to cd to `~/.local/share/nvim/site/lazy/sniprun/` and execute `bash ./install.sh`, + -- if you encountered error about no executable sniprun found. + build = "bash ./install.sh", + cmd = { "SnipRun", "SnipReset", "SnipInfo" }, + config = require("tool.sniprun"), +} +tool["akinsho/toggleterm.nvim"] = { + lazy = true, + cmd = { + "ToggleTerm", + "ToggleTermSetName", + "ToggleTermToggleAll", + "ToggleTermSendVisualLines", + "ToggleTermSendCurrentLine", + "ToggleTermSendVisualSelection", + }, + config = require("tool.toggleterm"), +} +tool["folke/trouble.nvim"] = { + lazy = true, + cmd = { "Trouble", "TroubleToggle", "TroubleRefresh" }, + config = require("tool.trouble"), +} +tool["folke/which-key.nvim"] = { + lazy = true, + event = { "CursorHold", "CursorHoldI" }, + config = require("tool.which-key"), +} +tool["gelguy/wilder.nvim"] = { + lazy = true, + event = "CmdlineEnter", + config = require("tool.wilder"), + dependencies = { "romgrk/fzy-lua-native" }, +} + +---------------------------------------------------------------------- +-- Telescope Plugins -- +---------------------------------------------------------------------- +tool["nvim-telescope/telescope.nvim"] = { + lazy = true, + cmd = "Telescope", + config = require("tool.telescope"), + dependencies = { + { "nvim-lua/plenary.nvim" }, + { "nvim-tree/nvim-web-devicons" }, + { "jvgrootveld/telescope-zoxide" }, + { "debugloop/telescope-undo.nvim" }, + { "nvim-telescope/telescope-frecency.nvim" }, + { "nvim-telescope/telescope-live-grep-args.nvim" }, + { "nvim-telescope/telescope-fzf-native.nvim", build = "make" }, + { + "FabianWirth/search.nvim", + config = require("tool.search"), + }, + { + "ahmedkhalf/project.nvim", + event = { "CursorHold", "CursorHoldI" }, + config = require("tool.project"), + }, + { + "aaronhallaert/advanced-git-search.nvim", + cmd = { "AdvancedGitSearch" }, + dependencies = { + "tpope/vim-rhubarb", + "tpope/vim-fugitive", + "sindrets/diffview.nvim", + }, + }, + }, +} + +---------------------------------------------------------------------- +-- DAP Plugins -- +---------------------------------------------------------------------- +tool["mfussenegger/nvim-dap"] = { + lazy = true, + cmd = { + "DapSetLogLevel", + "DapShowLog", + "DapContinue", + "DapToggleBreakpoint", + "DapToggleRepl", + "DapStepOver", + "DapStepInto", + "DapStepOut", + "DapTerminate", + }, + config = require("tool.dap"), + dependencies = { + { + "rcarriga/nvim-dap-ui", + config = require("tool.dap.dapui"), + dependencies = { + "nvim-neotest/nvim-nio", + }, + }, + { "jay-babu/mason-nvim-dap.nvim" }, + }, +} + +return tool diff --git a/.config/mackup/.config/nvim/lua/modules/plugins/ui.lua b/.config/mackup/.config/nvim/lua/modules/plugins/ui.lua new file mode 100644 index 0000000..6cc6adb --- /dev/null +++ b/.config/mackup/.config/nvim/lua/modules/plugins/ui.lua @@ -0,0 +1,76 @@ +local ui = {} + +ui["goolord/alpha-nvim"] = { + lazy = true, + event = "BufWinEnter", + config = require("ui.alpha"), +} +ui["akinsho/bufferline.nvim"] = { + lazy = true, + event = { "BufReadPre", "BufAdd", "BufNewFile" }, + config = require("ui.bufferline"), +} +ui["folke/edgy.nvim"] = { + lazy = true, + event = { "BufReadPre", "BufAdd", "BufNewFile" }, + config = require("ui.edgy"), +} +ui["Jint-lzxy/nvim"] = { + lazy = false, + branch = "refactor/syntax-highlighting", + name = "catppuccin", + config = require("ui.catppuccin"), +} +ui["j-hui/fidget.nvim"] = { + lazy = true, + event = "LspAttach", + config = require("ui.fidget"), +} +ui["lewis6991/gitsigns.nvim"] = { + lazy = true, + event = { "CursorHold", "CursorHoldI" }, + config = require("ui.gitsigns"), +} +ui["lukas-reineke/indent-blankline.nvim"] = { + lazy = true, + event = { "CursorHold", "CursorHoldI" }, + config = require("ui.indent-blankline"), +} +ui["nvim-lualine/lualine.nvim"] = { + lazy = true, + event = { "BufReadPost", "BufAdd", "BufNewFile" }, + config = require("ui.lualine"), +} +ui["karb94/neoscroll.nvim"] = { + lazy = true, + event = { "CursorHold", "CursorHoldI" }, + config = require("ui.neoscroll"), +} +ui["rcarriga/nvim-notify"] = { + lazy = true, + event = "VeryLazy", + config = require("ui.notify"), +} +ui["folke/paint.nvim"] = { + lazy = true, + event = { "CursorHold", "CursorHoldI" }, + config = require("ui.paint"), +} +ui["mrjones2014/smart-splits.nvim"] = { + lazy = true, + event = { "CursorHoldI", "CursorHold" }, + config = require("ui.splits"), +} +ui["folke/todo-comments.nvim"] = { + lazy = true, + event = { "CursorHold", "CursorHoldI" }, + config = require("ui.todo"), + dependencies = { "nvim-lua/plenary.nvim" }, +} +ui["dstein64/nvim-scrollview"] = { + lazy = true, + event = { "BufReadPost", "BufAdd", "BufNewFile" }, + config = require("ui.scrollview"), +} + +return ui diff --git a/.config/mackup/.config/nvim/lua/modules/utils/dap.lua b/.config/mackup/.config/nvim/lua/modules/utils/dap.lua new file mode 100644 index 0000000..0ea276c --- /dev/null +++ b/.config/mackup/.config/nvim/lua/modules/utils/dap.lua @@ -0,0 +1,32 @@ +local M = {} + +function M.input_args() + local argument_string = vim.fn.input("Program arg(s) (enter nothing to leave it null): ") + return vim.fn.split(argument_string, " ", true) +end + +function M.input_exec_path() + return vim.fn.input('Path to executable (default to "a.out"): ', vim.fn.expand("%:p:h") .. "/a.out", "file") +end + +function M.input_file_path() + return vim.fn.input("Path to debuggee (default to the current file): ", vim.fn.expand("%:p"), "file") +end + +function M.get_env() + local variables = {} + for k, v in pairs(vim.fn.environ()) do + table.insert(variables, string.format("%s=%s", k, v)) + end + return variables +end + +return setmetatable({}, { + __index = function(_, key) + return function() + return function() + return M[key]() + end + end + end, +}) diff --git a/.config/mackup/.config/nvim/lua/modules/utils/icons.lua b/.config/mackup/.config/nvim/lua/modules/utils/icons.lua new file mode 100644 index 0000000..a050401 --- /dev/null +++ b/.config/mackup/.config/nvim/lua/modules/utils/icons.lua @@ -0,0 +1,240 @@ +local icons = {} + +local data = { + kind = { + Break = "󰙧", + Call = "󰃷", + Case = "󰬶", + Class = "󰠱", + Color = "󰏘", + Constant = "󰏿", + Constructor = "", + Continue = "󰞘", + Declaration = "󰙠", + Delete = "󱟁", + Enum = "", + EnumMember = "", + Event = "", + Field = "󰇽", + File = "󰈙", + Folder = "󰉋", + Fragment = "", + Function = "󰊕", + Implementation = "", + Interface = "", + Keyword = "󰌋", + List = "󰅪", + Loop = "󰑖", + Method = "󰆧", + Module = "", + Namespace = "󰌗", + Operator = "󰆕", + Package = "", + Property = "󰜢", + Reference = "", + Regex = "", + Snippet = "", + Statement = "󰅩", + Struct = "", + Switch = "", + Text = "󰉿", + TypeParameter = "󰅲", + Undefined = "", + Unit = "", + Value = "󰎠", + Variable = "", + -- ccls-specific icons + Macro = "", + Parameter = "", + StaticMethod = "", + Terminal = "", + TypeAlias = "", + }, + type = { + Array = "󰅪", + Boolean = "", + Null = "󰟢", + Number = "", + Object = "󰅩", + String = "󰉿", + }, + documents = { + Default = "", + File = "", + Files = "", + FileFind = "󰈞", + FileTree = "󰙅", + Import = "", + Symlink = "", + Word = "", + }, + git = { + Add = "", + Branch = "", + Diff = "", + Git = "󰊢", + Ignore = "", + Mod = "M", + Mod_alt = "", + Remove = "", + Rename = "", + Repo = "", + Unmerged = "󰘬", + Untracked = "󰞋", + Unstaged = "", + Staged = "", + Conflict = "", + }, + ui = { + Accepted = "", + ArrowClosed = "", + ArrowOpen = "", + BigCircle = "", + BigUnfilledCircle = "", + BookMark = "󰃃", + Buffer = "󰓩", + Bug = "", + Calendar = "", + Character = "", + Check = "󰄳", + ChevronRight = "", + Circle = "", + Close = "󰅖", + Close_alt = "", + CloudDownload = "", + CodeAction = "󰌵", + Comment = "󰅺", + Dashboard = "", + DoubleSeparator = "󰄾", + Emoji = "󰱫", + EmptyFolder = "", + EmptyFolderOpen = "", + File = "󰈤", + Fire = "", + Folder = "", + FolderOpen = "", + FolderWithHeart = "󱃪", + Gear = "", + History = "󰄉", + Incoming = "󰏷", + Indicator = "", + Keyboard = "", + Left = "", + List = "", + Lock = "󰍁", + Modified = "✥", + Modified_alt = "", + NewFile = "", + Newspaper = "", + Note = "󰍨", + Outgoing = "󰏻", + Package = "", + Pencil = "󰏫", + Perf = "󰅒", + Play = "", + Project = "", + Right = "", + RootFolderOpened = "", + Search = "󰍉", + Separator = "", + SignIn = "", + SignOut = "", + Sort = "", + Spell = "󰓆", + Square = "", + Symlink = "", + SymlinkFolder = "", + Tab = "", + Table = "", + Telescope = "", + Window = "", + }, + diagnostics = { + Error = "", + Warning = "", + Information = "", + Question = "", + Hint = "󰌵", + -- Hollow version + Error_alt = "󰅚", + Warning_alt = "󰀪", + Information_alt = "", + Question_alt = "", + Hint_alt = "󰌶", + }, + misc = { + Add = "+", + Added = "", + Campass = "󰀹", + Code = "", + Gavel = "", + Ghost = "󰊠", + Glass = "󰂖", + Lego = "", + LspAvailable = "󱜙", + ManUp = "", + Neovim = "", + NoActiveLsp = "󱚧", + PyEnv = "󰢩", + Squirrel = "", + Tag = "", + Tree = "", + Vbar = "│", + Vim = "", + Watch = "", + }, + cmp = { + buffer = "󰉿", + latex_symbols = "", + luasnip = "󰃐", + nvim_lsp = "", + nvim_lua = "", + orgmode = "", + path = "", + spell = "󰓆", + tmux = "", + treesitter = "", + undefined = "", + -- Add source-specific icons here + codeium = "", + Codeium = "", + copilot = "", + copilot_alt = "", + Copilot = "", + Copilot_alt = "", + TabNine = "", + cmp_tabnine = "", + }, + dap = { + Breakpoint = "󰝥", + BreakpointCondition = "󰟃", + BreakpointRejected = "", + LogPoint = "", + Pause = "", + Play = "", + RunLast = "↻", + StepBack = "", + StepInto = "󰆹", + StepOut = "󰆸", + StepOver = "󰆷", + Stopped = "", + Terminate = "󰝤", + }, +} + +---Get a specific icon set. +---@param category "kind"|"type"|"documents"|"git"|"ui"|"diagnostics"|"misc"|"cmp"|"dap" +---@param add_space? boolean @Add trailing whitespace after the icon. +function icons.get(category, add_space) + if add_space then + return setmetatable({}, { + __index = function(_, key) + return data[category][key] .. " " + end, + }) + else + return data[category] + end +end + +return icons diff --git a/.config/mackup/.config/nvim/lua/modules/utils/init.lua b/.config/mackup/.config/nvim/lua/modules/utils/init.lua new file mode 100644 index 0000000..bd69c16 --- /dev/null +++ b/.config/mackup/.config/nvim/lua/modules/utils/init.lua @@ -0,0 +1,387 @@ +local M = {} + +---@class palette +---@field rosewater string +---@field flamingo string +---@field mauve string +---@field pink string +---@field red string +---@field maroon string +---@field peach string +---@field yellow string +---@field green string +---@field sapphire string +---@field blue string +---@field sky string +---@field teal string +---@field lavender string +---@field text string +---@field subtext1 string +---@field subtext0 string +---@field overlay2 string +---@field overlay1 string +---@field overlay0 string +---@field surface2 string +---@field surface1 string +---@field surface0 string +---@field base string +---@field mantle string +---@field crust string +---@field none "NONE" + +---@type nil|palette +local palette = nil + +-- Indicates if autocmd for refreshing the builtin palette has already been registered +---@type boolean +local _has_autocmd = false + +---Initialize the palette +---@return palette +local function init_palette() + -- Reinitialize the palette on event `ColorScheme` + if not _has_autocmd then + _has_autocmd = true + vim.api.nvim_create_autocmd("ColorScheme", { + group = vim.api.nvim_create_augroup("__builtin_palette", { clear = true }), + pattern = "*", + callback = function() + palette = nil + init_palette() + -- Also refresh hard-coded hl groups + M.gen_alpha_hl() + M.gen_lspkind_hl() + pcall(vim.cmd.AlphaRedraw) + end, + }) + end + + if not palette then + palette = (vim.g.colors_name or ""):find("catppuccin") and require("catppuccin.palettes").get_palette() + or { + rosewater = "#DC8A78", + flamingo = "#DD7878", + mauve = "#CBA6F7", + pink = "#F5C2E7", + red = "#E95678", + maroon = "#B33076", + peach = "#FF8700", + yellow = "#F7BB3B", + green = "#AFD700", + sapphire = "#36D0E0", + blue = "#61AFEF", + sky = "#04A5E5", + teal = "#B5E8E0", + lavender = "#7287FD", + + text = "#F2F2BF", + subtext1 = "#BAC2DE", + subtext0 = "#A6ADC8", + overlay2 = "#C3BAC6", + overlay1 = "#988BA2", + overlay0 = "#6E6B6B", + surface2 = "#6E6C7E", + surface1 = "#575268", + surface0 = "#302D41", + + base = "#1D1536", + mantle = "#1C1C19", + crust = "#161320", + } + + palette = vim.tbl_extend("force", { none = "NONE" }, palette, require("core.settings").palette_overwrite) + end + + return palette +end + +---@param c string @The color in hexadecimal. +local function hex_to_rgb(c) + c = string.lower(c) + return { tonumber(c:sub(2, 3), 16), tonumber(c:sub(4, 5), 16), tonumber(c:sub(6, 7), 16) } +end + +-- NOTE: If the active colorscheme isn't `catppuccin`, this function won't overwrite existing definitions +---Sets a global highlight group. +---@param name string @Highlight group name, e.g. "ErrorMsg" +---@param foreground? string @The foreground color +---@param background? string @The background color +---@param italic? boolean +local function set_global_hl(name, foreground, background, italic) + vim.api.nvim_set_hl(0, name, { + fg = foreground, + bg = background, + italic = italic == true, + default = not vim.g.colors_name:find("catppuccin"), + }) +end + +---Blend foreground with background +---@param foreground string @The foreground color +---@param background string @The background color to blend with +---@param alpha number|string @Number between 0 and 1 for blending amount. +function M.blend(foreground, background, alpha) + alpha = type(alpha) == "string" and (tonumber(alpha, 16) / 0xff) or alpha + local bg = hex_to_rgb(background) + local fg = hex_to_rgb(foreground) + + local blend_channel = function(i) + local ret = (alpha * fg[i] + ((1 - alpha) * bg[i])) + return math.floor(math.min(math.max(0, ret), 255) + 0.5) + end + + return string.format("#%02x%02x%02x", blend_channel(1), blend_channel(2), blend_channel(3)) +end + +---Darken a color by blending it with the background color. +---@param hex string @The color in hex to darken +---@param amount number @The amount to darken the color +---@param bg string @The background color to blend with +---@return string @The darkened color as a hex string +function M.darken(hex, amount, bg) + return M.blend(hex, bg or "#000000", math.abs(amount)) +end + +---Lighten a color by blending it with the foreground color. +---@param hex string @The color in hex to lighten +---@param amount number @The amount to lighten the color +---@param fg string @The foreground color to blend with +---@return string @The lightened color as a hex string +function M.lighten(hex, amount, fg) + return M.blend(hex, fg or "#FFFFFF", math.abs(amount)) +end + +---Get RGB highlight by highlight group +---@param hl_group string @Highlight group name +---@param use_bg boolean @Returns background or not +---@param fallback_hl? string @Fallback value if the hl group is not defined +---@return string +function M.hl_to_rgb(hl_group, use_bg, fallback_hl) + local hex = fallback_hl or "#000000" + local hlexists = pcall(vim.api.nvim_get_hl, 0, { name = hl_group, link = false }) + + if hlexists then + -- FIXME: Investigate why hl-StatusLine is undefined in toggleterm and remove this workaround + -- (@Jint-lzxy) + local link = vim.bo.filetype == "toggleterm" + local result = vim.api.nvim_get_hl(0, { name = hl_group, link = link }) + if use_bg then + hex = result.bg and string.format("#%06x", result.bg) or "NONE" + else + hex = result.fg and string.format("#%06x", result.fg) or "NONE" + end + end + + return hex +end + +---Extend a highlight group +---@param name string @Target highlight group name +---@param def table @Attributes to be extended +function M.extend_hl(name, def) + local hlexists = pcall(vim.api.nvim_get_hl, 0, { name = name, link = false }) + if not hlexists then + -- Do nothing if highlight group not found + return + end + local current_def = vim.api.nvim_get_hl(0, { name = name, link = false }) + local combined_def = vim.tbl_deep_extend("force", current_def, def) + + ---@diagnostic disable-next-line: param-type-mismatch + vim.api.nvim_set_hl(0, name, combined_def) +end + +---Generate universal highlight groups +---@param overwrite palette? @The color to be overwritten | highest priority +---@return palette +function M.get_palette(overwrite) + if not overwrite then + return vim.deepcopy(init_palette()) + else + return vim.tbl_extend("force", init_palette(), overwrite) + end +end + +-- Generate highlight groups for lspsaga. Existing attributes will NOT be overwritten +function M.gen_lspkind_hl() + local colors = M.get_palette() + local dat = { + Class = colors.yellow, + Constant = colors.peach, + Constructor = colors.sapphire, + Enum = colors.yellow, + EnumMember = colors.teal, + Event = colors.yellow, + Field = colors.teal, + File = colors.rosewater, + Function = colors.blue, + Interface = colors.yellow, + Key = colors.red, + Method = colors.blue, + Module = colors.blue, + Namespace = colors.blue, + Number = colors.peach, + Operator = colors.sky, + Package = colors.blue, + Property = colors.teal, + Struct = colors.yellow, + TypeParameter = colors.blue, + Variable = colors.peach, + Array = colors.peach, + Boolean = colors.peach, + Null = colors.yellow, + Object = colors.yellow, + String = colors.green, + TypeAlias = colors.green, + Parameter = colors.blue, + StaticMethod = colors.peach, + Text = colors.green, + Snippet = colors.mauve, + Folder = colors.blue, + Unit = colors.green, + Value = colors.peach, + } + + for kind, color in pairs(dat) do + set_global_hl("LspKind" .. kind, color) + end +end + +-- Generate highlight groups for alpha. Existing attributes will NOT be overwritten +function M.gen_alpha_hl() + local colors = M.get_palette() + + set_global_hl("AlphaHeader", colors.blue) + set_global_hl("AlphaButtons", colors.green) + set_global_hl("AlphaShortcut", colors.pink, nil, true) + set_global_hl("AlphaFooter", colors.yellow) +end + +-- Generate highlight groups for cursorword. Existing attributes will NOT be overwritten +function M.gen_cursorword_hl() + local colors = M.get_palette() + + -- Do not highlight `MiniCursorwordCurrent` + set_global_hl("MiniCursorword", nil, M.darken(colors.surface1, 0.7, colors.base)) + set_global_hl("MiniCursorwordCurrent", nil) +end + +---Convert number (0/1) to boolean +---@param value number @The value to check +---@return boolean|nil @Returns nil if failed +function M.tobool(value) + if value == 0 then + return false + elseif value == 1 then + return true + else + vim.notify( + "Attempting to convert data of type '" .. type(value) .. "' [other than 0 or 1] to boolean", + vim.log.levels.ERROR, + { title = "[utils] Runtime Error" } + ) + return nil + end +end + +--- Function to recursively merge src into dst +--- Unlike vim.tbl_deep_extend(), this function extends if the original value is a list +---@paramm dst table @Table which will be modified and appended to +---@paramm src table @Table from which values will be inserted +---@return table @Modified table +local function tbl_recursive_merge(dst, src) + for key, value in pairs(src) do + if type(dst[key]) == "table" and type(value) == "function" then + dst[key] = value(dst[key]) + elseif type(dst[key]) == "table" and vim.islist(dst[key]) and key ~= "dashboard_image" then + vim.list_extend(dst[key], value) + elseif type(dst[key]) == "table" and type(value) == "table" and not vim.islist(dst[key]) then + tbl_recursive_merge(dst[key], value) + else + dst[key] = value + end + end + return dst +end + +-- Function to extend existing core configs (settings, events, etc.) +---@param config table @The default config to be merged with +---@param user_config string @The module name used to require user config +---@return table @Extended config +function M.extend_config(config, user_config) + local ok, extras = pcall(require, user_config) + if ok and type(extras) == "table" then + config = tbl_recursive_merge(config, extras) + end + return config +end + +---@param plugin_name string @Module name of the plugin (used to setup itself) +---@param opts nil|table @The default config to be merged with +---@param vim_plugin? boolean @If this plugin is written in vimscript or not +---@param setup_callback? function @Add new callback if the plugin needs unusual setup function +function M.load_plugin(plugin_name, opts, vim_plugin, setup_callback) + vim_plugin = vim_plugin or false + + -- Get the file name of the default config + local fname = debug.getinfo(2, "S").source:match("[^@/\\]*.lua$") + local ok, user_config = pcall(require, "user.configs." .. fname:sub(0, #fname - 4)) + if ok and vim_plugin then + if user_config == false then + -- Return early if the user explicitly requires disabling plugin setup + return + elseif type(user_config) == "function" then + -- OK, setup as instructed by the user + user_config() + else + vim.notify( + string.format( + "<%s> is not a typical Lua plugin, please return a function with\nthe corresponding options defined instead (usually via `vim.g.*`)", + plugin_name + ), + vim.log.levels.ERROR, + { title = "[utils] Runtime Error (User Config)" } + ) + end + elseif not vim_plugin then + if user_config == false then + -- Return early if the user explicitly requires disabling plugin setup + return + else + setup_callback = setup_callback or require(plugin_name).setup + -- User config exists? + if ok then + -- Extend base config if the returned user config is a table + if type(user_config) == "table" then + opts = tbl_recursive_merge(opts, user_config) + setup_callback(opts) + -- Replace base config if the returned user config is a function + elseif type(user_config) == "function" then + local user_opts = user_config(opts) + if type(user_opts) == "table" then + setup_callback(user_opts) + end + else + vim.notify( + string.format( + [[ +Please return a `table` if you want to override some of the default options OR a +`function` returning a `table` if you want to replace the default options completely. + +We received a `%s` for plugin <%s>.]], + type(user_config), + plugin_name + ), + vim.log.levels.ERROR, + { title = "[utils] Runtime Error (User Config)" } + ) + end + else + -- Nothing provided... Fallback as default setup of the plugin + setup_callback(opts) + end + end + end +end + +return M diff --git a/.config/mackup/.config/nvim/lua/modules/utils/keymap.lua b/.config/mackup/.config/nvim/lua/modules/utils/keymap.lua new file mode 100644 index 0000000..e249250 --- /dev/null +++ b/.config/mackup/.config/nvim/lua/modules/utils/keymap.lua @@ -0,0 +1,205 @@ +local M = {} + +---Shortcut for `nvim_replace_termcodes`. +---@param keys string +---@return string +local function termcodes(keys) + return vim.api.nvim_replace_termcodes(keys, true, true, true) +end + +---Returns if two key sequence are equal or not. +---@param a string +---@param b string +---@return boolean +local function keymap_equals(a, b) + return termcodes(a) == termcodes(b) +end + +---Get map +---@param mode string +---@param lhs string +---@return table +local function get_map(mode, lhs) + for _, map in ipairs(vim.api.nvim_buf_get_keymap(0, mode)) do + if keymap_equals(map.lhs, lhs) then + vim.api.nvim_buf_del_keymap(0, mode, lhs) + return { + lhs = map.lhs, + rhs = map.rhs or "", + expr = map.expr == 1, + callback = map.callback, + noremap = map.noremap == 1, + script = map.script == 1, + silent = map.silent == 1, + nowait = map.nowait == 1, + buffer = true, + } + end + end + + for _, map in ipairs(vim.api.nvim_get_keymap(mode)) do + if keymap_equals(map.lhs, lhs) then + vim.api.nvim_del_keymap(mode, lhs) + return { + lhs = map.lhs, + rhs = map.rhs or "", + expr = map.expr == 1, + callback = map.callback, + noremap = map.noremap == 1, + script = map.script == 1, + silent = map.silent == 1, + nowait = map.nowait == 1, + buffer = false, + } + end + end + + return { + lhs = lhs, + rhs = lhs, + expr = false, + callback = nil, + noremap = true, + script = false, + silent = true, + nowait = false, + buffer = false, + } +end + +---Returns the function constructed from the passed keymap object on call of +---which the original keymapping will be executed. +---@param map table keymap object +---@return function +local function get_fallback(map) + return function() + local keys, fmode + if map.expr then + if map.callback then + keys = map.callback() + else + keys = vim.api.nvim_eval(map.rhs) + end + elseif map.callback then + map.callback() + return + else + keys = map.rhs + end + keys = termcodes(keys) + fmode = map.noremap and "in" or "im" + vim.api.nvim_feedkeys(keys, fmode, false) + end +end + +-- Amends a mapping (i.e., allows fallback when certain conditions are met) +---@param cond string +---@param mode string +---@param lhs string +---@param rhs function +---@param opts? table +local function amend(cond, mode, lhs, rhs, opts) + local map = get_map(mode, lhs) + local fallback = get_fallback(map) + local options = vim.deepcopy(opts) or {} + options.desc = table.concat({ + "[" .. cond, + (options.desc and ": " .. options.desc or ""), + "]", + (map.desc and " / " .. map.desc or ""), + }) + vim.keymap.set(mode, lhs, function() + rhs(fallback) + end, options) +end + +-- Completely replace a mapping +---@param mode string +---@param lhs string +---@param rhs string +---@param opts? table +---@param buf? boolean|number +local function replace(mode, lhs, rhs, opts, buf) + get_map(mode, lhs) + + local options = vim.deepcopy(opts) or {} + if buf and type(buf) == "number" then + vim.api.nvim_buf_set_keymap(buf, mode, lhs, rhs, options) + else + vim.api.nvim_set_keymap(mode, lhs, rhs, options) + end +end + +---Amend the existing keymap. +---@param cond string +---@param mode string | string[] +---@param lhs string +---@param rhs function +---@param opts? table +local function modes_amend(cond, mode, lhs, rhs, opts) + if type(mode) == "table" then + for _, m in ipairs(mode) do + amend(cond, m, lhs, rhs, opts) + end + else + amend(cond, mode, lhs, rhs, opts) + end +end + +---Replace the existing keymap. +---@param mode string | string[] +---@param lhs string +---@param rhs string +---@param opts? table +---@param buf? boolean|number +local function modes_replace(mode, lhs, rhs, opts, buf) + if type(mode) == "table" then + for _, m in ipairs(mode) do + replace(m, lhs, rhs, opts, buf) + end + else + replace(mode, lhs, rhs, opts, buf) + end +end + +---Amend the existing keymap. +---@param cond string +---@param global_flag string +---@param mapping table +function M.amend(cond, global_flag, mapping) + for key, value in pairs(mapping) do + local modes, keymap = key:match("([^|]*)|?(.*)") + if type(value) == "table" then + local rhs = value.cmd + local options = value.options + modes_amend(cond, vim.split(modes, ""), keymap, function(fallback) + if _G[global_flag] then + local fmode = options.noremap and "in" or "im" + vim.api.nvim_feedkeys(termcodes(rhs), fmode, false) + else + fallback() + end + end, options) + end + end +end + +---Replace the existing keymap. +---@param mapping table +function M.replace(mapping) + for key, value in pairs(mapping) do + local modes, keymap = key:match("([^|]*)|?(.*)") + if type(value) == "table" then + local rhs = value.cmd + local options = value.options + local buffer = value.buffer + modes_replace(vim.split(modes, ""), keymap, rhs, options, buffer) + elseif value == "" or value == false then + for _, m in ipairs(vim.split(modes, "")) do + get_map(m, keymap) + end + end + end +end + +return M diff --git a/vimcolor/solarized-master/.gitmodules b/.config/mackup/.config/nvim/lua/user/configs/.gitkeep old mode 100755 new mode 100644 similarity index 100% rename from vimcolor/solarized-master/.gitmodules rename to .config/mackup/.config/nvim/lua/user/configs/.gitkeep diff --git a/.config/mackup/.config/nvim/lua/user/configs/dap-clients/.gitkeep b/.config/mackup/.config/nvim/lua/user/configs/dap-clients/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/.config/mackup/.config/nvim/lua/user/configs/formatters/.gitkeep b/.config/mackup/.config/nvim/lua/user/configs/formatters/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/.config/mackup/.config/nvim/lua/user/configs/lsp-servers/.gitkeep b/.config/mackup/.config/nvim/lua/user/configs/lsp-servers/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/.config/mackup/.config/nvim/lua/user/event.lua b/.config/mackup/.config/nvim/lua/user/event.lua new file mode 100644 index 0000000..44bee88 --- /dev/null +++ b/.config/mackup/.config/nvim/lua/user/event.lua @@ -0,0 +1,8 @@ +local definitions = { + -- Example + bufs = { + { "BufWritePre", "COMMIT_EDITMSG", "setlocal noundofile" }, + }, +} + +return definitions diff --git a/.config/mackup/.config/nvim/lua/user/keymap/completion.lua b/.config/mackup/.config/nvim/lua/user/keymap/completion.lua new file mode 100644 index 0000000..1000f15 --- /dev/null +++ b/.config/mackup/.config/nvim/lua/user/keymap/completion.lua @@ -0,0 +1,16 @@ +local mappings = {} + +-- Place global keymaps here. +mappings["plug_map"] = {} + +-- NOTE: This function is special! Keymaps defined here are ONLY effective in buffers with LSP(s) attached +-- NOTE: Make sure to include `:with_buffer(buf)` to limit the scope of your mappings. +---@param buf number @The effective bufnr +mappings["lsp"] = function(buf) + return { + -- Example + ["n|K"] = require("keymap.bind").map_cr("Lspsaga hover_doc"):with_buffer(buf):with_desc("lsp: Show doc"), + } +end + +return mappings diff --git a/.config/mackup/.config/nvim/lua/user/keymap/core.lua b/.config/mackup/.config/nvim/lua/user/keymap/core.lua new file mode 100644 index 0000000..a564707 --- /dev/null +++ b/.config/mackup/.config/nvim/lua/user/keymap/core.lua @@ -0,0 +1 @@ +return {} diff --git a/.config/mackup/.config/nvim/lua/user/keymap/editor.lua b/.config/mackup/.config/nvim/lua/user/keymap/editor.lua new file mode 100644 index 0000000..a564707 --- /dev/null +++ b/.config/mackup/.config/nvim/lua/user/keymap/editor.lua @@ -0,0 +1 @@ +return {} diff --git a/.config/mackup/.config/nvim/lua/user/keymap/init.lua b/.config/mackup/.config/nvim/lua/user/keymap/init.lua new file mode 100644 index 0000000..f4a08e2 --- /dev/null +++ b/.config/mackup/.config/nvim/lua/user/keymap/init.lua @@ -0,0 +1,9 @@ +return vim.tbl_extend( + "force", + require("user.keymap.core"), + require("user.keymap.completion").plug_map, + require("user.keymap.editor"), + require("user.keymap.lang"), + require("user.keymap.tool"), + require("user.keymap.ui") +) diff --git a/.config/mackup/.config/nvim/lua/user/keymap/lang.lua b/.config/mackup/.config/nvim/lua/user/keymap/lang.lua new file mode 100644 index 0000000..a564707 --- /dev/null +++ b/.config/mackup/.config/nvim/lua/user/keymap/lang.lua @@ -0,0 +1 @@ +return {} diff --git a/.config/mackup/.config/nvim/lua/user/keymap/tool.lua b/.config/mackup/.config/nvim/lua/user/keymap/tool.lua new file mode 100644 index 0000000..a564707 --- /dev/null +++ b/.config/mackup/.config/nvim/lua/user/keymap/tool.lua @@ -0,0 +1 @@ +return {} diff --git a/.config/mackup/.config/nvim/lua/user/keymap/ui.lua b/.config/mackup/.config/nvim/lua/user/keymap/ui.lua new file mode 100644 index 0000000..a564707 --- /dev/null +++ b/.config/mackup/.config/nvim/lua/user/keymap/ui.lua @@ -0,0 +1 @@ +return {} diff --git a/.config/mackup/.config/nvim/lua/user/options.lua b/.config/mackup/.config/nvim/lua/user/options.lua new file mode 100644 index 0000000..df03ac5 --- /dev/null +++ b/.config/mackup/.config/nvim/lua/user/options.lua @@ -0,0 +1,6 @@ +local options = { + -- Example + autoindent = true, +} + +return options diff --git a/.config/mackup/.config/nvim/lua/user/plugins/.gitkeep b/.config/mackup/.config/nvim/lua/user/plugins/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/.config/mackup/.config/nvim/lua/user/settings.lua b/.config/mackup/.config/nvim/lua/user/settings.lua new file mode 100644 index 0000000..1716708 --- /dev/null +++ b/.config/mackup/.config/nvim/lua/user/settings.lua @@ -0,0 +1,9 @@ +-- Please check `lua/core/settings.lua` to view the full list of configurable settings +local settings = {} + +-- Examples +settings["use_ssh"] = false + +settings["colorscheme"] = "catppuccin" + +return settings diff --git a/.config/mackup/.config/nvim/lua/user/snips/.gitkeep b/.config/mackup/.config/nvim/lua/user/snips/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/.config/mackup/.config/nvim/lua/user_template/configs/.gitkeep b/.config/mackup/.config/nvim/lua/user_template/configs/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/.config/mackup/.config/nvim/lua/user_template/configs/dap-clients/.gitkeep b/.config/mackup/.config/nvim/lua/user_template/configs/dap-clients/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/.config/mackup/.config/nvim/lua/user_template/configs/formatters/.gitkeep b/.config/mackup/.config/nvim/lua/user_template/configs/formatters/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/.config/mackup/.config/nvim/lua/user_template/configs/lsp-servers/.gitkeep b/.config/mackup/.config/nvim/lua/user_template/configs/lsp-servers/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/.config/mackup/.config/nvim/lua/user_template/event.lua b/.config/mackup/.config/nvim/lua/user_template/event.lua new file mode 100644 index 0000000..44bee88 --- /dev/null +++ b/.config/mackup/.config/nvim/lua/user_template/event.lua @@ -0,0 +1,8 @@ +local definitions = { + -- Example + bufs = { + { "BufWritePre", "COMMIT_EDITMSG", "setlocal noundofile" }, + }, +} + +return definitions diff --git a/.config/mackup/.config/nvim/lua/user_template/keymap/completion.lua b/.config/mackup/.config/nvim/lua/user_template/keymap/completion.lua new file mode 100644 index 0000000..1000f15 --- /dev/null +++ b/.config/mackup/.config/nvim/lua/user_template/keymap/completion.lua @@ -0,0 +1,16 @@ +local mappings = {} + +-- Place global keymaps here. +mappings["plug_map"] = {} + +-- NOTE: This function is special! Keymaps defined here are ONLY effective in buffers with LSP(s) attached +-- NOTE: Make sure to include `:with_buffer(buf)` to limit the scope of your mappings. +---@param buf number @The effective bufnr +mappings["lsp"] = function(buf) + return { + -- Example + ["n|K"] = require("keymap.bind").map_cr("Lspsaga hover_doc"):with_buffer(buf):with_desc("lsp: Show doc"), + } +end + +return mappings diff --git a/.config/mackup/.config/nvim/lua/user_template/keymap/core.lua b/.config/mackup/.config/nvim/lua/user_template/keymap/core.lua new file mode 100644 index 0000000..a564707 --- /dev/null +++ b/.config/mackup/.config/nvim/lua/user_template/keymap/core.lua @@ -0,0 +1 @@ +return {} diff --git a/.config/mackup/.config/nvim/lua/user_template/keymap/editor.lua b/.config/mackup/.config/nvim/lua/user_template/keymap/editor.lua new file mode 100644 index 0000000..a564707 --- /dev/null +++ b/.config/mackup/.config/nvim/lua/user_template/keymap/editor.lua @@ -0,0 +1 @@ +return {} diff --git a/.config/mackup/.config/nvim/lua/user_template/keymap/init.lua b/.config/mackup/.config/nvim/lua/user_template/keymap/init.lua new file mode 100644 index 0000000..f4a08e2 --- /dev/null +++ b/.config/mackup/.config/nvim/lua/user_template/keymap/init.lua @@ -0,0 +1,9 @@ +return vim.tbl_extend( + "force", + require("user.keymap.core"), + require("user.keymap.completion").plug_map, + require("user.keymap.editor"), + require("user.keymap.lang"), + require("user.keymap.tool"), + require("user.keymap.ui") +) diff --git a/.config/mackup/.config/nvim/lua/user_template/keymap/lang.lua b/.config/mackup/.config/nvim/lua/user_template/keymap/lang.lua new file mode 100644 index 0000000..a564707 --- /dev/null +++ b/.config/mackup/.config/nvim/lua/user_template/keymap/lang.lua @@ -0,0 +1 @@ +return {} diff --git a/.config/mackup/.config/nvim/lua/user_template/keymap/tool.lua b/.config/mackup/.config/nvim/lua/user_template/keymap/tool.lua new file mode 100644 index 0000000..a564707 --- /dev/null +++ b/.config/mackup/.config/nvim/lua/user_template/keymap/tool.lua @@ -0,0 +1 @@ +return {} diff --git a/.config/mackup/.config/nvim/lua/user_template/keymap/ui.lua b/.config/mackup/.config/nvim/lua/user_template/keymap/ui.lua new file mode 100644 index 0000000..a564707 --- /dev/null +++ b/.config/mackup/.config/nvim/lua/user_template/keymap/ui.lua @@ -0,0 +1 @@ +return {} diff --git a/.config/mackup/.config/nvim/lua/user_template/options.lua b/.config/mackup/.config/nvim/lua/user_template/options.lua new file mode 100644 index 0000000..df03ac5 --- /dev/null +++ b/.config/mackup/.config/nvim/lua/user_template/options.lua @@ -0,0 +1,6 @@ +local options = { + -- Example + autoindent = true, +} + +return options diff --git a/.config/mackup/.config/nvim/lua/user_template/plugins/.gitkeep b/.config/mackup/.config/nvim/lua/user_template/plugins/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/.config/mackup/.config/nvim/lua/user_template/settings.lua b/.config/mackup/.config/nvim/lua/user_template/settings.lua new file mode 100644 index 0000000..3e11eb9 --- /dev/null +++ b/.config/mackup/.config/nvim/lua/user_template/settings.lua @@ -0,0 +1,9 @@ +-- Please check `lua/core/settings.lua` to view the full list of configurable settings +local settings = {} + +-- Examples +settings["use_ssh"] = true + +settings["colorscheme"] = "catppuccin" + +return settings diff --git a/.config/mackup/.config/nvim/lua/user_template/snips/.gitkeep b/.config/mackup/.config/nvim/lua/user_template/snips/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/.config/mackup/.gitconfig b/.config/mackup/.gitconfig new file mode 100644 index 0000000..cb7fbe6 --- /dev/null +++ b/.config/mackup/.gitconfig @@ -0,0 +1,5 @@ +# This is Git's per-user configuration file. +[user] +# Please adapt and uncomment the following lines: + name = Marsway + email = liwei@marsway.red diff --git a/.config/mackup/.zprofile b/.config/mackup/.zprofile new file mode 100644 index 0000000..09004bc --- /dev/null +++ b/.config/mackup/.zprofile @@ -0,0 +1,10 @@ + + export HOMEBREW_PIP_INDEX_URL=https://pypi.tuna.tsinghua.edu.cn/simple #ckbrew + export HOMEBREW_API_DOMAIN=https://mirrors.tuna.tsinghua.edu.cn/homebrew-bottles/api #ckbrew + export HOMEBREW_BOTTLE_DOMAIN=https://mirrors.tuna.tsinghua.edu.cn/homebrew-bottles #ckbrew + eval $(/opt/homebrew/bin/brew shellenv) #ckbrew + + +# Added by OrbStack: command-line tools and integration +# This won't be added again if you remove it. +source ~/.orbstack/shell/init.zsh 2>/dev/null || : diff --git a/.config/mackup/.zshrc b/.config/mackup/.zshrc new file mode 100644 index 0000000..8b5ad55 --- /dev/null +++ b/.config/mackup/.zshrc @@ -0,0 +1,123 @@ +# If you come from bash you might have to change your $PATH. +# export PATH=$HOME/bin:$HOME/.local/bin:/usr/local/bin:$PATH + +# Path to your Oh My Zsh installation. +export ZSH="$HOME/.oh-my-zsh" + +# Set name of the theme to load --- if set to "random", it will +# load a random theme each time Oh My Zsh is loaded, in which case, +# to know which specific one was loaded, run: echo $RANDOM_THEME +# See https://github.com/ohmyzsh/ohmyzsh/wiki/Themes +ZSH_THEME="robbyrussell" + +# Set list of themes to pick from when loading at random +# Setting this variable when ZSH_THEME=random will cause zsh to load +# a theme from this variable instead of looking in $ZSH/themes/ +# If set to an empty array, this variable will have no effect. +# ZSH_THEME_RANDOM_CANDIDATES=( "robbyrussell" "agnoster" ) + +# Uncomment the following line to use case-sensitive completion. +# CASE_SENSITIVE="true" + +# Uncomment the following line to use hyphen-insensitive completion. +# Case-sensitive completion must be off. _ and - will be interchangeable. +# HYPHEN_INSENSITIVE="true" + +# Uncomment one of the following lines to change the auto-update behavior +# zstyle ':omz:update' mode disabled # disable automatic updates +# zstyle ':omz:update' mode auto # update automatically without asking +# zstyle ':omz:update' mode reminder # just remind me to update when it's time + +# Uncomment the following line to change how often to auto-update (in days). +# zstyle ':omz:update' frequency 13 + +# Uncomment the following line if pasting URLs and other text is messed up. +# DISABLE_MAGIC_FUNCTIONS="true" + +# Uncomment the following line to disable colors in ls. +# DISABLE_LS_COLORS="true" + +# Uncomment the following line to disable auto-setting terminal title. +# DISABLE_AUTO_TITLE="true" + +# Uncomment the following line to enable command auto-correction. +# ENABLE_CORRECTION="true" + +# Uncomment the following line to display red dots whilst waiting for completion. +# You can also set it to another string to have that shown instead of the default red dots. +# e.g. COMPLETION_WAITING_DOTS="%F{yellow}waiting...%f" +# Caution: this setting can cause issues with multiline prompts in zsh < 5.7.1 (see #5765) +# COMPLETION_WAITING_DOTS="true" + +# Uncomment the following line if you want to disable marking untracked files +# under VCS as dirty. This makes repository status check for large repositories +# much, much faster. +# DISABLE_UNTRACKED_FILES_DIRTY="true" + +# Uncomment the following line if you want to change the command execution time +# stamp shown in the history command output. +# You can set one of the optional three formats: +# "mm/dd/yyyy"|"dd.mm.yyyy"|"yyyy-mm-dd" +# or set a custom format using the strftime function format specifications, +# see 'man strftime' for details. +# HIST_STAMPS="mm/dd/yyyy" + +# Would you like to use another custom folder than $ZSH/custom? +# ZSH_CUSTOM=/path/to/new-custom-folder + +# Which plugins would you like to load? +# Standard plugins can be found in $ZSH/plugins/ +# Custom plugins may be added to $ZSH_CUSTOM/plugins/ +# Example format: plugins=(rails git textmate ruby lighthouse) +# Add wisely, as too many plugins slow down shell startup. +plugins=(git) + +source $ZSH/oh-my-zsh.sh + +# User configuration + +# export MANPATH="/usr/local/man:$MANPATH" + +# You may need to manually set your language environment +# export LANG=en_US.UTF-8 + +# Preferred editor for local and remote sessions +# if [[ -n $SSH_CONNECTION ]]; then +# export EDITOR='vim' +# else +# export EDITOR='nvim' +# fi + +# Compilation flags +# export ARCHFLAGS="-arch $(uname -m)" + +# Set personal aliases, overriding those provided by Oh My Zsh libs, +# plugins, and themes. Aliases can be placed here, though Oh My Zsh +# users are encouraged to define aliases within a top-level file in +# the $ZSH_CUSTOM folder, with .zsh extension. Examples: +# - $ZSH_CUSTOM/aliases.zsh +# - $ZSH_CUSTOM/macos.zsh +# For a full list of active aliases, run `alias`. +# +# Example aliases +# alias zshconfig="mate ~/.zshrc" +# alias ohmyzsh="mate ~/.oh-my-zsh" +source ~/.vvconfig/zshrc +eval "$(starship init zsh)" + + +# >>> conda initialize >>> +# !! Contents within this block are managed by 'conda init' !! +__conda_setup="$('/opt/homebrew/Caskroom/miniconda/base/bin/conda' 'shell.zsh' 'hook' 2> /dev/null)" +if [ $? -eq 0 ]; then + eval "$__conda_setup" +else + if [ -f "/opt/homebrew/Caskroom/miniconda/base/etc/profile.d/conda.sh" ]; then + . "/opt/homebrew/Caskroom/miniconda/base/etc/profile.d/conda.sh" + else + export PATH="/opt/homebrew/Caskroom/miniconda/base/bin:$PATH" + fi +fi +unset __conda_setup +# <<< conda initialize <<< + diff --git a/.config/omf/bundle b/.config/omf/bundle new file mode 100644 index 0000000..9c59da0 --- /dev/null +++ b/.config/omf/bundle @@ -0,0 +1,3 @@ +package bass +theme default +theme pure diff --git a/.config/omf/channel b/.config/omf/channel new file mode 100644 index 0000000..2bf5ad0 --- /dev/null +++ b/.config/omf/channel @@ -0,0 +1 @@ +stable diff --git a/.config/omf/theme b/.config/omf/theme new file mode 100644 index 0000000..f2f6585 --- /dev/null +++ b/.config/omf/theme @@ -0,0 +1 @@ +pure diff --git a/.config/orbstack/config/docker.json b/.config/orbstack/config/docker.json new file mode 100644 index 0000000..cd6296e --- /dev/null +++ b/.config/orbstack/config/docker.json @@ -0,0 +1,14 @@ +{ + "registry-mirrors" : [ + "https:\/\/registry.docker-cn.com", + "http:\/\/hub-mirror.c.163.com", + "https:\/\/docker.mirrors.ustc.edu.cn", + "https:\/\/cr.console.aliyun.com", + "https:\/\/mirror.ccs.tencentyun.com" + ], + "proxies" : { + "http-proxy" : "http:\/\/localhost:7897", + "no-proxy" : "localhost,127.0.0.0\/8", + "https-proxy" : "http:\/\/localhost:7897" + } +} diff --git a/.config/orbstack/init.sh b/.config/orbstack/init.sh new file mode 100644 index 0000000..9563af4 --- /dev/null +++ b/.config/orbstack/init.sh @@ -0,0 +1 @@ +cp ./config/docker.json ~/.orbstack/config diff --git a/.config/starship.toml b/.config/starship.toml new file mode 100644 index 0000000..b1dfb9c --- /dev/null +++ b/.config/starship.toml @@ -0,0 +1,315 @@ +# version: 1.0.0 + +add_newline = true +continuation_prompt = "[▸▹ ](dimmed white)" + +format = """($nix_shell$container$fill$git_metrics\n)$cmd_duration\ +$hostname\ +$localip\ +$shlvl\ +$shell\ +$env_var\ +$jobs\ +$sudo\ +$username\ +$character""" + +right_format = """ +$singularity\ +$kubernetes\ +$directory\ +$vcsh\ +$fossil_branch\ +$git_branch\ +$git_commit\ +$git_state\ +$git_status\ +$hg_branch\ +$pijul_channel\ +$docker_context\ +$package\ +$c\ +$cmake\ +$cobol\ +$daml\ +$dart\ +$deno\ +$dotnet\ +$elixir\ +$elm\ +$erlang\ +$fennel\ +$golang\ +$guix_shell\ +$haskell\ +$haxe\ +$helm\ +$java\ +$julia\ +$kotlin\ +$gradle\ +$lua\ +$nim\ +$nodejs\ +$ocaml\ +$opa\ +$perl\ +$php\ +$pulumi\ +$purescript\ +$python\ +$raku\ +$rlang\ +$red\ +$ruby\ +$rust\ +$scala\ +$solidity\ +$swift\ +$terraform\ +$vlang\ +$vagrant\ +$zig\ +$buf\ +$conda\ +$meson\ +$spack\ +$memory_usage\ +$aws\ +$gcloud\ +$openstack\ +$azure\ +$crystal\ +$custom\ +$status\ +$os\ +$battery\ +$time""" + +[fill] +symbol = ' ' + +[character] +format = "$symbol " +success_symbol = "[◎](bold italic bright-yellow)" +error_symbol = "[○](italic purple)" +vimcmd_symbol = "[■](italic dimmed green)" +# not supported in zsh +vimcmd_replace_one_symbol = "◌" +vimcmd_replace_symbol = "□" +vimcmd_visual_symbol = "▼" + +[env_var.VIMSHELL] +format = "[$env_value]($style)" +style = 'green italic' + +[sudo] +format = "[$symbol]($style)" +style = "bold italic bright-purple" +symbol = "⋈┈" +disabled = false + +[username] +style_user = "bright-yellow bold italic" +style_root = "purple bold italic" +format = "[⭘ $user]($style) " +disabled = false +show_always = false + +[directory] +home_symbol = "⌂" +truncation_length = 2 +truncation_symbol = "□ " +read_only = " ◈" +use_os_path_sep = true +style = "italic blue" +format = '[$path]($style)[$read_only]($read_only_style)' +repo_root_style = 'bold blue' +repo_root_format = '[$before_root_path]($before_repo_root_style)[$repo_root]($repo_root_style)[$path]($style)[$read_only]($read_only_style) [△](bold bright-blue)' + +[cmd_duration] +format = "[◄ $duration ](italic white)" + +[jobs] +format = "[$symbol$number]($style) " +style = "white" +symbol = "[▶](blue italic)" + +[localip] +ssh_only = true +format = " ◯[$localipv4](bold magenta)" +disabled = false + +[time] +disabled = false +format = "[ $time]($style)" +time_format = "%R" +utc_time_offset = "local" +style = "italic dimmed white" + +[battery] +format = "[ $percentage $symbol]($style)" +full_symbol = "█" +charging_symbol = "[↑](italic bold green)" +discharging_symbol = "↓" +unknown_symbol = "░" +empty_symbol = "▃" + +[[battery.display]] +threshold = 20 +style = "italic bold red" + +[[battery.display]] +threshold = 60 +style = "italic dimmed bright-purple" + +[[battery.display]] +threshold = 70 +style = "italic dimmed yellow" + +[git_branch] +format = " [$branch(:$remote_branch)]($style)" +symbol = "[△](bold italic bright-blue)" +style = "italic bright-blue" +truncation_symbol = "⋯" +truncation_length = 11 +ignore_branches = ["main", "master"] +only_attached = true + +[git_metrics] +format = '([▴$added]($added_style))([▿$deleted]($deleted_style))' +added_style = 'italic dimmed green' +deleted_style = 'italic dimmed red' +ignore_submodules = true +disabled = false + +[git_status] +style = "bold italic bright-blue" +format = "([⎪$ahead_behind$staged$modified$untracked$renamed$deleted$conflicted$stashed⎥]($style))" +conflicted = "[◪◦](italic bright-magenta)" +ahead = "[▴│[${count}](bold white)│](italic green)" +behind = "[▿│[${count}](bold white)│](italic red)" +diverged = "[◇ ▴┤[${ahead_count}](regular white)│▿┤[${behind_count}](regular white)│](italic bright-magenta)" +untracked = "[◌◦](italic bright-yellow)" +stashed = "[◃◈](italic white)" +modified = "[●◦](italic yellow)" +staged = "[▪┤[$count](bold white)│](italic bright-cyan)" +renamed = "[◎◦](italic bright-blue)" +deleted = "[✕](italic red)" + +[deno] +format = " [deno](italic) [∫ $version](green bold)" +version_format = "${raw}" + +[lua] +format = " [lua](italic) [${symbol}${version}]($style)" +version_format = "${raw}" +symbol = "⨀ " +style = "bold bright-yellow" + +[nodejs] +format = " [node](italic) [◫ ($version)](bold bright-green)" +version_format = "${raw}" +detect_files = ["package-lock.json", "yarn.lock"] +detect_folders = ["node_modules"] +detect_extensions = [] + +[python] +format = " [py](italic) [${symbol}${version}]($style)" +symbol = "[⌉](bold bright-blue)⌊ " +version_format = "${raw}" +style = "bold bright-yellow" + +[ruby] +format = " [rb](italic) [${symbol}${version}]($style)" +symbol = "◆ " +version_format = "${raw}" +style = "bold red" + +[rust] +format = " [rs](italic) [$symbol$version]($style)" +symbol = "⊃ " +version_format = "${raw}" +style = "bold red" + +[package] +format = " [pkg](italic dimmed) [$symbol$version]($style)" +version_format = "${raw}" +symbol = "◨ " +style = "dimmed yellow italic bold" + +[swift] +format = " [sw](italic) [${symbol}${version}]($style)" +symbol = "◁ " +style = "bold bright-red" +version_format = "${raw}" + +[aws] +disabled = true +format = " [aws](italic) [$symbol $profile $region]($style)" +style = "bold blue" +symbol = "▲ " + +[buf] +symbol = "■ " +format = " [buf](italic) [$symbol $version $buf_version]($style)" + +[c] +symbol = "ℂ " +format = " [$symbol($version(-$name))]($style)" + +[conda] +symbol = "◯ " +format = " conda [$symbol$environment]($style)" + +[dart] +symbol = "◁◅ " +format = " dart [$symbol($version )]($style)" + +[docker_context] +symbol = "◧ " +format = " docker [$symbol$context]($style)" + +[elixir] +symbol = "△ " +format = " exs [$symbol $version OTP $otp_version ]($style)" + +[elm] +symbol = "◩ " +format = " elm [$symbol($version )]($style)" + +[golang] +symbol = "∩ " +format = " go [$symbol($version )]($style)" + +[haskell] +symbol = "❯λ " +format = " hs [$symbol($version )]($style)" + +[java] +symbol = "∪ " +format = " java [${symbol}(${version} )]($style)" + +[julia] +symbol = "◎ " +format = " jl [$symbol($version )]($style)" + +[memory_usage] +symbol = "▪▫▪ " +format = " mem [${ram}( ${swap})]($style)" + +[nim] +symbol = "▴▲▴ " +format = " nim [$symbol($version )]($style)" + +[nix_shell] +style = 'bold italic dimmed blue' +symbol = '✶' +format = '[$symbol nix⎪$state⎪]($style) [$name](italic dimmed white)' +impure_msg = '[⌽](bold dimmed red)' +pure_msg = '[⌾](bold dimmed green)' +unknown_msg = '[◌](bold dimmed ellow)' + +[spack] +symbol = "◇ " +format = " spack [$symbol$environment]($style)" diff --git a/.config/tmux/init.sh b/.config/tmux/init.sh new file mode 100755 index 0000000..eae9dd5 --- /dev/null +++ b/.config/tmux/init.sh @@ -0,0 +1,12 @@ +# Install Tmux +set -x +brew install tmux +# Install fonts +brew install font-jetbrains-mono +brew install font-jetbrains-mono-nerd-font +# Quick fuzzy search +brew install fzf +# Auto restart ssh +brew install autossh + +echo 参考https://zhuanlan.zhihu.com/p/568917447 diff --git a/vimcolor/airline.vim b/.config/vim/vimcolor/airline.vim similarity index 100% rename from vimcolor/airline.vim rename to .config/vim/vimcolor/airline.vim diff --git a/vimcolor/molokai.vim b/.config/vim/vimcolor/molokai.vim similarity index 100% rename from vimcolor/molokai.vim rename to .config/vim/vimcolor/molokai.vim diff --git a/vimcolor/onedark.vim b/.config/vim/vimcolor/onedark.vim similarity index 100% rename from vimcolor/onedark.vim rename to .config/vim/vimcolor/onedark.vim diff --git a/vimcolor/onehalfdark.vim b/.config/vim/vimcolor/onehalfdark.vim similarity index 100% rename from vimcolor/onehalfdark.vim rename to .config/vim/vimcolor/onehalfdark.vim diff --git a/vimcolor/onehalflight.vim b/.config/vim/vimcolor/onehalflight.vim similarity index 100% rename from vimcolor/onehalflight.vim rename to .config/vim/vimcolor/onehalflight.vim diff --git a/vimcolor/rainbow.vim b/.config/vim/vimcolor/rainbow.vim similarity index 100% rename from vimcolor/rainbow.vim rename to .config/vim/vimcolor/rainbow.vim diff --git a/vimcolor/setCpp.vim b/.config/vim/vimcolor/setCpp.vim similarity index 100% rename from vimcolor/setCpp.vim rename to .config/vim/vimcolor/setCpp.vim diff --git a/.config/vim/vimcolor/solarized-master/.gitmodules b/.config/vim/vimcolor/solarized-master/.gitmodules new file mode 100755 index 0000000..e69de29 diff --git a/vimcolor/solarized-master/CHANGELOG.mkd b/.config/vim/vimcolor/solarized-master/CHANGELOG.mkd similarity index 100% rename from vimcolor/solarized-master/CHANGELOG.mkd rename to .config/vim/vimcolor/solarized-master/CHANGELOG.mkd diff --git a/vimcolor/solarized-master/DEVELOPERS.mkd b/.config/vim/vimcolor/solarized-master/DEVELOPERS.mkd similarity index 100% rename from vimcolor/solarized-master/DEVELOPERS.mkd rename to .config/vim/vimcolor/solarized-master/DEVELOPERS.mkd diff --git a/vimcolor/solarized-master/LICENSE b/.config/vim/vimcolor/solarized-master/LICENSE similarity index 100% rename from vimcolor/solarized-master/LICENSE rename to .config/vim/vimcolor/solarized-master/LICENSE diff --git a/vimcolor/solarized-master/README.md b/.config/vim/vimcolor/solarized-master/README.md similarity index 100% rename from vimcolor/solarized-master/README.md rename to .config/vim/vimcolor/solarized-master/README.md diff --git a/vimcolor/solarized-master/adobe-swatches-solarized/README.md b/.config/vim/vimcolor/solarized-master/adobe-swatches-solarized/README.md similarity index 100% rename from vimcolor/solarized-master/adobe-swatches-solarized/README.md rename to .config/vim/vimcolor/solarized-master/adobe-swatches-solarized/README.md diff --git a/vimcolor/solarized-master/adobe-swatches-solarized/solarized.act b/.config/vim/vimcolor/solarized-master/adobe-swatches-solarized/solarized.act similarity index 100% rename from vimcolor/solarized-master/adobe-swatches-solarized/solarized.act rename to .config/vim/vimcolor/solarized-master/adobe-swatches-solarized/solarized.act diff --git a/vimcolor/solarized-master/adobe-swatches-solarized/solarized.ase b/.config/vim/vimcolor/solarized-master/adobe-swatches-solarized/solarized.ase similarity index 100% rename from vimcolor/solarized-master/adobe-swatches-solarized/solarized.ase rename to .config/vim/vimcolor/solarized-master/adobe-swatches-solarized/solarized.ase diff --git a/vimcolor/solarized-master/apple-colorpalette-solarized/README.md b/.config/vim/vimcolor/solarized-master/apple-colorpalette-solarized/README.md similarity index 100% rename from vimcolor/solarized-master/apple-colorpalette-solarized/README.md rename to .config/vim/vimcolor/solarized-master/apple-colorpalette-solarized/README.md diff --git a/vimcolor/solarized-master/apple-colorpalette-solarized/alternate palettes/README.md b/.config/vim/vimcolor/solarized-master/apple-colorpalette-solarized/alternate palettes/README.md similarity index 100% rename from vimcolor/solarized-master/apple-colorpalette-solarized/alternate palettes/README.md rename to .config/vim/vimcolor/solarized-master/apple-colorpalette-solarized/alternate palettes/README.md diff --git a/vimcolor/solarized-master/apple-colorpalette-solarized/alternate palettes/Solarized tagged.clr b/.config/vim/vimcolor/solarized-master/apple-colorpalette-solarized/alternate palettes/Solarized tagged.clr similarity index 100% rename from vimcolor/solarized-master/apple-colorpalette-solarized/alternate palettes/Solarized tagged.clr rename to .config/vim/vimcolor/solarized-master/apple-colorpalette-solarized/alternate palettes/Solarized tagged.clr diff --git a/vimcolor/solarized-master/apple-colorpalette-solarized/alternate palettes/Solarized untagged.clr b/.config/vim/vimcolor/solarized-master/apple-colorpalette-solarized/alternate palettes/Solarized untagged.clr similarity index 100% rename from vimcolor/solarized-master/apple-colorpalette-solarized/alternate palettes/Solarized untagged.clr rename to .config/vim/vimcolor/solarized-master/apple-colorpalette-solarized/alternate palettes/Solarized untagged.clr diff --git a/vimcolor/solarized-master/apple-colorpalette-solarized/launch-colorpicker.app/Contents/Info.plist b/.config/vim/vimcolor/solarized-master/apple-colorpalette-solarized/launch-colorpicker.app/Contents/Info.plist similarity index 100% rename from vimcolor/solarized-master/apple-colorpalette-solarized/launch-colorpicker.app/Contents/Info.plist rename to .config/vim/vimcolor/solarized-master/apple-colorpalette-solarized/launch-colorpicker.app/Contents/Info.plist diff --git a/vimcolor/solarized-master/apple-colorpalette-solarized/launch-colorpicker.app/Contents/MacOS/applet b/.config/vim/vimcolor/solarized-master/apple-colorpalette-solarized/launch-colorpicker.app/Contents/MacOS/applet similarity index 100% rename from vimcolor/solarized-master/apple-colorpalette-solarized/launch-colorpicker.app/Contents/MacOS/applet rename to .config/vim/vimcolor/solarized-master/apple-colorpalette-solarized/launch-colorpicker.app/Contents/MacOS/applet diff --git a/vimcolor/solarized-master/apple-colorpalette-solarized/launch-colorpicker.app/Contents/PkgInfo b/.config/vim/vimcolor/solarized-master/apple-colorpalette-solarized/launch-colorpicker.app/Contents/PkgInfo similarity index 100% rename from vimcolor/solarized-master/apple-colorpalette-solarized/launch-colorpicker.app/Contents/PkgInfo rename to .config/vim/vimcolor/solarized-master/apple-colorpalette-solarized/launch-colorpicker.app/Contents/PkgInfo diff --git a/vimcolor/solarized-master/apple-colorpalette-solarized/launch-colorpicker.app/Contents/Resources/Scripts/main.scpt b/.config/vim/vimcolor/solarized-master/apple-colorpalette-solarized/launch-colorpicker.app/Contents/Resources/Scripts/main.scpt similarity index 100% rename from vimcolor/solarized-master/apple-colorpalette-solarized/launch-colorpicker.app/Contents/Resources/Scripts/main.scpt rename to .config/vim/vimcolor/solarized-master/apple-colorpalette-solarized/launch-colorpicker.app/Contents/Resources/Scripts/main.scpt diff --git a/vimcolor/solarized-master/apple-colorpalette-solarized/launch-colorpicker.app/Contents/Resources/applet.icns b/.config/vim/vimcolor/solarized-master/apple-colorpalette-solarized/launch-colorpicker.app/Contents/Resources/applet.icns similarity index 100% rename from vimcolor/solarized-master/apple-colorpalette-solarized/launch-colorpicker.app/Contents/Resources/applet.icns rename to .config/vim/vimcolor/solarized-master/apple-colorpalette-solarized/launch-colorpicker.app/Contents/Resources/applet.icns diff --git a/vimcolor/solarized-master/apple-colorpalette-solarized/launch-colorpicker.app/Contents/Resources/applet.rsrc b/.config/vim/vimcolor/solarized-master/apple-colorpalette-solarized/launch-colorpicker.app/Contents/Resources/applet.rsrc similarity index 100% rename from vimcolor/solarized-master/apple-colorpalette-solarized/launch-colorpicker.app/Contents/Resources/applet.rsrc rename to .config/vim/vimcolor/solarized-master/apple-colorpalette-solarized/launch-colorpicker.app/Contents/Resources/applet.rsrc diff --git a/vimcolor/solarized-master/apple-colorpalette-solarized/launch-colorpicker.app/Contents/Resources/description.rtfd/TXT.rtf b/.config/vim/vimcolor/solarized-master/apple-colorpalette-solarized/launch-colorpicker.app/Contents/Resources/description.rtfd/TXT.rtf similarity index 100% rename from vimcolor/solarized-master/apple-colorpalette-solarized/launch-colorpicker.app/Contents/Resources/description.rtfd/TXT.rtf rename to .config/vim/vimcolor/solarized-master/apple-colorpalette-solarized/launch-colorpicker.app/Contents/Resources/description.rtfd/TXT.rtf diff --git a/vimcolor/solarized-master/apple-colorpalette-solarized/solarized.clr b/.config/vim/vimcolor/solarized-master/apple-colorpalette-solarized/solarized.clr similarity index 100% rename from vimcolor/solarized-master/apple-colorpalette-solarized/solarized.clr rename to .config/vim/vimcolor/solarized-master/apple-colorpalette-solarized/solarized.clr diff --git a/vimcolor/solarized-master/emacs-colors-solarized/LICENSE b/.config/vim/vimcolor/solarized-master/emacs-colors-solarized/LICENSE similarity index 100% rename from vimcolor/solarized-master/emacs-colors-solarized/LICENSE rename to .config/vim/vimcolor/solarized-master/emacs-colors-solarized/LICENSE diff --git a/vimcolor/solarized-master/emacs-colors-solarized/README.md b/.config/vim/vimcolor/solarized-master/emacs-colors-solarized/README.md similarity index 100% rename from vimcolor/solarized-master/emacs-colors-solarized/README.md rename to .config/vim/vimcolor/solarized-master/emacs-colors-solarized/README.md diff --git a/vimcolor/solarized-master/emacs-colors-solarized/color-theme-solarized.el b/.config/vim/vimcolor/solarized-master/emacs-colors-solarized/color-theme-solarized.el similarity index 100% rename from vimcolor/solarized-master/emacs-colors-solarized/color-theme-solarized.el rename to .config/vim/vimcolor/solarized-master/emacs-colors-solarized/color-theme-solarized.el diff --git a/vimcolor/solarized-master/files/README.md b/.config/vim/vimcolor/solarized-master/files/README.md similarity index 100% rename from vimcolor/solarized-master/files/README.md rename to .config/vim/vimcolor/solarized-master/files/README.md diff --git a/vimcolor/solarized-master/files/mutt-colors-solarized-1.0.0beta2.zip b/.config/vim/vimcolor/solarized-master/files/mutt-colors-solarized-1.0.0beta2.zip similarity index 100% rename from vimcolor/solarized-master/files/mutt-colors-solarized-1.0.0beta2.zip rename to .config/vim/vimcolor/solarized-master/files/mutt-colors-solarized-1.0.0beta2.zip diff --git a/vimcolor/solarized-master/files/mutt-colors-solarized.zip b/.config/vim/vimcolor/solarized-master/files/mutt-colors-solarized.zip similarity index 100% rename from vimcolor/solarized-master/files/mutt-colors-solarized.zip rename to .config/vim/vimcolor/solarized-master/files/mutt-colors-solarized.zip diff --git a/vimcolor/solarized-master/files/solarized-1.0.0beta2.zip b/.config/vim/vimcolor/solarized-master/files/solarized-1.0.0beta2.zip similarity index 100% rename from vimcolor/solarized-master/files/solarized-1.0.0beta2.zip rename to .config/vim/vimcolor/solarized-master/files/solarized-1.0.0beta2.zip diff --git a/vimcolor/solarized-master/files/solarized.zip b/.config/vim/vimcolor/solarized-master/files/solarized.zip similarity index 100% rename from vimcolor/solarized-master/files/solarized.zip rename to .config/vim/vimcolor/solarized-master/files/solarized.zip diff --git a/vimcolor/solarized-master/files/vim-colors-solarized-1.0.0beta2.zip b/.config/vim/vimcolor/solarized-master/files/vim-colors-solarized-1.0.0beta2.zip similarity index 100% rename from vimcolor/solarized-master/files/vim-colors-solarized-1.0.0beta2.zip rename to .config/vim/vimcolor/solarized-master/files/vim-colors-solarized-1.0.0beta2.zip diff --git a/vimcolor/solarized-master/files/vim-colors-solarized.zip b/.config/vim/vimcolor/solarized-master/files/vim-colors-solarized.zip similarity index 100% rename from vimcolor/solarized-master/files/vim-colors-solarized.zip rename to .config/vim/vimcolor/solarized-master/files/vim-colors-solarized.zip diff --git a/vimcolor/solarized-master/gedit/README.md b/.config/vim/vimcolor/solarized-master/gedit/README.md similarity index 100% rename from vimcolor/solarized-master/gedit/README.md rename to .config/vim/vimcolor/solarized-master/gedit/README.md diff --git a/vimcolor/solarized-master/gedit/img/solarized_dark.png b/.config/vim/vimcolor/solarized-master/gedit/img/solarized_dark.png similarity index 100% rename from vimcolor/solarized-master/gedit/img/solarized_dark.png rename to .config/vim/vimcolor/solarized-master/gedit/img/solarized_dark.png diff --git a/vimcolor/solarized-master/gedit/img/solarized_light.png b/.config/vim/vimcolor/solarized-master/gedit/img/solarized_light.png similarity index 100% rename from vimcolor/solarized-master/gedit/img/solarized_light.png rename to .config/vim/vimcolor/solarized-master/gedit/img/solarized_light.png diff --git a/vimcolor/solarized-master/gedit/installer b/.config/vim/vimcolor/solarized-master/gedit/installer similarity index 100% rename from vimcolor/solarized-master/gedit/installer rename to .config/vim/vimcolor/solarized-master/gedit/installer diff --git a/vimcolor/solarized-master/gedit/solarized-dark.xml b/.config/vim/vimcolor/solarized-master/gedit/solarized-dark.xml similarity index 100% rename from vimcolor/solarized-master/gedit/solarized-dark.xml rename to .config/vim/vimcolor/solarized-master/gedit/solarized-dark.xml diff --git a/vimcolor/solarized-master/gedit/solarized-light.xml b/.config/vim/vimcolor/solarized-master/gedit/solarized-light.xml similarity index 100% rename from vimcolor/solarized-master/gedit/solarized-light.xml rename to .config/vim/vimcolor/solarized-master/gedit/solarized-light.xml diff --git a/vimcolor/solarized-master/gimp-palette-solarized/README.md b/.config/vim/vimcolor/solarized-master/gimp-palette-solarized/README.md similarity index 100% rename from vimcolor/solarized-master/gimp-palette-solarized/README.md rename to .config/vim/vimcolor/solarized-master/gimp-palette-solarized/README.md diff --git a/vimcolor/solarized-master/gimp-palette-solarized/solarized.gpl b/.config/vim/vimcolor/solarized-master/gimp-palette-solarized/solarized.gpl similarity index 100% rename from vimcolor/solarized-master/gimp-palette-solarized/solarized.gpl rename to .config/vim/vimcolor/solarized-master/gimp-palette-solarized/solarized.gpl diff --git a/vimcolor/solarized-master/img/andalemono14/index.html b/.config/vim/vimcolor/solarized-master/img/andalemono14/index.html similarity index 100% rename from vimcolor/solarized-master/img/andalemono14/index.html rename to .config/vim/vimcolor/solarized-master/img/andalemono14/index.html diff --git a/vimcolor/solarized-master/img/andalemono14/screen-c-dark-th.png b/.config/vim/vimcolor/solarized-master/img/andalemono14/screen-c-dark-th.png similarity index 100% rename from vimcolor/solarized-master/img/andalemono14/screen-c-dark-th.png rename to .config/vim/vimcolor/solarized-master/img/andalemono14/screen-c-dark-th.png diff --git a/vimcolor/solarized-master/img/andalemono14/screen-c-dark.png b/.config/vim/vimcolor/solarized-master/img/andalemono14/screen-c-dark.png similarity index 100% rename from vimcolor/solarized-master/img/andalemono14/screen-c-dark.png rename to .config/vim/vimcolor/solarized-master/img/andalemono14/screen-c-dark.png diff --git a/vimcolor/solarized-master/img/andalemono14/screen-c-light-th.png b/.config/vim/vimcolor/solarized-master/img/andalemono14/screen-c-light-th.png similarity index 100% rename from vimcolor/solarized-master/img/andalemono14/screen-c-light-th.png rename to .config/vim/vimcolor/solarized-master/img/andalemono14/screen-c-light-th.png diff --git a/vimcolor/solarized-master/img/andalemono14/screen-c-light.png b/.config/vim/vimcolor/solarized-master/img/andalemono14/screen-c-light.png similarity index 100% rename from vimcolor/solarized-master/img/andalemono14/screen-c-light.png rename to .config/vim/vimcolor/solarized-master/img/andalemono14/screen-c-light.png diff --git a/vimcolor/solarized-master/img/andalemono14/screen-haskell-dark-th.png b/.config/vim/vimcolor/solarized-master/img/andalemono14/screen-haskell-dark-th.png similarity index 100% rename from vimcolor/solarized-master/img/andalemono14/screen-haskell-dark-th.png rename to .config/vim/vimcolor/solarized-master/img/andalemono14/screen-haskell-dark-th.png diff --git a/vimcolor/solarized-master/img/andalemono14/screen-haskell-dark.png b/.config/vim/vimcolor/solarized-master/img/andalemono14/screen-haskell-dark.png similarity index 100% rename from vimcolor/solarized-master/img/andalemono14/screen-haskell-dark.png rename to .config/vim/vimcolor/solarized-master/img/andalemono14/screen-haskell-dark.png diff --git a/vimcolor/solarized-master/img/andalemono14/screen-haskell-light-th.png b/.config/vim/vimcolor/solarized-master/img/andalemono14/screen-haskell-light-th.png similarity index 100% rename from vimcolor/solarized-master/img/andalemono14/screen-haskell-light-th.png rename to .config/vim/vimcolor/solarized-master/img/andalemono14/screen-haskell-light-th.png diff --git a/vimcolor/solarized-master/img/andalemono14/screen-haskell-light.png b/.config/vim/vimcolor/solarized-master/img/andalemono14/screen-haskell-light.png similarity index 100% rename from vimcolor/solarized-master/img/andalemono14/screen-haskell-light.png rename to .config/vim/vimcolor/solarized-master/img/andalemono14/screen-haskell-light.png diff --git a/vimcolor/solarized-master/img/andalemono14/screen-html-dark-th.png b/.config/vim/vimcolor/solarized-master/img/andalemono14/screen-html-dark-th.png similarity index 100% rename from vimcolor/solarized-master/img/andalemono14/screen-html-dark-th.png rename to .config/vim/vimcolor/solarized-master/img/andalemono14/screen-html-dark-th.png diff --git a/vimcolor/solarized-master/img/andalemono14/screen-html-dark.png b/.config/vim/vimcolor/solarized-master/img/andalemono14/screen-html-dark.png similarity index 100% rename from vimcolor/solarized-master/img/andalemono14/screen-html-dark.png rename to .config/vim/vimcolor/solarized-master/img/andalemono14/screen-html-dark.png diff --git a/vimcolor/solarized-master/img/andalemono14/screen-html-light-th.png b/.config/vim/vimcolor/solarized-master/img/andalemono14/screen-html-light-th.png similarity index 100% rename from vimcolor/solarized-master/img/andalemono14/screen-html-light-th.png rename to .config/vim/vimcolor/solarized-master/img/andalemono14/screen-html-light-th.png diff --git a/vimcolor/solarized-master/img/andalemono14/screen-html-light.png b/.config/vim/vimcolor/solarized-master/img/andalemono14/screen-html-light.png similarity index 100% rename from vimcolor/solarized-master/img/andalemono14/screen-html-light.png rename to .config/vim/vimcolor/solarized-master/img/andalemono14/screen-html-light.png diff --git a/vimcolor/solarized-master/img/andalemono14/screen-java-dark-th.png b/.config/vim/vimcolor/solarized-master/img/andalemono14/screen-java-dark-th.png similarity index 100% rename from vimcolor/solarized-master/img/andalemono14/screen-java-dark-th.png rename to .config/vim/vimcolor/solarized-master/img/andalemono14/screen-java-dark-th.png diff --git a/vimcolor/solarized-master/img/andalemono14/screen-java-dark.png b/.config/vim/vimcolor/solarized-master/img/andalemono14/screen-java-dark.png similarity index 100% rename from vimcolor/solarized-master/img/andalemono14/screen-java-dark.png rename to .config/vim/vimcolor/solarized-master/img/andalemono14/screen-java-dark.png diff --git a/vimcolor/solarized-master/img/andalemono14/screen-java-light-th.png b/.config/vim/vimcolor/solarized-master/img/andalemono14/screen-java-light-th.png similarity index 100% rename from vimcolor/solarized-master/img/andalemono14/screen-java-light-th.png rename to .config/vim/vimcolor/solarized-master/img/andalemono14/screen-java-light-th.png diff --git a/vimcolor/solarized-master/img/andalemono14/screen-java-light.png b/.config/vim/vimcolor/solarized-master/img/andalemono14/screen-java-light.png similarity index 100% rename from vimcolor/solarized-master/img/andalemono14/screen-java-light.png rename to .config/vim/vimcolor/solarized-master/img/andalemono14/screen-java-light.png diff --git a/vimcolor/solarized-master/img/andalemono14/screen-javascript-dark-th.png b/.config/vim/vimcolor/solarized-master/img/andalemono14/screen-javascript-dark-th.png similarity index 100% rename from vimcolor/solarized-master/img/andalemono14/screen-javascript-dark-th.png rename to .config/vim/vimcolor/solarized-master/img/andalemono14/screen-javascript-dark-th.png diff --git a/vimcolor/solarized-master/img/andalemono14/screen-javascript-dark.png b/.config/vim/vimcolor/solarized-master/img/andalemono14/screen-javascript-dark.png similarity index 100% rename from vimcolor/solarized-master/img/andalemono14/screen-javascript-dark.png rename to .config/vim/vimcolor/solarized-master/img/andalemono14/screen-javascript-dark.png diff --git a/vimcolor/solarized-master/img/andalemono14/screen-javascript-light-th.png b/.config/vim/vimcolor/solarized-master/img/andalemono14/screen-javascript-light-th.png similarity index 100% rename from vimcolor/solarized-master/img/andalemono14/screen-javascript-light-th.png rename to .config/vim/vimcolor/solarized-master/img/andalemono14/screen-javascript-light-th.png diff --git a/vimcolor/solarized-master/img/andalemono14/screen-javascript-light.png b/.config/vim/vimcolor/solarized-master/img/andalemono14/screen-javascript-light.png similarity index 100% rename from vimcolor/solarized-master/img/andalemono14/screen-javascript-light.png rename to .config/vim/vimcolor/solarized-master/img/andalemono14/screen-javascript-light.png diff --git a/vimcolor/solarized-master/img/andalemono14/screen-pandoc-dark-th.png b/.config/vim/vimcolor/solarized-master/img/andalemono14/screen-pandoc-dark-th.png similarity index 100% rename from vimcolor/solarized-master/img/andalemono14/screen-pandoc-dark-th.png rename to .config/vim/vimcolor/solarized-master/img/andalemono14/screen-pandoc-dark-th.png diff --git a/vimcolor/solarized-master/img/andalemono14/screen-pandoc-dark.png b/.config/vim/vimcolor/solarized-master/img/andalemono14/screen-pandoc-dark.png similarity index 100% rename from vimcolor/solarized-master/img/andalemono14/screen-pandoc-dark.png rename to .config/vim/vimcolor/solarized-master/img/andalemono14/screen-pandoc-dark.png diff --git a/vimcolor/solarized-master/img/andalemono14/screen-pandoc-light-th.png b/.config/vim/vimcolor/solarized-master/img/andalemono14/screen-pandoc-light-th.png similarity index 100% rename from vimcolor/solarized-master/img/andalemono14/screen-pandoc-light-th.png rename to .config/vim/vimcolor/solarized-master/img/andalemono14/screen-pandoc-light-th.png diff --git a/vimcolor/solarized-master/img/andalemono14/screen-pandoc-light.png b/.config/vim/vimcolor/solarized-master/img/andalemono14/screen-pandoc-light.png similarity index 100% rename from vimcolor/solarized-master/img/andalemono14/screen-pandoc-light.png rename to .config/vim/vimcolor/solarized-master/img/andalemono14/screen-pandoc-light.png diff --git a/vimcolor/solarized-master/img/andalemono14/screen-perl-dark-th.png b/.config/vim/vimcolor/solarized-master/img/andalemono14/screen-perl-dark-th.png similarity index 100% rename from vimcolor/solarized-master/img/andalemono14/screen-perl-dark-th.png rename to .config/vim/vimcolor/solarized-master/img/andalemono14/screen-perl-dark-th.png diff --git a/vimcolor/solarized-master/img/andalemono14/screen-perl-dark.png b/.config/vim/vimcolor/solarized-master/img/andalemono14/screen-perl-dark.png similarity index 100% rename from vimcolor/solarized-master/img/andalemono14/screen-perl-dark.png rename to .config/vim/vimcolor/solarized-master/img/andalemono14/screen-perl-dark.png diff --git a/vimcolor/solarized-master/img/andalemono14/screen-perl-light-th.png b/.config/vim/vimcolor/solarized-master/img/andalemono14/screen-perl-light-th.png similarity index 100% rename from vimcolor/solarized-master/img/andalemono14/screen-perl-light-th.png rename to .config/vim/vimcolor/solarized-master/img/andalemono14/screen-perl-light-th.png diff --git a/vimcolor/solarized-master/img/andalemono14/screen-perl-light.png b/.config/vim/vimcolor/solarized-master/img/andalemono14/screen-perl-light.png similarity index 100% rename from vimcolor/solarized-master/img/andalemono14/screen-perl-light.png rename to .config/vim/vimcolor/solarized-master/img/andalemono14/screen-perl-light.png diff --git a/vimcolor/solarized-master/img/andalemono14/screen-php-dark-th.png b/.config/vim/vimcolor/solarized-master/img/andalemono14/screen-php-dark-th.png similarity index 100% rename from vimcolor/solarized-master/img/andalemono14/screen-php-dark-th.png rename to .config/vim/vimcolor/solarized-master/img/andalemono14/screen-php-dark-th.png diff --git a/vimcolor/solarized-master/img/andalemono14/screen-php-dark.png b/.config/vim/vimcolor/solarized-master/img/andalemono14/screen-php-dark.png similarity index 100% rename from vimcolor/solarized-master/img/andalemono14/screen-php-dark.png rename to .config/vim/vimcolor/solarized-master/img/andalemono14/screen-php-dark.png diff --git a/vimcolor/solarized-master/img/andalemono14/screen-php-light-th.png b/.config/vim/vimcolor/solarized-master/img/andalemono14/screen-php-light-th.png similarity index 100% rename from vimcolor/solarized-master/img/andalemono14/screen-php-light-th.png rename to .config/vim/vimcolor/solarized-master/img/andalemono14/screen-php-light-th.png diff --git a/vimcolor/solarized-master/img/andalemono14/screen-php-light.png b/.config/vim/vimcolor/solarized-master/img/andalemono14/screen-php-light.png similarity index 100% rename from vimcolor/solarized-master/img/andalemono14/screen-php-light.png rename to .config/vim/vimcolor/solarized-master/img/andalemono14/screen-php-light.png diff --git a/vimcolor/solarized-master/img/andalemono14/screen-python-dark-th.png b/.config/vim/vimcolor/solarized-master/img/andalemono14/screen-python-dark-th.png similarity index 100% rename from vimcolor/solarized-master/img/andalemono14/screen-python-dark-th.png rename to .config/vim/vimcolor/solarized-master/img/andalemono14/screen-python-dark-th.png diff --git a/vimcolor/solarized-master/img/andalemono14/screen-python-dark.png b/.config/vim/vimcolor/solarized-master/img/andalemono14/screen-python-dark.png similarity index 100% rename from vimcolor/solarized-master/img/andalemono14/screen-python-dark.png rename to .config/vim/vimcolor/solarized-master/img/andalemono14/screen-python-dark.png diff --git a/vimcolor/solarized-master/img/andalemono14/screen-python-light-th.png b/.config/vim/vimcolor/solarized-master/img/andalemono14/screen-python-light-th.png similarity index 100% rename from vimcolor/solarized-master/img/andalemono14/screen-python-light-th.png rename to .config/vim/vimcolor/solarized-master/img/andalemono14/screen-python-light-th.png diff --git a/vimcolor/solarized-master/img/andalemono14/screen-python-light.png b/.config/vim/vimcolor/solarized-master/img/andalemono14/screen-python-light.png similarity index 100% rename from vimcolor/solarized-master/img/andalemono14/screen-python-light.png rename to .config/vim/vimcolor/solarized-master/img/andalemono14/screen-python-light.png diff --git a/vimcolor/solarized-master/img/andalemono14/screen-ruby-dark-th.png b/.config/vim/vimcolor/solarized-master/img/andalemono14/screen-ruby-dark-th.png similarity index 100% rename from vimcolor/solarized-master/img/andalemono14/screen-ruby-dark-th.png rename to .config/vim/vimcolor/solarized-master/img/andalemono14/screen-ruby-dark-th.png diff --git a/vimcolor/solarized-master/img/andalemono14/screen-ruby-dark.png b/.config/vim/vimcolor/solarized-master/img/andalemono14/screen-ruby-dark.png similarity index 100% rename from vimcolor/solarized-master/img/andalemono14/screen-ruby-dark.png rename to .config/vim/vimcolor/solarized-master/img/andalemono14/screen-ruby-dark.png diff --git a/vimcolor/solarized-master/img/andalemono14/screen-ruby-light-th.png b/.config/vim/vimcolor/solarized-master/img/andalemono14/screen-ruby-light-th.png similarity index 100% rename from vimcolor/solarized-master/img/andalemono14/screen-ruby-light-th.png rename to .config/vim/vimcolor/solarized-master/img/andalemono14/screen-ruby-light-th.png diff --git a/vimcolor/solarized-master/img/andalemono14/screen-ruby-light.png b/.config/vim/vimcolor/solarized-master/img/andalemono14/screen-ruby-light.png similarity index 100% rename from vimcolor/solarized-master/img/andalemono14/screen-ruby-light.png rename to .config/vim/vimcolor/solarized-master/img/andalemono14/screen-ruby-light.png diff --git a/vimcolor/solarized-master/img/andalemono14/screen-shell-dark-th.png b/.config/vim/vimcolor/solarized-master/img/andalemono14/screen-shell-dark-th.png similarity index 100% rename from vimcolor/solarized-master/img/andalemono14/screen-shell-dark-th.png rename to .config/vim/vimcolor/solarized-master/img/andalemono14/screen-shell-dark-th.png diff --git a/vimcolor/solarized-master/img/andalemono14/screen-shell-dark.png b/.config/vim/vimcolor/solarized-master/img/andalemono14/screen-shell-dark.png similarity index 100% rename from vimcolor/solarized-master/img/andalemono14/screen-shell-dark.png rename to .config/vim/vimcolor/solarized-master/img/andalemono14/screen-shell-dark.png diff --git a/vimcolor/solarized-master/img/andalemono14/screen-shell-light-th.png b/.config/vim/vimcolor/solarized-master/img/andalemono14/screen-shell-light-th.png similarity index 100% rename from vimcolor/solarized-master/img/andalemono14/screen-shell-light-th.png rename to .config/vim/vimcolor/solarized-master/img/andalemono14/screen-shell-light-th.png diff --git a/vimcolor/solarized-master/img/andalemono14/screen-shell-light.png b/.config/vim/vimcolor/solarized-master/img/andalemono14/screen-shell-light.png similarity index 100% rename from vimcolor/solarized-master/img/andalemono14/screen-shell-light.png rename to .config/vim/vimcolor/solarized-master/img/andalemono14/screen-shell-light.png diff --git a/vimcolor/solarized-master/img/andalemono14/screen-tex-dark-th.png b/.config/vim/vimcolor/solarized-master/img/andalemono14/screen-tex-dark-th.png similarity index 100% rename from vimcolor/solarized-master/img/andalemono14/screen-tex-dark-th.png rename to .config/vim/vimcolor/solarized-master/img/andalemono14/screen-tex-dark-th.png diff --git a/vimcolor/solarized-master/img/andalemono14/screen-tex-dark.png b/.config/vim/vimcolor/solarized-master/img/andalemono14/screen-tex-dark.png similarity index 100% rename from vimcolor/solarized-master/img/andalemono14/screen-tex-dark.png rename to .config/vim/vimcolor/solarized-master/img/andalemono14/screen-tex-dark.png diff --git a/vimcolor/solarized-master/img/andalemono14/screen-tex-light-th.png b/.config/vim/vimcolor/solarized-master/img/andalemono14/screen-tex-light-th.png similarity index 100% rename from vimcolor/solarized-master/img/andalemono14/screen-tex-light-th.png rename to .config/vim/vimcolor/solarized-master/img/andalemono14/screen-tex-light-th.png diff --git a/vimcolor/solarized-master/img/andalemono14/screen-tex-light.png b/.config/vim/vimcolor/solarized-master/img/andalemono14/screen-tex-light.png similarity index 100% rename from vimcolor/solarized-master/img/andalemono14/screen-tex-light.png rename to .config/vim/vimcolor/solarized-master/img/andalemono14/screen-tex-light.png diff --git a/vimcolor/solarized-master/img/dejavusans14/index.html b/.config/vim/vimcolor/solarized-master/img/dejavusans14/index.html similarity index 100% rename from vimcolor/solarized-master/img/dejavusans14/index.html rename to .config/vim/vimcolor/solarized-master/img/dejavusans14/index.html diff --git a/vimcolor/solarized-master/img/dejavusans14/screen-c-dark-th.png b/.config/vim/vimcolor/solarized-master/img/dejavusans14/screen-c-dark-th.png similarity index 100% rename from vimcolor/solarized-master/img/dejavusans14/screen-c-dark-th.png rename to .config/vim/vimcolor/solarized-master/img/dejavusans14/screen-c-dark-th.png diff --git a/vimcolor/solarized-master/img/dejavusans14/screen-c-dark.png b/.config/vim/vimcolor/solarized-master/img/dejavusans14/screen-c-dark.png similarity index 100% rename from vimcolor/solarized-master/img/dejavusans14/screen-c-dark.png rename to .config/vim/vimcolor/solarized-master/img/dejavusans14/screen-c-dark.png diff --git a/vimcolor/solarized-master/img/dejavusans14/screen-c-light-th.png b/.config/vim/vimcolor/solarized-master/img/dejavusans14/screen-c-light-th.png similarity index 100% rename from vimcolor/solarized-master/img/dejavusans14/screen-c-light-th.png rename to .config/vim/vimcolor/solarized-master/img/dejavusans14/screen-c-light-th.png diff --git a/vimcolor/solarized-master/img/dejavusans14/screen-c-light.png b/.config/vim/vimcolor/solarized-master/img/dejavusans14/screen-c-light.png similarity index 100% rename from vimcolor/solarized-master/img/dejavusans14/screen-c-light.png rename to .config/vim/vimcolor/solarized-master/img/dejavusans14/screen-c-light.png diff --git a/vimcolor/solarized-master/img/dejavusans14/screen-haskell-dark-th.png b/.config/vim/vimcolor/solarized-master/img/dejavusans14/screen-haskell-dark-th.png similarity index 100% rename from vimcolor/solarized-master/img/dejavusans14/screen-haskell-dark-th.png rename to .config/vim/vimcolor/solarized-master/img/dejavusans14/screen-haskell-dark-th.png diff --git a/vimcolor/solarized-master/img/dejavusans14/screen-haskell-dark.png b/.config/vim/vimcolor/solarized-master/img/dejavusans14/screen-haskell-dark.png similarity index 100% rename from vimcolor/solarized-master/img/dejavusans14/screen-haskell-dark.png rename to .config/vim/vimcolor/solarized-master/img/dejavusans14/screen-haskell-dark.png diff --git a/vimcolor/solarized-master/img/dejavusans14/screen-haskell-light-th.png b/.config/vim/vimcolor/solarized-master/img/dejavusans14/screen-haskell-light-th.png similarity index 100% rename from vimcolor/solarized-master/img/dejavusans14/screen-haskell-light-th.png rename to .config/vim/vimcolor/solarized-master/img/dejavusans14/screen-haskell-light-th.png diff --git a/vimcolor/solarized-master/img/dejavusans14/screen-haskell-light.png b/.config/vim/vimcolor/solarized-master/img/dejavusans14/screen-haskell-light.png similarity index 100% rename from vimcolor/solarized-master/img/dejavusans14/screen-haskell-light.png rename to .config/vim/vimcolor/solarized-master/img/dejavusans14/screen-haskell-light.png diff --git a/vimcolor/solarized-master/img/dejavusans14/screen-html-dark-th.png b/.config/vim/vimcolor/solarized-master/img/dejavusans14/screen-html-dark-th.png similarity index 100% rename from vimcolor/solarized-master/img/dejavusans14/screen-html-dark-th.png rename to .config/vim/vimcolor/solarized-master/img/dejavusans14/screen-html-dark-th.png diff --git a/vimcolor/solarized-master/img/dejavusans14/screen-html-dark.png b/.config/vim/vimcolor/solarized-master/img/dejavusans14/screen-html-dark.png similarity index 100% rename from vimcolor/solarized-master/img/dejavusans14/screen-html-dark.png rename to .config/vim/vimcolor/solarized-master/img/dejavusans14/screen-html-dark.png diff --git a/vimcolor/solarized-master/img/dejavusans14/screen-html-light-th.png b/.config/vim/vimcolor/solarized-master/img/dejavusans14/screen-html-light-th.png similarity index 100% rename from vimcolor/solarized-master/img/dejavusans14/screen-html-light-th.png rename to .config/vim/vimcolor/solarized-master/img/dejavusans14/screen-html-light-th.png diff --git a/vimcolor/solarized-master/img/dejavusans14/screen-html-light.png b/.config/vim/vimcolor/solarized-master/img/dejavusans14/screen-html-light.png similarity index 100% rename from vimcolor/solarized-master/img/dejavusans14/screen-html-light.png rename to .config/vim/vimcolor/solarized-master/img/dejavusans14/screen-html-light.png diff --git a/vimcolor/solarized-master/img/dejavusans14/screen-java-dark-th.png b/.config/vim/vimcolor/solarized-master/img/dejavusans14/screen-java-dark-th.png similarity index 100% rename from vimcolor/solarized-master/img/dejavusans14/screen-java-dark-th.png rename to .config/vim/vimcolor/solarized-master/img/dejavusans14/screen-java-dark-th.png diff --git a/vimcolor/solarized-master/img/dejavusans14/screen-java-dark.png b/.config/vim/vimcolor/solarized-master/img/dejavusans14/screen-java-dark.png similarity index 100% rename from vimcolor/solarized-master/img/dejavusans14/screen-java-dark.png rename to .config/vim/vimcolor/solarized-master/img/dejavusans14/screen-java-dark.png diff --git a/vimcolor/solarized-master/img/dejavusans14/screen-java-light-th.png b/.config/vim/vimcolor/solarized-master/img/dejavusans14/screen-java-light-th.png similarity index 100% rename from vimcolor/solarized-master/img/dejavusans14/screen-java-light-th.png rename to .config/vim/vimcolor/solarized-master/img/dejavusans14/screen-java-light-th.png diff --git a/vimcolor/solarized-master/img/dejavusans14/screen-java-light.png b/.config/vim/vimcolor/solarized-master/img/dejavusans14/screen-java-light.png similarity index 100% rename from vimcolor/solarized-master/img/dejavusans14/screen-java-light.png rename to .config/vim/vimcolor/solarized-master/img/dejavusans14/screen-java-light.png diff --git a/vimcolor/solarized-master/img/dejavusans14/screen-javascript-dark-th.png b/.config/vim/vimcolor/solarized-master/img/dejavusans14/screen-javascript-dark-th.png similarity index 100% rename from vimcolor/solarized-master/img/dejavusans14/screen-javascript-dark-th.png rename to .config/vim/vimcolor/solarized-master/img/dejavusans14/screen-javascript-dark-th.png diff --git a/vimcolor/solarized-master/img/dejavusans14/screen-javascript-dark.png b/.config/vim/vimcolor/solarized-master/img/dejavusans14/screen-javascript-dark.png similarity index 100% rename from vimcolor/solarized-master/img/dejavusans14/screen-javascript-dark.png rename to .config/vim/vimcolor/solarized-master/img/dejavusans14/screen-javascript-dark.png diff --git a/vimcolor/solarized-master/img/dejavusans14/screen-javascript-light-th.png b/.config/vim/vimcolor/solarized-master/img/dejavusans14/screen-javascript-light-th.png similarity index 100% rename from vimcolor/solarized-master/img/dejavusans14/screen-javascript-light-th.png rename to .config/vim/vimcolor/solarized-master/img/dejavusans14/screen-javascript-light-th.png diff --git a/vimcolor/solarized-master/img/dejavusans14/screen-javascript-light.png b/.config/vim/vimcolor/solarized-master/img/dejavusans14/screen-javascript-light.png similarity index 100% rename from vimcolor/solarized-master/img/dejavusans14/screen-javascript-light.png rename to .config/vim/vimcolor/solarized-master/img/dejavusans14/screen-javascript-light.png diff --git a/vimcolor/solarized-master/img/dejavusans14/screen-pandoc-dark-th.png b/.config/vim/vimcolor/solarized-master/img/dejavusans14/screen-pandoc-dark-th.png similarity index 100% rename from vimcolor/solarized-master/img/dejavusans14/screen-pandoc-dark-th.png rename to .config/vim/vimcolor/solarized-master/img/dejavusans14/screen-pandoc-dark-th.png diff --git a/vimcolor/solarized-master/img/dejavusans14/screen-pandoc-dark.png b/.config/vim/vimcolor/solarized-master/img/dejavusans14/screen-pandoc-dark.png similarity index 100% rename from vimcolor/solarized-master/img/dejavusans14/screen-pandoc-dark.png rename to .config/vim/vimcolor/solarized-master/img/dejavusans14/screen-pandoc-dark.png diff --git a/vimcolor/solarized-master/img/dejavusans14/screen-pandoc-light-th.png b/.config/vim/vimcolor/solarized-master/img/dejavusans14/screen-pandoc-light-th.png similarity index 100% rename from vimcolor/solarized-master/img/dejavusans14/screen-pandoc-light-th.png rename to .config/vim/vimcolor/solarized-master/img/dejavusans14/screen-pandoc-light-th.png diff --git a/vimcolor/solarized-master/img/dejavusans14/screen-pandoc-light.png b/.config/vim/vimcolor/solarized-master/img/dejavusans14/screen-pandoc-light.png similarity index 100% rename from vimcolor/solarized-master/img/dejavusans14/screen-pandoc-light.png rename to .config/vim/vimcolor/solarized-master/img/dejavusans14/screen-pandoc-light.png diff --git a/vimcolor/solarized-master/img/dejavusans14/screen-perl-dark-th.png b/.config/vim/vimcolor/solarized-master/img/dejavusans14/screen-perl-dark-th.png similarity index 100% rename from vimcolor/solarized-master/img/dejavusans14/screen-perl-dark-th.png rename to .config/vim/vimcolor/solarized-master/img/dejavusans14/screen-perl-dark-th.png diff --git a/vimcolor/solarized-master/img/dejavusans14/screen-perl-dark.png b/.config/vim/vimcolor/solarized-master/img/dejavusans14/screen-perl-dark.png similarity index 100% rename from vimcolor/solarized-master/img/dejavusans14/screen-perl-dark.png rename to .config/vim/vimcolor/solarized-master/img/dejavusans14/screen-perl-dark.png diff --git a/vimcolor/solarized-master/img/dejavusans14/screen-perl-light-th.png b/.config/vim/vimcolor/solarized-master/img/dejavusans14/screen-perl-light-th.png similarity index 100% rename from vimcolor/solarized-master/img/dejavusans14/screen-perl-light-th.png rename to .config/vim/vimcolor/solarized-master/img/dejavusans14/screen-perl-light-th.png diff --git a/vimcolor/solarized-master/img/dejavusans14/screen-perl-light.png b/.config/vim/vimcolor/solarized-master/img/dejavusans14/screen-perl-light.png similarity index 100% rename from vimcolor/solarized-master/img/dejavusans14/screen-perl-light.png rename to .config/vim/vimcolor/solarized-master/img/dejavusans14/screen-perl-light.png diff --git a/vimcolor/solarized-master/img/dejavusans14/screen-php-dark-th.png b/.config/vim/vimcolor/solarized-master/img/dejavusans14/screen-php-dark-th.png similarity index 100% rename from vimcolor/solarized-master/img/dejavusans14/screen-php-dark-th.png rename to .config/vim/vimcolor/solarized-master/img/dejavusans14/screen-php-dark-th.png diff --git a/vimcolor/solarized-master/img/dejavusans14/screen-php-dark.png b/.config/vim/vimcolor/solarized-master/img/dejavusans14/screen-php-dark.png similarity index 100% rename from vimcolor/solarized-master/img/dejavusans14/screen-php-dark.png rename to .config/vim/vimcolor/solarized-master/img/dejavusans14/screen-php-dark.png diff --git a/vimcolor/solarized-master/img/dejavusans14/screen-php-light-th.png b/.config/vim/vimcolor/solarized-master/img/dejavusans14/screen-php-light-th.png similarity index 100% rename from vimcolor/solarized-master/img/dejavusans14/screen-php-light-th.png rename to .config/vim/vimcolor/solarized-master/img/dejavusans14/screen-php-light-th.png diff --git a/vimcolor/solarized-master/img/dejavusans14/screen-php-light.png b/.config/vim/vimcolor/solarized-master/img/dejavusans14/screen-php-light.png similarity index 100% rename from vimcolor/solarized-master/img/dejavusans14/screen-php-light.png rename to .config/vim/vimcolor/solarized-master/img/dejavusans14/screen-php-light.png diff --git a/vimcolor/solarized-master/img/dejavusans14/screen-python-dark-th.png b/.config/vim/vimcolor/solarized-master/img/dejavusans14/screen-python-dark-th.png similarity index 100% rename from vimcolor/solarized-master/img/dejavusans14/screen-python-dark-th.png rename to .config/vim/vimcolor/solarized-master/img/dejavusans14/screen-python-dark-th.png diff --git a/vimcolor/solarized-master/img/dejavusans14/screen-python-dark.png b/.config/vim/vimcolor/solarized-master/img/dejavusans14/screen-python-dark.png similarity index 100% rename from vimcolor/solarized-master/img/dejavusans14/screen-python-dark.png rename to .config/vim/vimcolor/solarized-master/img/dejavusans14/screen-python-dark.png diff --git a/vimcolor/solarized-master/img/dejavusans14/screen-python-light-th.png b/.config/vim/vimcolor/solarized-master/img/dejavusans14/screen-python-light-th.png similarity index 100% rename from vimcolor/solarized-master/img/dejavusans14/screen-python-light-th.png rename to .config/vim/vimcolor/solarized-master/img/dejavusans14/screen-python-light-th.png diff --git a/vimcolor/solarized-master/img/dejavusans14/screen-python-light.png b/.config/vim/vimcolor/solarized-master/img/dejavusans14/screen-python-light.png similarity index 100% rename from vimcolor/solarized-master/img/dejavusans14/screen-python-light.png rename to .config/vim/vimcolor/solarized-master/img/dejavusans14/screen-python-light.png diff --git a/vimcolor/solarized-master/img/dejavusans14/screen-ruby-dark-th.png b/.config/vim/vimcolor/solarized-master/img/dejavusans14/screen-ruby-dark-th.png similarity index 100% rename from vimcolor/solarized-master/img/dejavusans14/screen-ruby-dark-th.png rename to .config/vim/vimcolor/solarized-master/img/dejavusans14/screen-ruby-dark-th.png diff --git a/vimcolor/solarized-master/img/dejavusans14/screen-ruby-dark.png b/.config/vim/vimcolor/solarized-master/img/dejavusans14/screen-ruby-dark.png similarity index 100% rename from vimcolor/solarized-master/img/dejavusans14/screen-ruby-dark.png rename to .config/vim/vimcolor/solarized-master/img/dejavusans14/screen-ruby-dark.png diff --git a/vimcolor/solarized-master/img/dejavusans14/screen-ruby-light-th.png b/.config/vim/vimcolor/solarized-master/img/dejavusans14/screen-ruby-light-th.png similarity index 100% rename from vimcolor/solarized-master/img/dejavusans14/screen-ruby-light-th.png rename to .config/vim/vimcolor/solarized-master/img/dejavusans14/screen-ruby-light-th.png diff --git a/vimcolor/solarized-master/img/dejavusans14/screen-ruby-light.png b/.config/vim/vimcolor/solarized-master/img/dejavusans14/screen-ruby-light.png similarity index 100% rename from vimcolor/solarized-master/img/dejavusans14/screen-ruby-light.png rename to .config/vim/vimcolor/solarized-master/img/dejavusans14/screen-ruby-light.png diff --git a/vimcolor/solarized-master/img/dejavusans14/screen-shell-dark-th.png b/.config/vim/vimcolor/solarized-master/img/dejavusans14/screen-shell-dark-th.png similarity index 100% rename from vimcolor/solarized-master/img/dejavusans14/screen-shell-dark-th.png rename to .config/vim/vimcolor/solarized-master/img/dejavusans14/screen-shell-dark-th.png diff --git a/vimcolor/solarized-master/img/dejavusans14/screen-shell-dark.png b/.config/vim/vimcolor/solarized-master/img/dejavusans14/screen-shell-dark.png similarity index 100% rename from vimcolor/solarized-master/img/dejavusans14/screen-shell-dark.png rename to .config/vim/vimcolor/solarized-master/img/dejavusans14/screen-shell-dark.png diff --git a/vimcolor/solarized-master/img/dejavusans14/screen-shell-light-th.png b/.config/vim/vimcolor/solarized-master/img/dejavusans14/screen-shell-light-th.png similarity index 100% rename from vimcolor/solarized-master/img/dejavusans14/screen-shell-light-th.png rename to .config/vim/vimcolor/solarized-master/img/dejavusans14/screen-shell-light-th.png diff --git a/vimcolor/solarized-master/img/dejavusans14/screen-shell-light.png b/.config/vim/vimcolor/solarized-master/img/dejavusans14/screen-shell-light.png similarity index 100% rename from vimcolor/solarized-master/img/dejavusans14/screen-shell-light.png rename to .config/vim/vimcolor/solarized-master/img/dejavusans14/screen-shell-light.png diff --git a/vimcolor/solarized-master/img/dejavusans14/screen-tex-dark-th.png b/.config/vim/vimcolor/solarized-master/img/dejavusans14/screen-tex-dark-th.png similarity index 100% rename from vimcolor/solarized-master/img/dejavusans14/screen-tex-dark-th.png rename to .config/vim/vimcolor/solarized-master/img/dejavusans14/screen-tex-dark-th.png diff --git a/vimcolor/solarized-master/img/dejavusans14/screen-tex-dark.png b/.config/vim/vimcolor/solarized-master/img/dejavusans14/screen-tex-dark.png similarity index 100% rename from vimcolor/solarized-master/img/dejavusans14/screen-tex-dark.png rename to .config/vim/vimcolor/solarized-master/img/dejavusans14/screen-tex-dark.png diff --git a/vimcolor/solarized-master/img/dejavusans14/screen-tex-light-th.png b/.config/vim/vimcolor/solarized-master/img/dejavusans14/screen-tex-light-th.png similarity index 100% rename from vimcolor/solarized-master/img/dejavusans14/screen-tex-light-th.png rename to .config/vim/vimcolor/solarized-master/img/dejavusans14/screen-tex-light-th.png diff --git a/vimcolor/solarized-master/img/dejavusans14/screen-tex-light.png b/.config/vim/vimcolor/solarized-master/img/dejavusans14/screen-tex-light.png similarity index 100% rename from vimcolor/solarized-master/img/dejavusans14/screen-tex-light.png rename to .config/vim/vimcolor/solarized-master/img/dejavusans14/screen-tex-light.png diff --git a/vimcolor/solarized-master/img/dejavusans18/index.html b/.config/vim/vimcolor/solarized-master/img/dejavusans18/index.html similarity index 100% rename from vimcolor/solarized-master/img/dejavusans18/index.html rename to .config/vim/vimcolor/solarized-master/img/dejavusans18/index.html diff --git a/vimcolor/solarized-master/img/dejavusans18/screen-c-dark-th.png b/.config/vim/vimcolor/solarized-master/img/dejavusans18/screen-c-dark-th.png similarity index 100% rename from vimcolor/solarized-master/img/dejavusans18/screen-c-dark-th.png rename to .config/vim/vimcolor/solarized-master/img/dejavusans18/screen-c-dark-th.png diff --git a/vimcolor/solarized-master/img/dejavusans18/screen-c-dark.png b/.config/vim/vimcolor/solarized-master/img/dejavusans18/screen-c-dark.png similarity index 100% rename from vimcolor/solarized-master/img/dejavusans18/screen-c-dark.png rename to .config/vim/vimcolor/solarized-master/img/dejavusans18/screen-c-dark.png diff --git a/vimcolor/solarized-master/img/dejavusans18/screen-c-light-th.png b/.config/vim/vimcolor/solarized-master/img/dejavusans18/screen-c-light-th.png similarity index 100% rename from vimcolor/solarized-master/img/dejavusans18/screen-c-light-th.png rename to .config/vim/vimcolor/solarized-master/img/dejavusans18/screen-c-light-th.png diff --git a/vimcolor/solarized-master/img/dejavusans18/screen-c-light.png b/.config/vim/vimcolor/solarized-master/img/dejavusans18/screen-c-light.png similarity index 100% rename from vimcolor/solarized-master/img/dejavusans18/screen-c-light.png rename to .config/vim/vimcolor/solarized-master/img/dejavusans18/screen-c-light.png diff --git a/vimcolor/solarized-master/img/dejavusans18/screen-haskell-dark-th.png b/.config/vim/vimcolor/solarized-master/img/dejavusans18/screen-haskell-dark-th.png similarity index 100% rename from vimcolor/solarized-master/img/dejavusans18/screen-haskell-dark-th.png rename to .config/vim/vimcolor/solarized-master/img/dejavusans18/screen-haskell-dark-th.png diff --git a/vimcolor/solarized-master/img/dejavusans18/screen-haskell-dark.png b/.config/vim/vimcolor/solarized-master/img/dejavusans18/screen-haskell-dark.png similarity index 100% rename from vimcolor/solarized-master/img/dejavusans18/screen-haskell-dark.png rename to .config/vim/vimcolor/solarized-master/img/dejavusans18/screen-haskell-dark.png diff --git a/vimcolor/solarized-master/img/dejavusans18/screen-haskell-light-th.png b/.config/vim/vimcolor/solarized-master/img/dejavusans18/screen-haskell-light-th.png similarity index 100% rename from vimcolor/solarized-master/img/dejavusans18/screen-haskell-light-th.png rename to .config/vim/vimcolor/solarized-master/img/dejavusans18/screen-haskell-light-th.png diff --git a/vimcolor/solarized-master/img/dejavusans18/screen-haskell-light.png b/.config/vim/vimcolor/solarized-master/img/dejavusans18/screen-haskell-light.png similarity index 100% rename from vimcolor/solarized-master/img/dejavusans18/screen-haskell-light.png rename to .config/vim/vimcolor/solarized-master/img/dejavusans18/screen-haskell-light.png diff --git a/vimcolor/solarized-master/img/dejavusans18/screen-html-dark-th.png b/.config/vim/vimcolor/solarized-master/img/dejavusans18/screen-html-dark-th.png similarity index 100% rename from vimcolor/solarized-master/img/dejavusans18/screen-html-dark-th.png rename to .config/vim/vimcolor/solarized-master/img/dejavusans18/screen-html-dark-th.png diff --git a/vimcolor/solarized-master/img/dejavusans18/screen-html-dark.png b/.config/vim/vimcolor/solarized-master/img/dejavusans18/screen-html-dark.png similarity index 100% rename from vimcolor/solarized-master/img/dejavusans18/screen-html-dark.png rename to .config/vim/vimcolor/solarized-master/img/dejavusans18/screen-html-dark.png diff --git a/vimcolor/solarized-master/img/dejavusans18/screen-html-light-th.png b/.config/vim/vimcolor/solarized-master/img/dejavusans18/screen-html-light-th.png similarity index 100% rename from vimcolor/solarized-master/img/dejavusans18/screen-html-light-th.png rename to .config/vim/vimcolor/solarized-master/img/dejavusans18/screen-html-light-th.png diff --git a/vimcolor/solarized-master/img/dejavusans18/screen-html-light.png b/.config/vim/vimcolor/solarized-master/img/dejavusans18/screen-html-light.png similarity index 100% rename from vimcolor/solarized-master/img/dejavusans18/screen-html-light.png rename to .config/vim/vimcolor/solarized-master/img/dejavusans18/screen-html-light.png diff --git a/vimcolor/solarized-master/img/dejavusans18/screen-java-dark-th.png b/.config/vim/vimcolor/solarized-master/img/dejavusans18/screen-java-dark-th.png similarity index 100% rename from vimcolor/solarized-master/img/dejavusans18/screen-java-dark-th.png rename to .config/vim/vimcolor/solarized-master/img/dejavusans18/screen-java-dark-th.png diff --git a/vimcolor/solarized-master/img/dejavusans18/screen-java-dark.png b/.config/vim/vimcolor/solarized-master/img/dejavusans18/screen-java-dark.png similarity index 100% rename from vimcolor/solarized-master/img/dejavusans18/screen-java-dark.png rename to .config/vim/vimcolor/solarized-master/img/dejavusans18/screen-java-dark.png diff --git a/vimcolor/solarized-master/img/dejavusans18/screen-java-light-th.png b/.config/vim/vimcolor/solarized-master/img/dejavusans18/screen-java-light-th.png similarity index 100% rename from vimcolor/solarized-master/img/dejavusans18/screen-java-light-th.png rename to .config/vim/vimcolor/solarized-master/img/dejavusans18/screen-java-light-th.png diff --git a/vimcolor/solarized-master/img/dejavusans18/screen-java-light.png b/.config/vim/vimcolor/solarized-master/img/dejavusans18/screen-java-light.png similarity index 100% rename from vimcolor/solarized-master/img/dejavusans18/screen-java-light.png rename to .config/vim/vimcolor/solarized-master/img/dejavusans18/screen-java-light.png diff --git a/vimcolor/solarized-master/img/dejavusans18/screen-javascript-dark-th.png b/.config/vim/vimcolor/solarized-master/img/dejavusans18/screen-javascript-dark-th.png similarity index 100% rename from vimcolor/solarized-master/img/dejavusans18/screen-javascript-dark-th.png rename to .config/vim/vimcolor/solarized-master/img/dejavusans18/screen-javascript-dark-th.png diff --git a/vimcolor/solarized-master/img/dejavusans18/screen-javascript-dark.png b/.config/vim/vimcolor/solarized-master/img/dejavusans18/screen-javascript-dark.png similarity index 100% rename from vimcolor/solarized-master/img/dejavusans18/screen-javascript-dark.png rename to .config/vim/vimcolor/solarized-master/img/dejavusans18/screen-javascript-dark.png diff --git a/vimcolor/solarized-master/img/dejavusans18/screen-javascript-light-th.png b/.config/vim/vimcolor/solarized-master/img/dejavusans18/screen-javascript-light-th.png similarity index 100% rename from vimcolor/solarized-master/img/dejavusans18/screen-javascript-light-th.png rename to .config/vim/vimcolor/solarized-master/img/dejavusans18/screen-javascript-light-th.png diff --git a/vimcolor/solarized-master/img/dejavusans18/screen-javascript-light.png b/.config/vim/vimcolor/solarized-master/img/dejavusans18/screen-javascript-light.png similarity index 100% rename from vimcolor/solarized-master/img/dejavusans18/screen-javascript-light.png rename to .config/vim/vimcolor/solarized-master/img/dejavusans18/screen-javascript-light.png diff --git a/vimcolor/solarized-master/img/dejavusans18/screen-pandoc-dark-th.png b/.config/vim/vimcolor/solarized-master/img/dejavusans18/screen-pandoc-dark-th.png similarity index 100% rename from vimcolor/solarized-master/img/dejavusans18/screen-pandoc-dark-th.png rename to .config/vim/vimcolor/solarized-master/img/dejavusans18/screen-pandoc-dark-th.png diff --git a/vimcolor/solarized-master/img/dejavusans18/screen-pandoc-dark.png b/.config/vim/vimcolor/solarized-master/img/dejavusans18/screen-pandoc-dark.png similarity index 100% rename from vimcolor/solarized-master/img/dejavusans18/screen-pandoc-dark.png rename to .config/vim/vimcolor/solarized-master/img/dejavusans18/screen-pandoc-dark.png diff --git a/vimcolor/solarized-master/img/dejavusans18/screen-pandoc-light-th.png b/.config/vim/vimcolor/solarized-master/img/dejavusans18/screen-pandoc-light-th.png similarity index 100% rename from vimcolor/solarized-master/img/dejavusans18/screen-pandoc-light-th.png rename to .config/vim/vimcolor/solarized-master/img/dejavusans18/screen-pandoc-light-th.png diff --git a/vimcolor/solarized-master/img/dejavusans18/screen-pandoc-light.png b/.config/vim/vimcolor/solarized-master/img/dejavusans18/screen-pandoc-light.png similarity index 100% rename from vimcolor/solarized-master/img/dejavusans18/screen-pandoc-light.png rename to .config/vim/vimcolor/solarized-master/img/dejavusans18/screen-pandoc-light.png diff --git a/vimcolor/solarized-master/img/dejavusans18/screen-perl-dark-th.png b/.config/vim/vimcolor/solarized-master/img/dejavusans18/screen-perl-dark-th.png similarity index 100% rename from vimcolor/solarized-master/img/dejavusans18/screen-perl-dark-th.png rename to .config/vim/vimcolor/solarized-master/img/dejavusans18/screen-perl-dark-th.png diff --git a/vimcolor/solarized-master/img/dejavusans18/screen-perl-dark.png b/.config/vim/vimcolor/solarized-master/img/dejavusans18/screen-perl-dark.png similarity index 100% rename from vimcolor/solarized-master/img/dejavusans18/screen-perl-dark.png rename to .config/vim/vimcolor/solarized-master/img/dejavusans18/screen-perl-dark.png diff --git a/vimcolor/solarized-master/img/dejavusans18/screen-perl-light-th.png b/.config/vim/vimcolor/solarized-master/img/dejavusans18/screen-perl-light-th.png similarity index 100% rename from vimcolor/solarized-master/img/dejavusans18/screen-perl-light-th.png rename to .config/vim/vimcolor/solarized-master/img/dejavusans18/screen-perl-light-th.png diff --git a/vimcolor/solarized-master/img/dejavusans18/screen-perl-light.png b/.config/vim/vimcolor/solarized-master/img/dejavusans18/screen-perl-light.png similarity index 100% rename from vimcolor/solarized-master/img/dejavusans18/screen-perl-light.png rename to .config/vim/vimcolor/solarized-master/img/dejavusans18/screen-perl-light.png diff --git a/vimcolor/solarized-master/img/dejavusans18/screen-php-dark-th.png b/.config/vim/vimcolor/solarized-master/img/dejavusans18/screen-php-dark-th.png similarity index 100% rename from vimcolor/solarized-master/img/dejavusans18/screen-php-dark-th.png rename to .config/vim/vimcolor/solarized-master/img/dejavusans18/screen-php-dark-th.png diff --git a/vimcolor/solarized-master/img/dejavusans18/screen-php-dark.png b/.config/vim/vimcolor/solarized-master/img/dejavusans18/screen-php-dark.png similarity index 100% rename from vimcolor/solarized-master/img/dejavusans18/screen-php-dark.png rename to .config/vim/vimcolor/solarized-master/img/dejavusans18/screen-php-dark.png diff --git a/vimcolor/solarized-master/img/dejavusans18/screen-php-light-th.png b/.config/vim/vimcolor/solarized-master/img/dejavusans18/screen-php-light-th.png similarity index 100% rename from vimcolor/solarized-master/img/dejavusans18/screen-php-light-th.png rename to .config/vim/vimcolor/solarized-master/img/dejavusans18/screen-php-light-th.png diff --git a/vimcolor/solarized-master/img/dejavusans18/screen-php-light.png b/.config/vim/vimcolor/solarized-master/img/dejavusans18/screen-php-light.png similarity index 100% rename from vimcolor/solarized-master/img/dejavusans18/screen-php-light.png rename to .config/vim/vimcolor/solarized-master/img/dejavusans18/screen-php-light.png diff --git a/vimcolor/solarized-master/img/dejavusans18/screen-python-dark-th.png b/.config/vim/vimcolor/solarized-master/img/dejavusans18/screen-python-dark-th.png similarity index 100% rename from vimcolor/solarized-master/img/dejavusans18/screen-python-dark-th.png rename to .config/vim/vimcolor/solarized-master/img/dejavusans18/screen-python-dark-th.png diff --git a/vimcolor/solarized-master/img/dejavusans18/screen-python-dark.png b/.config/vim/vimcolor/solarized-master/img/dejavusans18/screen-python-dark.png similarity index 100% rename from vimcolor/solarized-master/img/dejavusans18/screen-python-dark.png rename to .config/vim/vimcolor/solarized-master/img/dejavusans18/screen-python-dark.png diff --git a/vimcolor/solarized-master/img/dejavusans18/screen-python-light-th.png b/.config/vim/vimcolor/solarized-master/img/dejavusans18/screen-python-light-th.png similarity index 100% rename from vimcolor/solarized-master/img/dejavusans18/screen-python-light-th.png rename to .config/vim/vimcolor/solarized-master/img/dejavusans18/screen-python-light-th.png diff --git a/vimcolor/solarized-master/img/dejavusans18/screen-python-light.png b/.config/vim/vimcolor/solarized-master/img/dejavusans18/screen-python-light.png similarity index 100% rename from vimcolor/solarized-master/img/dejavusans18/screen-python-light.png rename to .config/vim/vimcolor/solarized-master/img/dejavusans18/screen-python-light.png diff --git a/vimcolor/solarized-master/img/dejavusans18/screen-ruby-dark-th.png b/.config/vim/vimcolor/solarized-master/img/dejavusans18/screen-ruby-dark-th.png similarity index 100% rename from vimcolor/solarized-master/img/dejavusans18/screen-ruby-dark-th.png rename to .config/vim/vimcolor/solarized-master/img/dejavusans18/screen-ruby-dark-th.png diff --git a/vimcolor/solarized-master/img/dejavusans18/screen-ruby-dark.png b/.config/vim/vimcolor/solarized-master/img/dejavusans18/screen-ruby-dark.png similarity index 100% rename from vimcolor/solarized-master/img/dejavusans18/screen-ruby-dark.png rename to .config/vim/vimcolor/solarized-master/img/dejavusans18/screen-ruby-dark.png diff --git a/vimcolor/solarized-master/img/dejavusans18/screen-ruby-light-th.png b/.config/vim/vimcolor/solarized-master/img/dejavusans18/screen-ruby-light-th.png similarity index 100% rename from vimcolor/solarized-master/img/dejavusans18/screen-ruby-light-th.png rename to .config/vim/vimcolor/solarized-master/img/dejavusans18/screen-ruby-light-th.png diff --git a/vimcolor/solarized-master/img/dejavusans18/screen-ruby-light.png b/.config/vim/vimcolor/solarized-master/img/dejavusans18/screen-ruby-light.png similarity index 100% rename from vimcolor/solarized-master/img/dejavusans18/screen-ruby-light.png rename to .config/vim/vimcolor/solarized-master/img/dejavusans18/screen-ruby-light.png diff --git a/vimcolor/solarized-master/img/dejavusans18/screen-shell-dark-th.png b/.config/vim/vimcolor/solarized-master/img/dejavusans18/screen-shell-dark-th.png similarity index 100% rename from vimcolor/solarized-master/img/dejavusans18/screen-shell-dark-th.png rename to .config/vim/vimcolor/solarized-master/img/dejavusans18/screen-shell-dark-th.png diff --git a/vimcolor/solarized-master/img/dejavusans18/screen-shell-dark.png b/.config/vim/vimcolor/solarized-master/img/dejavusans18/screen-shell-dark.png similarity index 100% rename from vimcolor/solarized-master/img/dejavusans18/screen-shell-dark.png rename to .config/vim/vimcolor/solarized-master/img/dejavusans18/screen-shell-dark.png diff --git a/vimcolor/solarized-master/img/dejavusans18/screen-shell-light-th.png b/.config/vim/vimcolor/solarized-master/img/dejavusans18/screen-shell-light-th.png similarity index 100% rename from vimcolor/solarized-master/img/dejavusans18/screen-shell-light-th.png rename to .config/vim/vimcolor/solarized-master/img/dejavusans18/screen-shell-light-th.png diff --git a/vimcolor/solarized-master/img/dejavusans18/screen-shell-light.png b/.config/vim/vimcolor/solarized-master/img/dejavusans18/screen-shell-light.png similarity index 100% rename from vimcolor/solarized-master/img/dejavusans18/screen-shell-light.png rename to .config/vim/vimcolor/solarized-master/img/dejavusans18/screen-shell-light.png diff --git a/vimcolor/solarized-master/img/dejavusans18/screen-tex-dark-th.png b/.config/vim/vimcolor/solarized-master/img/dejavusans18/screen-tex-dark-th.png similarity index 100% rename from vimcolor/solarized-master/img/dejavusans18/screen-tex-dark-th.png rename to .config/vim/vimcolor/solarized-master/img/dejavusans18/screen-tex-dark-th.png diff --git a/vimcolor/solarized-master/img/dejavusans18/screen-tex-dark.png b/.config/vim/vimcolor/solarized-master/img/dejavusans18/screen-tex-dark.png similarity index 100% rename from vimcolor/solarized-master/img/dejavusans18/screen-tex-dark.png rename to .config/vim/vimcolor/solarized-master/img/dejavusans18/screen-tex-dark.png diff --git a/vimcolor/solarized-master/img/dejavusans18/screen-tex-light-th.png b/.config/vim/vimcolor/solarized-master/img/dejavusans18/screen-tex-light-th.png similarity index 100% rename from vimcolor/solarized-master/img/dejavusans18/screen-tex-light-th.png rename to .config/vim/vimcolor/solarized-master/img/dejavusans18/screen-tex-light-th.png diff --git a/vimcolor/solarized-master/img/dejavusans18/screen-tex-light.png b/.config/vim/vimcolor/solarized-master/img/dejavusans18/screen-tex-light.png similarity index 100% rename from vimcolor/solarized-master/img/dejavusans18/screen-tex-light.png rename to .config/vim/vimcolor/solarized-master/img/dejavusans18/screen-tex-light.png diff --git a/vimcolor/solarized-master/img/lettergothic14/index.html b/.config/vim/vimcolor/solarized-master/img/lettergothic14/index.html similarity index 100% rename from vimcolor/solarized-master/img/lettergothic14/index.html rename to .config/vim/vimcolor/solarized-master/img/lettergothic14/index.html diff --git a/vimcolor/solarized-master/img/lettergothic14/screen-c-dark-th.png b/.config/vim/vimcolor/solarized-master/img/lettergothic14/screen-c-dark-th.png similarity index 100% rename from vimcolor/solarized-master/img/lettergothic14/screen-c-dark-th.png rename to .config/vim/vimcolor/solarized-master/img/lettergothic14/screen-c-dark-th.png diff --git a/vimcolor/solarized-master/img/lettergothic14/screen-c-dark.png b/.config/vim/vimcolor/solarized-master/img/lettergothic14/screen-c-dark.png similarity index 100% rename from vimcolor/solarized-master/img/lettergothic14/screen-c-dark.png rename to .config/vim/vimcolor/solarized-master/img/lettergothic14/screen-c-dark.png diff --git a/vimcolor/solarized-master/img/lettergothic14/screen-c-light-th.png b/.config/vim/vimcolor/solarized-master/img/lettergothic14/screen-c-light-th.png similarity index 100% rename from vimcolor/solarized-master/img/lettergothic14/screen-c-light-th.png rename to .config/vim/vimcolor/solarized-master/img/lettergothic14/screen-c-light-th.png diff --git a/vimcolor/solarized-master/img/lettergothic14/screen-c-light.png b/.config/vim/vimcolor/solarized-master/img/lettergothic14/screen-c-light.png similarity index 100% rename from vimcolor/solarized-master/img/lettergothic14/screen-c-light.png rename to .config/vim/vimcolor/solarized-master/img/lettergothic14/screen-c-light.png diff --git a/vimcolor/solarized-master/img/lettergothic14/screen-haskell-dark-th.png b/.config/vim/vimcolor/solarized-master/img/lettergothic14/screen-haskell-dark-th.png similarity index 100% rename from vimcolor/solarized-master/img/lettergothic14/screen-haskell-dark-th.png rename to .config/vim/vimcolor/solarized-master/img/lettergothic14/screen-haskell-dark-th.png diff --git a/vimcolor/solarized-master/img/lettergothic14/screen-haskell-dark.png b/.config/vim/vimcolor/solarized-master/img/lettergothic14/screen-haskell-dark.png similarity index 100% rename from vimcolor/solarized-master/img/lettergothic14/screen-haskell-dark.png rename to .config/vim/vimcolor/solarized-master/img/lettergothic14/screen-haskell-dark.png diff --git a/vimcolor/solarized-master/img/lettergothic14/screen-haskell-light-th.png b/.config/vim/vimcolor/solarized-master/img/lettergothic14/screen-haskell-light-th.png similarity index 100% rename from vimcolor/solarized-master/img/lettergothic14/screen-haskell-light-th.png rename to .config/vim/vimcolor/solarized-master/img/lettergothic14/screen-haskell-light-th.png diff --git a/vimcolor/solarized-master/img/lettergothic14/screen-haskell-light.png b/.config/vim/vimcolor/solarized-master/img/lettergothic14/screen-haskell-light.png similarity index 100% rename from vimcolor/solarized-master/img/lettergothic14/screen-haskell-light.png rename to .config/vim/vimcolor/solarized-master/img/lettergothic14/screen-haskell-light.png diff --git a/vimcolor/solarized-master/img/lettergothic14/screen-html-dark-th.png b/.config/vim/vimcolor/solarized-master/img/lettergothic14/screen-html-dark-th.png similarity index 100% rename from vimcolor/solarized-master/img/lettergothic14/screen-html-dark-th.png rename to .config/vim/vimcolor/solarized-master/img/lettergothic14/screen-html-dark-th.png diff --git a/vimcolor/solarized-master/img/lettergothic14/screen-html-dark.png b/.config/vim/vimcolor/solarized-master/img/lettergothic14/screen-html-dark.png similarity index 100% rename from vimcolor/solarized-master/img/lettergothic14/screen-html-dark.png rename to .config/vim/vimcolor/solarized-master/img/lettergothic14/screen-html-dark.png diff --git a/vimcolor/solarized-master/img/lettergothic14/screen-html-light-th.png b/.config/vim/vimcolor/solarized-master/img/lettergothic14/screen-html-light-th.png similarity index 100% rename from vimcolor/solarized-master/img/lettergothic14/screen-html-light-th.png rename to .config/vim/vimcolor/solarized-master/img/lettergothic14/screen-html-light-th.png diff --git a/vimcolor/solarized-master/img/lettergothic14/screen-html-light.png b/.config/vim/vimcolor/solarized-master/img/lettergothic14/screen-html-light.png similarity index 100% rename from vimcolor/solarized-master/img/lettergothic14/screen-html-light.png rename to .config/vim/vimcolor/solarized-master/img/lettergothic14/screen-html-light.png diff --git a/vimcolor/solarized-master/img/lettergothic14/screen-java-dark-th.png b/.config/vim/vimcolor/solarized-master/img/lettergothic14/screen-java-dark-th.png similarity index 100% rename from vimcolor/solarized-master/img/lettergothic14/screen-java-dark-th.png rename to .config/vim/vimcolor/solarized-master/img/lettergothic14/screen-java-dark-th.png diff --git a/vimcolor/solarized-master/img/lettergothic14/screen-java-dark.png b/.config/vim/vimcolor/solarized-master/img/lettergothic14/screen-java-dark.png similarity index 100% rename from vimcolor/solarized-master/img/lettergothic14/screen-java-dark.png rename to .config/vim/vimcolor/solarized-master/img/lettergothic14/screen-java-dark.png diff --git a/vimcolor/solarized-master/img/lettergothic14/screen-java-light-th.png b/.config/vim/vimcolor/solarized-master/img/lettergothic14/screen-java-light-th.png similarity index 100% rename from vimcolor/solarized-master/img/lettergothic14/screen-java-light-th.png rename to .config/vim/vimcolor/solarized-master/img/lettergothic14/screen-java-light-th.png diff --git a/vimcolor/solarized-master/img/lettergothic14/screen-java-light.png b/.config/vim/vimcolor/solarized-master/img/lettergothic14/screen-java-light.png similarity index 100% rename from vimcolor/solarized-master/img/lettergothic14/screen-java-light.png rename to .config/vim/vimcolor/solarized-master/img/lettergothic14/screen-java-light.png diff --git a/vimcolor/solarized-master/img/lettergothic14/screen-javascript-dark-th.png b/.config/vim/vimcolor/solarized-master/img/lettergothic14/screen-javascript-dark-th.png similarity index 100% rename from vimcolor/solarized-master/img/lettergothic14/screen-javascript-dark-th.png rename to .config/vim/vimcolor/solarized-master/img/lettergothic14/screen-javascript-dark-th.png diff --git a/vimcolor/solarized-master/img/lettergothic14/screen-javascript-dark.png b/.config/vim/vimcolor/solarized-master/img/lettergothic14/screen-javascript-dark.png similarity index 100% rename from vimcolor/solarized-master/img/lettergothic14/screen-javascript-dark.png rename to .config/vim/vimcolor/solarized-master/img/lettergothic14/screen-javascript-dark.png diff --git a/vimcolor/solarized-master/img/lettergothic14/screen-javascript-light-th.png b/.config/vim/vimcolor/solarized-master/img/lettergothic14/screen-javascript-light-th.png similarity index 100% rename from vimcolor/solarized-master/img/lettergothic14/screen-javascript-light-th.png rename to .config/vim/vimcolor/solarized-master/img/lettergothic14/screen-javascript-light-th.png diff --git a/vimcolor/solarized-master/img/lettergothic14/screen-javascript-light.png b/.config/vim/vimcolor/solarized-master/img/lettergothic14/screen-javascript-light.png similarity index 100% rename from vimcolor/solarized-master/img/lettergothic14/screen-javascript-light.png rename to .config/vim/vimcolor/solarized-master/img/lettergothic14/screen-javascript-light.png diff --git a/vimcolor/solarized-master/img/lettergothic14/screen-pandoc-dark-th.png b/.config/vim/vimcolor/solarized-master/img/lettergothic14/screen-pandoc-dark-th.png similarity index 100% rename from vimcolor/solarized-master/img/lettergothic14/screen-pandoc-dark-th.png rename to .config/vim/vimcolor/solarized-master/img/lettergothic14/screen-pandoc-dark-th.png diff --git a/vimcolor/solarized-master/img/lettergothic14/screen-pandoc-dark.png b/.config/vim/vimcolor/solarized-master/img/lettergothic14/screen-pandoc-dark.png similarity index 100% rename from vimcolor/solarized-master/img/lettergothic14/screen-pandoc-dark.png rename to .config/vim/vimcolor/solarized-master/img/lettergothic14/screen-pandoc-dark.png diff --git a/vimcolor/solarized-master/img/lettergothic14/screen-pandoc-light-th.png b/.config/vim/vimcolor/solarized-master/img/lettergothic14/screen-pandoc-light-th.png similarity index 100% rename from vimcolor/solarized-master/img/lettergothic14/screen-pandoc-light-th.png rename to .config/vim/vimcolor/solarized-master/img/lettergothic14/screen-pandoc-light-th.png diff --git a/vimcolor/solarized-master/img/lettergothic14/screen-pandoc-light.png b/.config/vim/vimcolor/solarized-master/img/lettergothic14/screen-pandoc-light.png similarity index 100% rename from vimcolor/solarized-master/img/lettergothic14/screen-pandoc-light.png rename to .config/vim/vimcolor/solarized-master/img/lettergothic14/screen-pandoc-light.png diff --git a/vimcolor/solarized-master/img/lettergothic14/screen-perl-dark-th.png b/.config/vim/vimcolor/solarized-master/img/lettergothic14/screen-perl-dark-th.png similarity index 100% rename from vimcolor/solarized-master/img/lettergothic14/screen-perl-dark-th.png rename to .config/vim/vimcolor/solarized-master/img/lettergothic14/screen-perl-dark-th.png diff --git a/vimcolor/solarized-master/img/lettergothic14/screen-perl-dark.png b/.config/vim/vimcolor/solarized-master/img/lettergothic14/screen-perl-dark.png similarity index 100% rename from vimcolor/solarized-master/img/lettergothic14/screen-perl-dark.png rename to .config/vim/vimcolor/solarized-master/img/lettergothic14/screen-perl-dark.png diff --git a/vimcolor/solarized-master/img/lettergothic14/screen-perl-light-th.png b/.config/vim/vimcolor/solarized-master/img/lettergothic14/screen-perl-light-th.png similarity index 100% rename from vimcolor/solarized-master/img/lettergothic14/screen-perl-light-th.png rename to .config/vim/vimcolor/solarized-master/img/lettergothic14/screen-perl-light-th.png diff --git a/vimcolor/solarized-master/img/lettergothic14/screen-perl-light.png b/.config/vim/vimcolor/solarized-master/img/lettergothic14/screen-perl-light.png similarity index 100% rename from vimcolor/solarized-master/img/lettergothic14/screen-perl-light.png rename to .config/vim/vimcolor/solarized-master/img/lettergothic14/screen-perl-light.png diff --git a/vimcolor/solarized-master/img/lettergothic14/screen-php-dark-th.png b/.config/vim/vimcolor/solarized-master/img/lettergothic14/screen-php-dark-th.png similarity index 100% rename from vimcolor/solarized-master/img/lettergothic14/screen-php-dark-th.png rename to .config/vim/vimcolor/solarized-master/img/lettergothic14/screen-php-dark-th.png diff --git a/vimcolor/solarized-master/img/lettergothic14/screen-php-dark.png b/.config/vim/vimcolor/solarized-master/img/lettergothic14/screen-php-dark.png similarity index 100% rename from vimcolor/solarized-master/img/lettergothic14/screen-php-dark.png rename to .config/vim/vimcolor/solarized-master/img/lettergothic14/screen-php-dark.png diff --git a/vimcolor/solarized-master/img/lettergothic14/screen-php-light-th.png b/.config/vim/vimcolor/solarized-master/img/lettergothic14/screen-php-light-th.png similarity index 100% rename from vimcolor/solarized-master/img/lettergothic14/screen-php-light-th.png rename to .config/vim/vimcolor/solarized-master/img/lettergothic14/screen-php-light-th.png diff --git a/vimcolor/solarized-master/img/lettergothic14/screen-php-light.png b/.config/vim/vimcolor/solarized-master/img/lettergothic14/screen-php-light.png similarity index 100% rename from vimcolor/solarized-master/img/lettergothic14/screen-php-light.png rename to .config/vim/vimcolor/solarized-master/img/lettergothic14/screen-php-light.png diff --git a/vimcolor/solarized-master/img/lettergothic14/screen-python-dark-th.png b/.config/vim/vimcolor/solarized-master/img/lettergothic14/screen-python-dark-th.png similarity index 100% rename from vimcolor/solarized-master/img/lettergothic14/screen-python-dark-th.png rename to .config/vim/vimcolor/solarized-master/img/lettergothic14/screen-python-dark-th.png diff --git a/vimcolor/solarized-master/img/lettergothic14/screen-python-dark.png b/.config/vim/vimcolor/solarized-master/img/lettergothic14/screen-python-dark.png similarity index 100% rename from vimcolor/solarized-master/img/lettergothic14/screen-python-dark.png rename to .config/vim/vimcolor/solarized-master/img/lettergothic14/screen-python-dark.png diff --git a/vimcolor/solarized-master/img/lettergothic14/screen-python-light-th.png b/.config/vim/vimcolor/solarized-master/img/lettergothic14/screen-python-light-th.png similarity index 100% rename from vimcolor/solarized-master/img/lettergothic14/screen-python-light-th.png rename to .config/vim/vimcolor/solarized-master/img/lettergothic14/screen-python-light-th.png diff --git a/vimcolor/solarized-master/img/lettergothic14/screen-python-light.png b/.config/vim/vimcolor/solarized-master/img/lettergothic14/screen-python-light.png similarity index 100% rename from vimcolor/solarized-master/img/lettergothic14/screen-python-light.png rename to .config/vim/vimcolor/solarized-master/img/lettergothic14/screen-python-light.png diff --git a/vimcolor/solarized-master/img/lettergothic14/screen-ruby-dark-th.png b/.config/vim/vimcolor/solarized-master/img/lettergothic14/screen-ruby-dark-th.png similarity index 100% rename from vimcolor/solarized-master/img/lettergothic14/screen-ruby-dark-th.png rename to .config/vim/vimcolor/solarized-master/img/lettergothic14/screen-ruby-dark-th.png diff --git a/vimcolor/solarized-master/img/lettergothic14/screen-ruby-dark.png b/.config/vim/vimcolor/solarized-master/img/lettergothic14/screen-ruby-dark.png similarity index 100% rename from vimcolor/solarized-master/img/lettergothic14/screen-ruby-dark.png rename to .config/vim/vimcolor/solarized-master/img/lettergothic14/screen-ruby-dark.png diff --git a/vimcolor/solarized-master/img/lettergothic14/screen-ruby-light-th.png b/.config/vim/vimcolor/solarized-master/img/lettergothic14/screen-ruby-light-th.png similarity index 100% rename from vimcolor/solarized-master/img/lettergothic14/screen-ruby-light-th.png rename to .config/vim/vimcolor/solarized-master/img/lettergothic14/screen-ruby-light-th.png diff --git a/vimcolor/solarized-master/img/lettergothic14/screen-ruby-light.png b/.config/vim/vimcolor/solarized-master/img/lettergothic14/screen-ruby-light.png similarity index 100% rename from vimcolor/solarized-master/img/lettergothic14/screen-ruby-light.png rename to .config/vim/vimcolor/solarized-master/img/lettergothic14/screen-ruby-light.png diff --git a/vimcolor/solarized-master/img/lettergothic14/screen-shell-dark-th.png b/.config/vim/vimcolor/solarized-master/img/lettergothic14/screen-shell-dark-th.png similarity index 100% rename from vimcolor/solarized-master/img/lettergothic14/screen-shell-dark-th.png rename to .config/vim/vimcolor/solarized-master/img/lettergothic14/screen-shell-dark-th.png diff --git a/vimcolor/solarized-master/img/lettergothic14/screen-shell-dark.png b/.config/vim/vimcolor/solarized-master/img/lettergothic14/screen-shell-dark.png similarity index 100% rename from vimcolor/solarized-master/img/lettergothic14/screen-shell-dark.png rename to .config/vim/vimcolor/solarized-master/img/lettergothic14/screen-shell-dark.png diff --git a/vimcolor/solarized-master/img/lettergothic14/screen-shell-light-th.png b/.config/vim/vimcolor/solarized-master/img/lettergothic14/screen-shell-light-th.png similarity index 100% rename from vimcolor/solarized-master/img/lettergothic14/screen-shell-light-th.png rename to .config/vim/vimcolor/solarized-master/img/lettergothic14/screen-shell-light-th.png diff --git a/vimcolor/solarized-master/img/lettergothic14/screen-shell-light.png b/.config/vim/vimcolor/solarized-master/img/lettergothic14/screen-shell-light.png similarity index 100% rename from vimcolor/solarized-master/img/lettergothic14/screen-shell-light.png rename to .config/vim/vimcolor/solarized-master/img/lettergothic14/screen-shell-light.png diff --git a/vimcolor/solarized-master/img/lettergothic14/screen-tex-dark-th.png b/.config/vim/vimcolor/solarized-master/img/lettergothic14/screen-tex-dark-th.png similarity index 100% rename from vimcolor/solarized-master/img/lettergothic14/screen-tex-dark-th.png rename to .config/vim/vimcolor/solarized-master/img/lettergothic14/screen-tex-dark-th.png diff --git a/vimcolor/solarized-master/img/lettergothic14/screen-tex-dark.png b/.config/vim/vimcolor/solarized-master/img/lettergothic14/screen-tex-dark.png similarity index 100% rename from vimcolor/solarized-master/img/lettergothic14/screen-tex-dark.png rename to .config/vim/vimcolor/solarized-master/img/lettergothic14/screen-tex-dark.png diff --git a/vimcolor/solarized-master/img/lettergothic14/screen-tex-light-th.png b/.config/vim/vimcolor/solarized-master/img/lettergothic14/screen-tex-light-th.png similarity index 100% rename from vimcolor/solarized-master/img/lettergothic14/screen-tex-light-th.png rename to .config/vim/vimcolor/solarized-master/img/lettergothic14/screen-tex-light-th.png diff --git a/vimcolor/solarized-master/img/lettergothic14/screen-tex-light.png b/.config/vim/vimcolor/solarized-master/img/lettergothic14/screen-tex-light.png similarity index 100% rename from vimcolor/solarized-master/img/lettergothic14/screen-tex-light.png rename to .config/vim/vimcolor/solarized-master/img/lettergothic14/screen-tex-light.png diff --git a/vimcolor/solarized-master/img/lettergothic18/index.html b/.config/vim/vimcolor/solarized-master/img/lettergothic18/index.html similarity index 100% rename from vimcolor/solarized-master/img/lettergothic18/index.html rename to .config/vim/vimcolor/solarized-master/img/lettergothic18/index.html diff --git a/vimcolor/solarized-master/img/lettergothic18/screen-c-dark-th.png b/.config/vim/vimcolor/solarized-master/img/lettergothic18/screen-c-dark-th.png similarity index 100% rename from vimcolor/solarized-master/img/lettergothic18/screen-c-dark-th.png rename to .config/vim/vimcolor/solarized-master/img/lettergothic18/screen-c-dark-th.png diff --git a/vimcolor/solarized-master/img/lettergothic18/screen-c-dark.png b/.config/vim/vimcolor/solarized-master/img/lettergothic18/screen-c-dark.png similarity index 100% rename from vimcolor/solarized-master/img/lettergothic18/screen-c-dark.png rename to .config/vim/vimcolor/solarized-master/img/lettergothic18/screen-c-dark.png diff --git a/vimcolor/solarized-master/img/lettergothic18/screen-c-light-th.png b/.config/vim/vimcolor/solarized-master/img/lettergothic18/screen-c-light-th.png similarity index 100% rename from vimcolor/solarized-master/img/lettergothic18/screen-c-light-th.png rename to .config/vim/vimcolor/solarized-master/img/lettergothic18/screen-c-light-th.png diff --git a/vimcolor/solarized-master/img/lettergothic18/screen-c-light.png b/.config/vim/vimcolor/solarized-master/img/lettergothic18/screen-c-light.png similarity index 100% rename from vimcolor/solarized-master/img/lettergothic18/screen-c-light.png rename to .config/vim/vimcolor/solarized-master/img/lettergothic18/screen-c-light.png diff --git a/vimcolor/solarized-master/img/lettergothic18/screen-haskell-dark-th.png b/.config/vim/vimcolor/solarized-master/img/lettergothic18/screen-haskell-dark-th.png similarity index 100% rename from vimcolor/solarized-master/img/lettergothic18/screen-haskell-dark-th.png rename to .config/vim/vimcolor/solarized-master/img/lettergothic18/screen-haskell-dark-th.png diff --git a/vimcolor/solarized-master/img/lettergothic18/screen-haskell-dark.png b/.config/vim/vimcolor/solarized-master/img/lettergothic18/screen-haskell-dark.png similarity index 100% rename from vimcolor/solarized-master/img/lettergothic18/screen-haskell-dark.png rename to .config/vim/vimcolor/solarized-master/img/lettergothic18/screen-haskell-dark.png diff --git a/vimcolor/solarized-master/img/lettergothic18/screen-haskell-light-th.png b/.config/vim/vimcolor/solarized-master/img/lettergothic18/screen-haskell-light-th.png similarity index 100% rename from vimcolor/solarized-master/img/lettergothic18/screen-haskell-light-th.png rename to .config/vim/vimcolor/solarized-master/img/lettergothic18/screen-haskell-light-th.png diff --git a/vimcolor/solarized-master/img/lettergothic18/screen-haskell-light.png b/.config/vim/vimcolor/solarized-master/img/lettergothic18/screen-haskell-light.png similarity index 100% rename from vimcolor/solarized-master/img/lettergothic18/screen-haskell-light.png rename to .config/vim/vimcolor/solarized-master/img/lettergothic18/screen-haskell-light.png diff --git a/vimcolor/solarized-master/img/lettergothic18/screen-html-dark-th.png b/.config/vim/vimcolor/solarized-master/img/lettergothic18/screen-html-dark-th.png similarity index 100% rename from vimcolor/solarized-master/img/lettergothic18/screen-html-dark-th.png rename to .config/vim/vimcolor/solarized-master/img/lettergothic18/screen-html-dark-th.png diff --git a/vimcolor/solarized-master/img/lettergothic18/screen-html-dark.png b/.config/vim/vimcolor/solarized-master/img/lettergothic18/screen-html-dark.png similarity index 100% rename from vimcolor/solarized-master/img/lettergothic18/screen-html-dark.png rename to .config/vim/vimcolor/solarized-master/img/lettergothic18/screen-html-dark.png diff --git a/vimcolor/solarized-master/img/lettergothic18/screen-html-light-th.png b/.config/vim/vimcolor/solarized-master/img/lettergothic18/screen-html-light-th.png similarity index 100% rename from vimcolor/solarized-master/img/lettergothic18/screen-html-light-th.png rename to .config/vim/vimcolor/solarized-master/img/lettergothic18/screen-html-light-th.png diff --git a/vimcolor/solarized-master/img/lettergothic18/screen-html-light.png b/.config/vim/vimcolor/solarized-master/img/lettergothic18/screen-html-light.png similarity index 100% rename from vimcolor/solarized-master/img/lettergothic18/screen-html-light.png rename to .config/vim/vimcolor/solarized-master/img/lettergothic18/screen-html-light.png diff --git a/vimcolor/solarized-master/img/lettergothic18/screen-java-dark-th.png b/.config/vim/vimcolor/solarized-master/img/lettergothic18/screen-java-dark-th.png similarity index 100% rename from vimcolor/solarized-master/img/lettergothic18/screen-java-dark-th.png rename to .config/vim/vimcolor/solarized-master/img/lettergothic18/screen-java-dark-th.png diff --git a/vimcolor/solarized-master/img/lettergothic18/screen-java-dark.png b/.config/vim/vimcolor/solarized-master/img/lettergothic18/screen-java-dark.png similarity index 100% rename from vimcolor/solarized-master/img/lettergothic18/screen-java-dark.png rename to .config/vim/vimcolor/solarized-master/img/lettergothic18/screen-java-dark.png diff --git a/vimcolor/solarized-master/img/lettergothic18/screen-java-light-th.png b/.config/vim/vimcolor/solarized-master/img/lettergothic18/screen-java-light-th.png similarity index 100% rename from vimcolor/solarized-master/img/lettergothic18/screen-java-light-th.png rename to .config/vim/vimcolor/solarized-master/img/lettergothic18/screen-java-light-th.png diff --git a/vimcolor/solarized-master/img/lettergothic18/screen-java-light.png b/.config/vim/vimcolor/solarized-master/img/lettergothic18/screen-java-light.png similarity index 100% rename from vimcolor/solarized-master/img/lettergothic18/screen-java-light.png rename to .config/vim/vimcolor/solarized-master/img/lettergothic18/screen-java-light.png diff --git a/vimcolor/solarized-master/img/lettergothic18/screen-javascript-dark-th.png b/.config/vim/vimcolor/solarized-master/img/lettergothic18/screen-javascript-dark-th.png similarity index 100% rename from vimcolor/solarized-master/img/lettergothic18/screen-javascript-dark-th.png rename to .config/vim/vimcolor/solarized-master/img/lettergothic18/screen-javascript-dark-th.png diff --git a/vimcolor/solarized-master/img/lettergothic18/screen-javascript-dark.png b/.config/vim/vimcolor/solarized-master/img/lettergothic18/screen-javascript-dark.png similarity index 100% rename from vimcolor/solarized-master/img/lettergothic18/screen-javascript-dark.png rename to .config/vim/vimcolor/solarized-master/img/lettergothic18/screen-javascript-dark.png diff --git a/vimcolor/solarized-master/img/lettergothic18/screen-javascript-light-th.png b/.config/vim/vimcolor/solarized-master/img/lettergothic18/screen-javascript-light-th.png similarity index 100% rename from vimcolor/solarized-master/img/lettergothic18/screen-javascript-light-th.png rename to .config/vim/vimcolor/solarized-master/img/lettergothic18/screen-javascript-light-th.png diff --git a/vimcolor/solarized-master/img/lettergothic18/screen-javascript-light.png b/.config/vim/vimcolor/solarized-master/img/lettergothic18/screen-javascript-light.png similarity index 100% rename from vimcolor/solarized-master/img/lettergothic18/screen-javascript-light.png rename to .config/vim/vimcolor/solarized-master/img/lettergothic18/screen-javascript-light.png diff --git a/vimcolor/solarized-master/img/lettergothic18/screen-pandoc-dark-th.png b/.config/vim/vimcolor/solarized-master/img/lettergothic18/screen-pandoc-dark-th.png similarity index 100% rename from vimcolor/solarized-master/img/lettergothic18/screen-pandoc-dark-th.png rename to .config/vim/vimcolor/solarized-master/img/lettergothic18/screen-pandoc-dark-th.png diff --git a/vimcolor/solarized-master/img/lettergothic18/screen-pandoc-dark.png b/.config/vim/vimcolor/solarized-master/img/lettergothic18/screen-pandoc-dark.png similarity index 100% rename from vimcolor/solarized-master/img/lettergothic18/screen-pandoc-dark.png rename to .config/vim/vimcolor/solarized-master/img/lettergothic18/screen-pandoc-dark.png diff --git a/vimcolor/solarized-master/img/lettergothic18/screen-pandoc-light-th.png b/.config/vim/vimcolor/solarized-master/img/lettergothic18/screen-pandoc-light-th.png similarity index 100% rename from vimcolor/solarized-master/img/lettergothic18/screen-pandoc-light-th.png rename to .config/vim/vimcolor/solarized-master/img/lettergothic18/screen-pandoc-light-th.png diff --git a/vimcolor/solarized-master/img/lettergothic18/screen-pandoc-light.png b/.config/vim/vimcolor/solarized-master/img/lettergothic18/screen-pandoc-light.png similarity index 100% rename from vimcolor/solarized-master/img/lettergothic18/screen-pandoc-light.png rename to .config/vim/vimcolor/solarized-master/img/lettergothic18/screen-pandoc-light.png diff --git a/vimcolor/solarized-master/img/lettergothic18/screen-perl-dark-th.png b/.config/vim/vimcolor/solarized-master/img/lettergothic18/screen-perl-dark-th.png similarity index 100% rename from vimcolor/solarized-master/img/lettergothic18/screen-perl-dark-th.png rename to .config/vim/vimcolor/solarized-master/img/lettergothic18/screen-perl-dark-th.png diff --git a/vimcolor/solarized-master/img/lettergothic18/screen-perl-dark.png b/.config/vim/vimcolor/solarized-master/img/lettergothic18/screen-perl-dark.png similarity index 100% rename from vimcolor/solarized-master/img/lettergothic18/screen-perl-dark.png rename to .config/vim/vimcolor/solarized-master/img/lettergothic18/screen-perl-dark.png diff --git a/vimcolor/solarized-master/img/lettergothic18/screen-perl-light-th.png b/.config/vim/vimcolor/solarized-master/img/lettergothic18/screen-perl-light-th.png similarity index 100% rename from vimcolor/solarized-master/img/lettergothic18/screen-perl-light-th.png rename to .config/vim/vimcolor/solarized-master/img/lettergothic18/screen-perl-light-th.png diff --git a/vimcolor/solarized-master/img/lettergothic18/screen-perl-light.png b/.config/vim/vimcolor/solarized-master/img/lettergothic18/screen-perl-light.png similarity index 100% rename from vimcolor/solarized-master/img/lettergothic18/screen-perl-light.png rename to .config/vim/vimcolor/solarized-master/img/lettergothic18/screen-perl-light.png diff --git a/vimcolor/solarized-master/img/lettergothic18/screen-php-dark-th.png b/.config/vim/vimcolor/solarized-master/img/lettergothic18/screen-php-dark-th.png similarity index 100% rename from vimcolor/solarized-master/img/lettergothic18/screen-php-dark-th.png rename to .config/vim/vimcolor/solarized-master/img/lettergothic18/screen-php-dark-th.png diff --git a/vimcolor/solarized-master/img/lettergothic18/screen-php-dark.png b/.config/vim/vimcolor/solarized-master/img/lettergothic18/screen-php-dark.png similarity index 100% rename from vimcolor/solarized-master/img/lettergothic18/screen-php-dark.png rename to .config/vim/vimcolor/solarized-master/img/lettergothic18/screen-php-dark.png diff --git a/vimcolor/solarized-master/img/lettergothic18/screen-php-light-th.png b/.config/vim/vimcolor/solarized-master/img/lettergothic18/screen-php-light-th.png similarity index 100% rename from vimcolor/solarized-master/img/lettergothic18/screen-php-light-th.png rename to .config/vim/vimcolor/solarized-master/img/lettergothic18/screen-php-light-th.png diff --git a/vimcolor/solarized-master/img/lettergothic18/screen-php-light.png b/.config/vim/vimcolor/solarized-master/img/lettergothic18/screen-php-light.png similarity index 100% rename from vimcolor/solarized-master/img/lettergothic18/screen-php-light.png rename to .config/vim/vimcolor/solarized-master/img/lettergothic18/screen-php-light.png diff --git a/vimcolor/solarized-master/img/lettergothic18/screen-python-dark-th.png b/.config/vim/vimcolor/solarized-master/img/lettergothic18/screen-python-dark-th.png similarity index 100% rename from vimcolor/solarized-master/img/lettergothic18/screen-python-dark-th.png rename to .config/vim/vimcolor/solarized-master/img/lettergothic18/screen-python-dark-th.png diff --git a/vimcolor/solarized-master/img/lettergothic18/screen-python-dark.png b/.config/vim/vimcolor/solarized-master/img/lettergothic18/screen-python-dark.png similarity index 100% rename from vimcolor/solarized-master/img/lettergothic18/screen-python-dark.png rename to .config/vim/vimcolor/solarized-master/img/lettergothic18/screen-python-dark.png diff --git a/vimcolor/solarized-master/img/lettergothic18/screen-python-light-th.png b/.config/vim/vimcolor/solarized-master/img/lettergothic18/screen-python-light-th.png similarity index 100% rename from vimcolor/solarized-master/img/lettergothic18/screen-python-light-th.png rename to .config/vim/vimcolor/solarized-master/img/lettergothic18/screen-python-light-th.png diff --git a/vimcolor/solarized-master/img/lettergothic18/screen-python-light.png b/.config/vim/vimcolor/solarized-master/img/lettergothic18/screen-python-light.png similarity index 100% rename from vimcolor/solarized-master/img/lettergothic18/screen-python-light.png rename to .config/vim/vimcolor/solarized-master/img/lettergothic18/screen-python-light.png diff --git a/vimcolor/solarized-master/img/lettergothic18/screen-ruby-dark-th.png b/.config/vim/vimcolor/solarized-master/img/lettergothic18/screen-ruby-dark-th.png similarity index 100% rename from vimcolor/solarized-master/img/lettergothic18/screen-ruby-dark-th.png rename to .config/vim/vimcolor/solarized-master/img/lettergothic18/screen-ruby-dark-th.png diff --git a/vimcolor/solarized-master/img/lettergothic18/screen-ruby-dark.png b/.config/vim/vimcolor/solarized-master/img/lettergothic18/screen-ruby-dark.png similarity index 100% rename from vimcolor/solarized-master/img/lettergothic18/screen-ruby-dark.png rename to .config/vim/vimcolor/solarized-master/img/lettergothic18/screen-ruby-dark.png diff --git a/vimcolor/solarized-master/img/lettergothic18/screen-ruby-light-th.png b/.config/vim/vimcolor/solarized-master/img/lettergothic18/screen-ruby-light-th.png similarity index 100% rename from vimcolor/solarized-master/img/lettergothic18/screen-ruby-light-th.png rename to .config/vim/vimcolor/solarized-master/img/lettergothic18/screen-ruby-light-th.png diff --git a/vimcolor/solarized-master/img/lettergothic18/screen-ruby-light.png b/.config/vim/vimcolor/solarized-master/img/lettergothic18/screen-ruby-light.png similarity index 100% rename from vimcolor/solarized-master/img/lettergothic18/screen-ruby-light.png rename to .config/vim/vimcolor/solarized-master/img/lettergothic18/screen-ruby-light.png diff --git a/vimcolor/solarized-master/img/lettergothic18/screen-shell-dark-th.png b/.config/vim/vimcolor/solarized-master/img/lettergothic18/screen-shell-dark-th.png similarity index 100% rename from vimcolor/solarized-master/img/lettergothic18/screen-shell-dark-th.png rename to .config/vim/vimcolor/solarized-master/img/lettergothic18/screen-shell-dark-th.png diff --git a/vimcolor/solarized-master/img/lettergothic18/screen-shell-dark.png b/.config/vim/vimcolor/solarized-master/img/lettergothic18/screen-shell-dark.png similarity index 100% rename from vimcolor/solarized-master/img/lettergothic18/screen-shell-dark.png rename to .config/vim/vimcolor/solarized-master/img/lettergothic18/screen-shell-dark.png diff --git a/vimcolor/solarized-master/img/lettergothic18/screen-shell-light-th.png b/.config/vim/vimcolor/solarized-master/img/lettergothic18/screen-shell-light-th.png similarity index 100% rename from vimcolor/solarized-master/img/lettergothic18/screen-shell-light-th.png rename to .config/vim/vimcolor/solarized-master/img/lettergothic18/screen-shell-light-th.png diff --git a/vimcolor/solarized-master/img/lettergothic18/screen-shell-light.png b/.config/vim/vimcolor/solarized-master/img/lettergothic18/screen-shell-light.png similarity index 100% rename from vimcolor/solarized-master/img/lettergothic18/screen-shell-light.png rename to .config/vim/vimcolor/solarized-master/img/lettergothic18/screen-shell-light.png diff --git a/vimcolor/solarized-master/img/lettergothic18/screen-tex-dark-th.png b/.config/vim/vimcolor/solarized-master/img/lettergothic18/screen-tex-dark-th.png similarity index 100% rename from vimcolor/solarized-master/img/lettergothic18/screen-tex-dark-th.png rename to .config/vim/vimcolor/solarized-master/img/lettergothic18/screen-tex-dark-th.png diff --git a/vimcolor/solarized-master/img/lettergothic18/screen-tex-dark.png b/.config/vim/vimcolor/solarized-master/img/lettergothic18/screen-tex-dark.png similarity index 100% rename from vimcolor/solarized-master/img/lettergothic18/screen-tex-dark.png rename to .config/vim/vimcolor/solarized-master/img/lettergothic18/screen-tex-dark.png diff --git a/vimcolor/solarized-master/img/lettergothic18/screen-tex-light-th.png b/.config/vim/vimcolor/solarized-master/img/lettergothic18/screen-tex-light-th.png similarity index 100% rename from vimcolor/solarized-master/img/lettergothic18/screen-tex-light-th.png rename to .config/vim/vimcolor/solarized-master/img/lettergothic18/screen-tex-light-th.png diff --git a/vimcolor/solarized-master/img/lettergothic18/screen-tex-light.png b/.config/vim/vimcolor/solarized-master/img/lettergothic18/screen-tex-light.png similarity index 100% rename from vimcolor/solarized-master/img/lettergothic18/screen-tex-light.png rename to .config/vim/vimcolor/solarized-master/img/lettergothic18/screen-tex-light.png diff --git a/vimcolor/solarized-master/img/monaco14/index.html b/.config/vim/vimcolor/solarized-master/img/monaco14/index.html similarity index 100% rename from vimcolor/solarized-master/img/monaco14/index.html rename to .config/vim/vimcolor/solarized-master/img/monaco14/index.html diff --git a/vimcolor/solarized-master/img/monaco14/screen-c-dark-th.png b/.config/vim/vimcolor/solarized-master/img/monaco14/screen-c-dark-th.png similarity index 100% rename from vimcolor/solarized-master/img/monaco14/screen-c-dark-th.png rename to .config/vim/vimcolor/solarized-master/img/monaco14/screen-c-dark-th.png diff --git a/vimcolor/solarized-master/img/monaco14/screen-c-dark.png b/.config/vim/vimcolor/solarized-master/img/monaco14/screen-c-dark.png similarity index 100% rename from vimcolor/solarized-master/img/monaco14/screen-c-dark.png rename to .config/vim/vimcolor/solarized-master/img/monaco14/screen-c-dark.png diff --git a/vimcolor/solarized-master/img/monaco14/screen-c-light-th.png b/.config/vim/vimcolor/solarized-master/img/monaco14/screen-c-light-th.png similarity index 100% rename from vimcolor/solarized-master/img/monaco14/screen-c-light-th.png rename to .config/vim/vimcolor/solarized-master/img/monaco14/screen-c-light-th.png diff --git a/vimcolor/solarized-master/img/monaco14/screen-c-light.png b/.config/vim/vimcolor/solarized-master/img/monaco14/screen-c-light.png similarity index 100% rename from vimcolor/solarized-master/img/monaco14/screen-c-light.png rename to .config/vim/vimcolor/solarized-master/img/monaco14/screen-c-light.png diff --git a/vimcolor/solarized-master/img/monaco14/screen-haskell-dark-th.png b/.config/vim/vimcolor/solarized-master/img/monaco14/screen-haskell-dark-th.png similarity index 100% rename from vimcolor/solarized-master/img/monaco14/screen-haskell-dark-th.png rename to .config/vim/vimcolor/solarized-master/img/monaco14/screen-haskell-dark-th.png diff --git a/vimcolor/solarized-master/img/monaco14/screen-haskell-dark.png b/.config/vim/vimcolor/solarized-master/img/monaco14/screen-haskell-dark.png similarity index 100% rename from vimcolor/solarized-master/img/monaco14/screen-haskell-dark.png rename to .config/vim/vimcolor/solarized-master/img/monaco14/screen-haskell-dark.png diff --git a/vimcolor/solarized-master/img/monaco14/screen-haskell-light-th.png b/.config/vim/vimcolor/solarized-master/img/monaco14/screen-haskell-light-th.png similarity index 100% rename from vimcolor/solarized-master/img/monaco14/screen-haskell-light-th.png rename to .config/vim/vimcolor/solarized-master/img/monaco14/screen-haskell-light-th.png diff --git a/vimcolor/solarized-master/img/monaco14/screen-haskell-light.png b/.config/vim/vimcolor/solarized-master/img/monaco14/screen-haskell-light.png similarity index 100% rename from vimcolor/solarized-master/img/monaco14/screen-haskell-light.png rename to .config/vim/vimcolor/solarized-master/img/monaco14/screen-haskell-light.png diff --git a/vimcolor/solarized-master/img/monaco14/screen-html-dark-th.png b/.config/vim/vimcolor/solarized-master/img/monaco14/screen-html-dark-th.png similarity index 100% rename from vimcolor/solarized-master/img/monaco14/screen-html-dark-th.png rename to .config/vim/vimcolor/solarized-master/img/monaco14/screen-html-dark-th.png diff --git a/vimcolor/solarized-master/img/monaco14/screen-html-dark.png b/.config/vim/vimcolor/solarized-master/img/monaco14/screen-html-dark.png similarity index 100% rename from vimcolor/solarized-master/img/monaco14/screen-html-dark.png rename to .config/vim/vimcolor/solarized-master/img/monaco14/screen-html-dark.png diff --git a/vimcolor/solarized-master/img/monaco14/screen-html-light-th.png b/.config/vim/vimcolor/solarized-master/img/monaco14/screen-html-light-th.png similarity index 100% rename from vimcolor/solarized-master/img/monaco14/screen-html-light-th.png rename to .config/vim/vimcolor/solarized-master/img/monaco14/screen-html-light-th.png diff --git a/vimcolor/solarized-master/img/monaco14/screen-html-light.png b/.config/vim/vimcolor/solarized-master/img/monaco14/screen-html-light.png similarity index 100% rename from vimcolor/solarized-master/img/monaco14/screen-html-light.png rename to .config/vim/vimcolor/solarized-master/img/monaco14/screen-html-light.png diff --git a/vimcolor/solarized-master/img/monaco14/screen-java-dark-th.png b/.config/vim/vimcolor/solarized-master/img/monaco14/screen-java-dark-th.png similarity index 100% rename from vimcolor/solarized-master/img/monaco14/screen-java-dark-th.png rename to .config/vim/vimcolor/solarized-master/img/monaco14/screen-java-dark-th.png diff --git a/vimcolor/solarized-master/img/monaco14/screen-java-dark.png b/.config/vim/vimcolor/solarized-master/img/monaco14/screen-java-dark.png similarity index 100% rename from vimcolor/solarized-master/img/monaco14/screen-java-dark.png rename to .config/vim/vimcolor/solarized-master/img/monaco14/screen-java-dark.png diff --git a/vimcolor/solarized-master/img/monaco14/screen-java-light-th.png b/.config/vim/vimcolor/solarized-master/img/monaco14/screen-java-light-th.png similarity index 100% rename from vimcolor/solarized-master/img/monaco14/screen-java-light-th.png rename to .config/vim/vimcolor/solarized-master/img/monaco14/screen-java-light-th.png diff --git a/vimcolor/solarized-master/img/monaco14/screen-java-light.png b/.config/vim/vimcolor/solarized-master/img/monaco14/screen-java-light.png similarity index 100% rename from vimcolor/solarized-master/img/monaco14/screen-java-light.png rename to .config/vim/vimcolor/solarized-master/img/monaco14/screen-java-light.png diff --git a/vimcolor/solarized-master/img/monaco14/screen-javascript-dark-th.png b/.config/vim/vimcolor/solarized-master/img/monaco14/screen-javascript-dark-th.png similarity index 100% rename from vimcolor/solarized-master/img/monaco14/screen-javascript-dark-th.png rename to .config/vim/vimcolor/solarized-master/img/monaco14/screen-javascript-dark-th.png diff --git a/vimcolor/solarized-master/img/monaco14/screen-javascript-dark.png b/.config/vim/vimcolor/solarized-master/img/monaco14/screen-javascript-dark.png similarity index 100% rename from vimcolor/solarized-master/img/monaco14/screen-javascript-dark.png rename to .config/vim/vimcolor/solarized-master/img/monaco14/screen-javascript-dark.png diff --git a/vimcolor/solarized-master/img/monaco14/screen-javascript-light-th.png b/.config/vim/vimcolor/solarized-master/img/monaco14/screen-javascript-light-th.png similarity index 100% rename from vimcolor/solarized-master/img/monaco14/screen-javascript-light-th.png rename to .config/vim/vimcolor/solarized-master/img/monaco14/screen-javascript-light-th.png diff --git a/vimcolor/solarized-master/img/monaco14/screen-javascript-light.png b/.config/vim/vimcolor/solarized-master/img/monaco14/screen-javascript-light.png similarity index 100% rename from vimcolor/solarized-master/img/monaco14/screen-javascript-light.png rename to .config/vim/vimcolor/solarized-master/img/monaco14/screen-javascript-light.png diff --git a/vimcolor/solarized-master/img/monaco14/screen-pandoc-dark-th.png b/.config/vim/vimcolor/solarized-master/img/monaco14/screen-pandoc-dark-th.png similarity index 100% rename from vimcolor/solarized-master/img/monaco14/screen-pandoc-dark-th.png rename to .config/vim/vimcolor/solarized-master/img/monaco14/screen-pandoc-dark-th.png diff --git a/vimcolor/solarized-master/img/monaco14/screen-pandoc-dark.png b/.config/vim/vimcolor/solarized-master/img/monaco14/screen-pandoc-dark.png similarity index 100% rename from vimcolor/solarized-master/img/monaco14/screen-pandoc-dark.png rename to .config/vim/vimcolor/solarized-master/img/monaco14/screen-pandoc-dark.png diff --git a/vimcolor/solarized-master/img/monaco14/screen-pandoc-light-th.png b/.config/vim/vimcolor/solarized-master/img/monaco14/screen-pandoc-light-th.png similarity index 100% rename from vimcolor/solarized-master/img/monaco14/screen-pandoc-light-th.png rename to .config/vim/vimcolor/solarized-master/img/monaco14/screen-pandoc-light-th.png diff --git a/vimcolor/solarized-master/img/monaco14/screen-pandoc-light.png b/.config/vim/vimcolor/solarized-master/img/monaco14/screen-pandoc-light.png similarity index 100% rename from vimcolor/solarized-master/img/monaco14/screen-pandoc-light.png rename to .config/vim/vimcolor/solarized-master/img/monaco14/screen-pandoc-light.png diff --git a/vimcolor/solarized-master/img/monaco14/screen-perl-dark-th.png b/.config/vim/vimcolor/solarized-master/img/monaco14/screen-perl-dark-th.png similarity index 100% rename from vimcolor/solarized-master/img/monaco14/screen-perl-dark-th.png rename to .config/vim/vimcolor/solarized-master/img/monaco14/screen-perl-dark-th.png diff --git a/vimcolor/solarized-master/img/monaco14/screen-perl-dark.png b/.config/vim/vimcolor/solarized-master/img/monaco14/screen-perl-dark.png similarity index 100% rename from vimcolor/solarized-master/img/monaco14/screen-perl-dark.png rename to .config/vim/vimcolor/solarized-master/img/monaco14/screen-perl-dark.png diff --git a/vimcolor/solarized-master/img/monaco14/screen-perl-light-th.png b/.config/vim/vimcolor/solarized-master/img/monaco14/screen-perl-light-th.png similarity index 100% rename from vimcolor/solarized-master/img/monaco14/screen-perl-light-th.png rename to .config/vim/vimcolor/solarized-master/img/monaco14/screen-perl-light-th.png diff --git a/vimcolor/solarized-master/img/monaco14/screen-perl-light.png b/.config/vim/vimcolor/solarized-master/img/monaco14/screen-perl-light.png similarity index 100% rename from vimcolor/solarized-master/img/monaco14/screen-perl-light.png rename to .config/vim/vimcolor/solarized-master/img/monaco14/screen-perl-light.png diff --git a/vimcolor/solarized-master/img/monaco14/screen-php-dark-th.png b/.config/vim/vimcolor/solarized-master/img/monaco14/screen-php-dark-th.png similarity index 100% rename from vimcolor/solarized-master/img/monaco14/screen-php-dark-th.png rename to .config/vim/vimcolor/solarized-master/img/monaco14/screen-php-dark-th.png diff --git a/vimcolor/solarized-master/img/monaco14/screen-php-dark.png b/.config/vim/vimcolor/solarized-master/img/monaco14/screen-php-dark.png similarity index 100% rename from vimcolor/solarized-master/img/monaco14/screen-php-dark.png rename to .config/vim/vimcolor/solarized-master/img/monaco14/screen-php-dark.png diff --git a/vimcolor/solarized-master/img/monaco14/screen-php-light-th.png b/.config/vim/vimcolor/solarized-master/img/monaco14/screen-php-light-th.png similarity index 100% rename from vimcolor/solarized-master/img/monaco14/screen-php-light-th.png rename to .config/vim/vimcolor/solarized-master/img/monaco14/screen-php-light-th.png diff --git a/vimcolor/solarized-master/img/monaco14/screen-php-light.png b/.config/vim/vimcolor/solarized-master/img/monaco14/screen-php-light.png similarity index 100% rename from vimcolor/solarized-master/img/monaco14/screen-php-light.png rename to .config/vim/vimcolor/solarized-master/img/monaco14/screen-php-light.png diff --git a/vimcolor/solarized-master/img/monaco14/screen-python-dark-th.png b/.config/vim/vimcolor/solarized-master/img/monaco14/screen-python-dark-th.png similarity index 100% rename from vimcolor/solarized-master/img/monaco14/screen-python-dark-th.png rename to .config/vim/vimcolor/solarized-master/img/monaco14/screen-python-dark-th.png diff --git a/vimcolor/solarized-master/img/monaco14/screen-python-dark.png b/.config/vim/vimcolor/solarized-master/img/monaco14/screen-python-dark.png similarity index 100% rename from vimcolor/solarized-master/img/monaco14/screen-python-dark.png rename to .config/vim/vimcolor/solarized-master/img/monaco14/screen-python-dark.png diff --git a/vimcolor/solarized-master/img/monaco14/screen-python-light-th.png b/.config/vim/vimcolor/solarized-master/img/monaco14/screen-python-light-th.png similarity index 100% rename from vimcolor/solarized-master/img/monaco14/screen-python-light-th.png rename to .config/vim/vimcolor/solarized-master/img/monaco14/screen-python-light-th.png diff --git a/vimcolor/solarized-master/img/monaco14/screen-python-light.png b/.config/vim/vimcolor/solarized-master/img/monaco14/screen-python-light.png similarity index 100% rename from vimcolor/solarized-master/img/monaco14/screen-python-light.png rename to .config/vim/vimcolor/solarized-master/img/monaco14/screen-python-light.png diff --git a/vimcolor/solarized-master/img/monaco14/screen-ruby-dark-th.png b/.config/vim/vimcolor/solarized-master/img/monaco14/screen-ruby-dark-th.png similarity index 100% rename from vimcolor/solarized-master/img/monaco14/screen-ruby-dark-th.png rename to .config/vim/vimcolor/solarized-master/img/monaco14/screen-ruby-dark-th.png diff --git a/vimcolor/solarized-master/img/monaco14/screen-ruby-dark.png b/.config/vim/vimcolor/solarized-master/img/monaco14/screen-ruby-dark.png similarity index 100% rename from vimcolor/solarized-master/img/monaco14/screen-ruby-dark.png rename to .config/vim/vimcolor/solarized-master/img/monaco14/screen-ruby-dark.png diff --git a/vimcolor/solarized-master/img/monaco14/screen-ruby-light-th.png b/.config/vim/vimcolor/solarized-master/img/monaco14/screen-ruby-light-th.png similarity index 100% rename from vimcolor/solarized-master/img/monaco14/screen-ruby-light-th.png rename to .config/vim/vimcolor/solarized-master/img/monaco14/screen-ruby-light-th.png diff --git a/vimcolor/solarized-master/img/monaco14/screen-ruby-light.png b/.config/vim/vimcolor/solarized-master/img/monaco14/screen-ruby-light.png similarity index 100% rename from vimcolor/solarized-master/img/monaco14/screen-ruby-light.png rename to .config/vim/vimcolor/solarized-master/img/monaco14/screen-ruby-light.png diff --git a/vimcolor/solarized-master/img/monaco14/screen-shell-dark-th.png b/.config/vim/vimcolor/solarized-master/img/monaco14/screen-shell-dark-th.png similarity index 100% rename from vimcolor/solarized-master/img/monaco14/screen-shell-dark-th.png rename to .config/vim/vimcolor/solarized-master/img/monaco14/screen-shell-dark-th.png diff --git a/vimcolor/solarized-master/img/monaco14/screen-shell-dark.png b/.config/vim/vimcolor/solarized-master/img/monaco14/screen-shell-dark.png similarity index 100% rename from vimcolor/solarized-master/img/monaco14/screen-shell-dark.png rename to .config/vim/vimcolor/solarized-master/img/monaco14/screen-shell-dark.png diff --git a/vimcolor/solarized-master/img/monaco14/screen-shell-light-th.png b/.config/vim/vimcolor/solarized-master/img/monaco14/screen-shell-light-th.png similarity index 100% rename from vimcolor/solarized-master/img/monaco14/screen-shell-light-th.png rename to .config/vim/vimcolor/solarized-master/img/monaco14/screen-shell-light-th.png diff --git a/vimcolor/solarized-master/img/monaco14/screen-shell-light.png b/.config/vim/vimcolor/solarized-master/img/monaco14/screen-shell-light.png similarity index 100% rename from vimcolor/solarized-master/img/monaco14/screen-shell-light.png rename to .config/vim/vimcolor/solarized-master/img/monaco14/screen-shell-light.png diff --git a/vimcolor/solarized-master/img/monaco14/screen-tex-dark-th.png b/.config/vim/vimcolor/solarized-master/img/monaco14/screen-tex-dark-th.png similarity index 100% rename from vimcolor/solarized-master/img/monaco14/screen-tex-dark-th.png rename to .config/vim/vimcolor/solarized-master/img/monaco14/screen-tex-dark-th.png diff --git a/vimcolor/solarized-master/img/monaco14/screen-tex-dark.png b/.config/vim/vimcolor/solarized-master/img/monaco14/screen-tex-dark.png similarity index 100% rename from vimcolor/solarized-master/img/monaco14/screen-tex-dark.png rename to .config/vim/vimcolor/solarized-master/img/monaco14/screen-tex-dark.png diff --git a/vimcolor/solarized-master/img/monaco14/screen-tex-light-th.png b/.config/vim/vimcolor/solarized-master/img/monaco14/screen-tex-light-th.png similarity index 100% rename from vimcolor/solarized-master/img/monaco14/screen-tex-light-th.png rename to .config/vim/vimcolor/solarized-master/img/monaco14/screen-tex-light-th.png diff --git a/vimcolor/solarized-master/img/monaco14/screen-tex-light.png b/.config/vim/vimcolor/solarized-master/img/monaco14/screen-tex-light.png similarity index 100% rename from vimcolor/solarized-master/img/monaco14/screen-tex-light.png rename to .config/vim/vimcolor/solarized-master/img/monaco14/screen-tex-light.png diff --git a/vimcolor/solarized-master/img/screen-c-dark-th.png b/.config/vim/vimcolor/solarized-master/img/screen-c-dark-th.png similarity index 100% rename from vimcolor/solarized-master/img/screen-c-dark-th.png rename to .config/vim/vimcolor/solarized-master/img/screen-c-dark-th.png diff --git a/vimcolor/solarized-master/img/screen-c-dark.png b/.config/vim/vimcolor/solarized-master/img/screen-c-dark.png similarity index 100% rename from vimcolor/solarized-master/img/screen-c-dark.png rename to .config/vim/vimcolor/solarized-master/img/screen-c-dark.png diff --git a/vimcolor/solarized-master/img/screen-c-light-th.png b/.config/vim/vimcolor/solarized-master/img/screen-c-light-th.png similarity index 100% rename from vimcolor/solarized-master/img/screen-c-light-th.png rename to .config/vim/vimcolor/solarized-master/img/screen-c-light-th.png diff --git a/vimcolor/solarized-master/img/screen-c-light.png b/.config/vim/vimcolor/solarized-master/img/screen-c-light.png similarity index 100% rename from vimcolor/solarized-master/img/screen-c-light.png rename to .config/vim/vimcolor/solarized-master/img/screen-c-light.png diff --git a/vimcolor/solarized-master/img/screen-haskell-dark-th.png b/.config/vim/vimcolor/solarized-master/img/screen-haskell-dark-th.png similarity index 100% rename from vimcolor/solarized-master/img/screen-haskell-dark-th.png rename to .config/vim/vimcolor/solarized-master/img/screen-haskell-dark-th.png diff --git a/vimcolor/solarized-master/img/screen-haskell-dark.png b/.config/vim/vimcolor/solarized-master/img/screen-haskell-dark.png similarity index 100% rename from vimcolor/solarized-master/img/screen-haskell-dark.png rename to .config/vim/vimcolor/solarized-master/img/screen-haskell-dark.png diff --git a/vimcolor/solarized-master/img/screen-haskell-light-th.png b/.config/vim/vimcolor/solarized-master/img/screen-haskell-light-th.png similarity index 100% rename from vimcolor/solarized-master/img/screen-haskell-light-th.png rename to .config/vim/vimcolor/solarized-master/img/screen-haskell-light-th.png diff --git a/vimcolor/solarized-master/img/screen-haskell-light.png b/.config/vim/vimcolor/solarized-master/img/screen-haskell-light.png similarity index 100% rename from vimcolor/solarized-master/img/screen-haskell-light.png rename to .config/vim/vimcolor/solarized-master/img/screen-haskell-light.png diff --git a/vimcolor/solarized-master/img/screen-html-dark-th.png b/.config/vim/vimcolor/solarized-master/img/screen-html-dark-th.png similarity index 100% rename from vimcolor/solarized-master/img/screen-html-dark-th.png rename to .config/vim/vimcolor/solarized-master/img/screen-html-dark-th.png diff --git a/vimcolor/solarized-master/img/screen-html-dark.png b/.config/vim/vimcolor/solarized-master/img/screen-html-dark.png similarity index 100% rename from vimcolor/solarized-master/img/screen-html-dark.png rename to .config/vim/vimcolor/solarized-master/img/screen-html-dark.png diff --git a/vimcolor/solarized-master/img/screen-html-light-th.png b/.config/vim/vimcolor/solarized-master/img/screen-html-light-th.png similarity index 100% rename from vimcolor/solarized-master/img/screen-html-light-th.png rename to .config/vim/vimcolor/solarized-master/img/screen-html-light-th.png diff --git a/vimcolor/solarized-master/img/screen-html-light.png b/.config/vim/vimcolor/solarized-master/img/screen-html-light.png similarity index 100% rename from vimcolor/solarized-master/img/screen-html-light.png rename to .config/vim/vimcolor/solarized-master/img/screen-html-light.png diff --git a/vimcolor/solarized-master/img/screen-java-dark-th.png b/.config/vim/vimcolor/solarized-master/img/screen-java-dark-th.png similarity index 100% rename from vimcolor/solarized-master/img/screen-java-dark-th.png rename to .config/vim/vimcolor/solarized-master/img/screen-java-dark-th.png diff --git a/vimcolor/solarized-master/img/screen-java-dark.png b/.config/vim/vimcolor/solarized-master/img/screen-java-dark.png similarity index 100% rename from vimcolor/solarized-master/img/screen-java-dark.png rename to .config/vim/vimcolor/solarized-master/img/screen-java-dark.png diff --git a/vimcolor/solarized-master/img/screen-java-light-th.png b/.config/vim/vimcolor/solarized-master/img/screen-java-light-th.png similarity index 100% rename from vimcolor/solarized-master/img/screen-java-light-th.png rename to .config/vim/vimcolor/solarized-master/img/screen-java-light-th.png diff --git a/vimcolor/solarized-master/img/screen-java-light.png b/.config/vim/vimcolor/solarized-master/img/screen-java-light.png similarity index 100% rename from vimcolor/solarized-master/img/screen-java-light.png rename to .config/vim/vimcolor/solarized-master/img/screen-java-light.png diff --git a/vimcolor/solarized-master/img/screen-javascript-dark-th.png b/.config/vim/vimcolor/solarized-master/img/screen-javascript-dark-th.png similarity index 100% rename from vimcolor/solarized-master/img/screen-javascript-dark-th.png rename to .config/vim/vimcolor/solarized-master/img/screen-javascript-dark-th.png diff --git a/vimcolor/solarized-master/img/screen-javascript-dark.png b/.config/vim/vimcolor/solarized-master/img/screen-javascript-dark.png similarity index 100% rename from vimcolor/solarized-master/img/screen-javascript-dark.png rename to .config/vim/vimcolor/solarized-master/img/screen-javascript-dark.png diff --git a/vimcolor/solarized-master/img/screen-javascript-light-th.png b/.config/vim/vimcolor/solarized-master/img/screen-javascript-light-th.png similarity index 100% rename from vimcolor/solarized-master/img/screen-javascript-light-th.png rename to .config/vim/vimcolor/solarized-master/img/screen-javascript-light-th.png diff --git a/vimcolor/solarized-master/img/screen-javascript-light.png b/.config/vim/vimcolor/solarized-master/img/screen-javascript-light.png similarity index 100% rename from vimcolor/solarized-master/img/screen-javascript-light.png rename to .config/vim/vimcolor/solarized-master/img/screen-javascript-light.png diff --git a/vimcolor/solarized-master/img/screen-mutt-dark-th.png b/.config/vim/vimcolor/solarized-master/img/screen-mutt-dark-th.png similarity index 100% rename from vimcolor/solarized-master/img/screen-mutt-dark-th.png rename to .config/vim/vimcolor/solarized-master/img/screen-mutt-dark-th.png diff --git a/vimcolor/solarized-master/img/screen-mutt-dark.png b/.config/vim/vimcolor/solarized-master/img/screen-mutt-dark.png similarity index 100% rename from vimcolor/solarized-master/img/screen-mutt-dark.png rename to .config/vim/vimcolor/solarized-master/img/screen-mutt-dark.png diff --git a/vimcolor/solarized-master/img/screen-mutt-light-th.png b/.config/vim/vimcolor/solarized-master/img/screen-mutt-light-th.png similarity index 100% rename from vimcolor/solarized-master/img/screen-mutt-light-th.png rename to .config/vim/vimcolor/solarized-master/img/screen-mutt-light-th.png diff --git a/vimcolor/solarized-master/img/screen-mutt-light.png b/.config/vim/vimcolor/solarized-master/img/screen-mutt-light.png similarity index 100% rename from vimcolor/solarized-master/img/screen-mutt-light.png rename to .config/vim/vimcolor/solarized-master/img/screen-mutt-light.png diff --git a/vimcolor/solarized-master/img/screen-pandoc-dark-th.png b/.config/vim/vimcolor/solarized-master/img/screen-pandoc-dark-th.png similarity index 100% rename from vimcolor/solarized-master/img/screen-pandoc-dark-th.png rename to .config/vim/vimcolor/solarized-master/img/screen-pandoc-dark-th.png diff --git a/vimcolor/solarized-master/img/screen-pandoc-dark.png b/.config/vim/vimcolor/solarized-master/img/screen-pandoc-dark.png similarity index 100% rename from vimcolor/solarized-master/img/screen-pandoc-dark.png rename to .config/vim/vimcolor/solarized-master/img/screen-pandoc-dark.png diff --git a/vimcolor/solarized-master/img/screen-pandoc-light-th.png b/.config/vim/vimcolor/solarized-master/img/screen-pandoc-light-th.png similarity index 100% rename from vimcolor/solarized-master/img/screen-pandoc-light-th.png rename to .config/vim/vimcolor/solarized-master/img/screen-pandoc-light-th.png diff --git a/vimcolor/solarized-master/img/screen-pandoc-light.png b/.config/vim/vimcolor/solarized-master/img/screen-pandoc-light.png similarity index 100% rename from vimcolor/solarized-master/img/screen-pandoc-light.png rename to .config/vim/vimcolor/solarized-master/img/screen-pandoc-light.png diff --git a/vimcolor/solarized-master/img/screen-perl-dark-th.png b/.config/vim/vimcolor/solarized-master/img/screen-perl-dark-th.png similarity index 100% rename from vimcolor/solarized-master/img/screen-perl-dark-th.png rename to .config/vim/vimcolor/solarized-master/img/screen-perl-dark-th.png diff --git a/vimcolor/solarized-master/img/screen-perl-dark.png b/.config/vim/vimcolor/solarized-master/img/screen-perl-dark.png similarity index 100% rename from vimcolor/solarized-master/img/screen-perl-dark.png rename to .config/vim/vimcolor/solarized-master/img/screen-perl-dark.png diff --git a/vimcolor/solarized-master/img/screen-perl-light-th.png b/.config/vim/vimcolor/solarized-master/img/screen-perl-light-th.png similarity index 100% rename from vimcolor/solarized-master/img/screen-perl-light-th.png rename to .config/vim/vimcolor/solarized-master/img/screen-perl-light-th.png diff --git a/vimcolor/solarized-master/img/screen-perl-light.png b/.config/vim/vimcolor/solarized-master/img/screen-perl-light.png similarity index 100% rename from vimcolor/solarized-master/img/screen-perl-light.png rename to .config/vim/vimcolor/solarized-master/img/screen-perl-light.png diff --git a/vimcolor/solarized-master/img/screen-php-dark-th.png b/.config/vim/vimcolor/solarized-master/img/screen-php-dark-th.png similarity index 100% rename from vimcolor/solarized-master/img/screen-php-dark-th.png rename to .config/vim/vimcolor/solarized-master/img/screen-php-dark-th.png diff --git a/vimcolor/solarized-master/img/screen-php-dark.png b/.config/vim/vimcolor/solarized-master/img/screen-php-dark.png similarity index 100% rename from vimcolor/solarized-master/img/screen-php-dark.png rename to .config/vim/vimcolor/solarized-master/img/screen-php-dark.png diff --git a/vimcolor/solarized-master/img/screen-php-light-th.png b/.config/vim/vimcolor/solarized-master/img/screen-php-light-th.png similarity index 100% rename from vimcolor/solarized-master/img/screen-php-light-th.png rename to .config/vim/vimcolor/solarized-master/img/screen-php-light-th.png diff --git a/vimcolor/solarized-master/img/screen-php-light.png b/.config/vim/vimcolor/solarized-master/img/screen-php-light.png similarity index 100% rename from vimcolor/solarized-master/img/screen-php-light.png rename to .config/vim/vimcolor/solarized-master/img/screen-php-light.png diff --git a/vimcolor/solarized-master/img/screen-python-dark-th.png b/.config/vim/vimcolor/solarized-master/img/screen-python-dark-th.png similarity index 100% rename from vimcolor/solarized-master/img/screen-python-dark-th.png rename to .config/vim/vimcolor/solarized-master/img/screen-python-dark-th.png diff --git a/vimcolor/solarized-master/img/screen-python-dark.png b/.config/vim/vimcolor/solarized-master/img/screen-python-dark.png similarity index 100% rename from vimcolor/solarized-master/img/screen-python-dark.png rename to .config/vim/vimcolor/solarized-master/img/screen-python-dark.png diff --git a/vimcolor/solarized-master/img/screen-python-light-th.png b/.config/vim/vimcolor/solarized-master/img/screen-python-light-th.png similarity index 100% rename from vimcolor/solarized-master/img/screen-python-light-th.png rename to .config/vim/vimcolor/solarized-master/img/screen-python-light-th.png diff --git a/vimcolor/solarized-master/img/screen-python-light.png b/.config/vim/vimcolor/solarized-master/img/screen-python-light.png similarity index 100% rename from vimcolor/solarized-master/img/screen-python-light.png rename to .config/vim/vimcolor/solarized-master/img/screen-python-light.png diff --git a/vimcolor/solarized-master/img/screen-ruby-dark-th.png b/.config/vim/vimcolor/solarized-master/img/screen-ruby-dark-th.png similarity index 100% rename from vimcolor/solarized-master/img/screen-ruby-dark-th.png rename to .config/vim/vimcolor/solarized-master/img/screen-ruby-dark-th.png diff --git a/vimcolor/solarized-master/img/screen-ruby-dark.png b/.config/vim/vimcolor/solarized-master/img/screen-ruby-dark.png similarity index 100% rename from vimcolor/solarized-master/img/screen-ruby-dark.png rename to .config/vim/vimcolor/solarized-master/img/screen-ruby-dark.png diff --git a/vimcolor/solarized-master/img/screen-ruby-light-th.png b/.config/vim/vimcolor/solarized-master/img/screen-ruby-light-th.png similarity index 100% rename from vimcolor/solarized-master/img/screen-ruby-light-th.png rename to .config/vim/vimcolor/solarized-master/img/screen-ruby-light-th.png diff --git a/vimcolor/solarized-master/img/screen-ruby-light.png b/.config/vim/vimcolor/solarized-master/img/screen-ruby-light.png similarity index 100% rename from vimcolor/solarized-master/img/screen-ruby-light.png rename to .config/vim/vimcolor/solarized-master/img/screen-ruby-light.png diff --git a/vimcolor/solarized-master/img/screen-shell-dark-th.png b/.config/vim/vimcolor/solarized-master/img/screen-shell-dark-th.png similarity index 100% rename from vimcolor/solarized-master/img/screen-shell-dark-th.png rename to .config/vim/vimcolor/solarized-master/img/screen-shell-dark-th.png diff --git a/vimcolor/solarized-master/img/screen-shell-dark.png b/.config/vim/vimcolor/solarized-master/img/screen-shell-dark.png similarity index 100% rename from vimcolor/solarized-master/img/screen-shell-dark.png rename to .config/vim/vimcolor/solarized-master/img/screen-shell-dark.png diff --git a/vimcolor/solarized-master/img/screen-shell-light-th.png b/.config/vim/vimcolor/solarized-master/img/screen-shell-light-th.png similarity index 100% rename from vimcolor/solarized-master/img/screen-shell-light-th.png rename to .config/vim/vimcolor/solarized-master/img/screen-shell-light-th.png diff --git a/vimcolor/solarized-master/img/screen-shell-light.png b/.config/vim/vimcolor/solarized-master/img/screen-shell-light.png similarity index 100% rename from vimcolor/solarized-master/img/screen-shell-light.png rename to .config/vim/vimcolor/solarized-master/img/screen-shell-light.png diff --git a/vimcolor/solarized-master/img/screen-tex-dark-th.png b/.config/vim/vimcolor/solarized-master/img/screen-tex-dark-th.png similarity index 100% rename from vimcolor/solarized-master/img/screen-tex-dark-th.png rename to .config/vim/vimcolor/solarized-master/img/screen-tex-dark-th.png diff --git a/vimcolor/solarized-master/img/screen-tex-dark.png b/.config/vim/vimcolor/solarized-master/img/screen-tex-dark.png similarity index 100% rename from vimcolor/solarized-master/img/screen-tex-dark.png rename to .config/vim/vimcolor/solarized-master/img/screen-tex-dark.png diff --git a/vimcolor/solarized-master/img/screen-tex-light-th.png b/.config/vim/vimcolor/solarized-master/img/screen-tex-light-th.png similarity index 100% rename from vimcolor/solarized-master/img/screen-tex-light-th.png rename to .config/vim/vimcolor/solarized-master/img/screen-tex-light-th.png diff --git a/vimcolor/solarized-master/img/screen-tex-light.png b/.config/vim/vimcolor/solarized-master/img/screen-tex-light.png similarity index 100% rename from vimcolor/solarized-master/img/screen-tex-light.png rename to .config/vim/vimcolor/solarized-master/img/screen-tex-light.png diff --git a/vimcolor/solarized-master/img/skyhookmono14/index.html b/.config/vim/vimcolor/solarized-master/img/skyhookmono14/index.html similarity index 100% rename from vimcolor/solarized-master/img/skyhookmono14/index.html rename to .config/vim/vimcolor/solarized-master/img/skyhookmono14/index.html diff --git a/vimcolor/solarized-master/img/skyhookmono14/screen-c-dark-th.png b/.config/vim/vimcolor/solarized-master/img/skyhookmono14/screen-c-dark-th.png similarity index 100% rename from vimcolor/solarized-master/img/skyhookmono14/screen-c-dark-th.png rename to .config/vim/vimcolor/solarized-master/img/skyhookmono14/screen-c-dark-th.png diff --git a/vimcolor/solarized-master/img/skyhookmono14/screen-c-dark.png b/.config/vim/vimcolor/solarized-master/img/skyhookmono14/screen-c-dark.png similarity index 100% rename from vimcolor/solarized-master/img/skyhookmono14/screen-c-dark.png rename to .config/vim/vimcolor/solarized-master/img/skyhookmono14/screen-c-dark.png diff --git a/vimcolor/solarized-master/img/skyhookmono14/screen-c-light-th.png b/.config/vim/vimcolor/solarized-master/img/skyhookmono14/screen-c-light-th.png similarity index 100% rename from vimcolor/solarized-master/img/skyhookmono14/screen-c-light-th.png rename to .config/vim/vimcolor/solarized-master/img/skyhookmono14/screen-c-light-th.png diff --git a/vimcolor/solarized-master/img/skyhookmono14/screen-c-light.png b/.config/vim/vimcolor/solarized-master/img/skyhookmono14/screen-c-light.png similarity index 100% rename from vimcolor/solarized-master/img/skyhookmono14/screen-c-light.png rename to .config/vim/vimcolor/solarized-master/img/skyhookmono14/screen-c-light.png diff --git a/vimcolor/solarized-master/img/skyhookmono14/screen-haskell-dark-th.png b/.config/vim/vimcolor/solarized-master/img/skyhookmono14/screen-haskell-dark-th.png similarity index 100% rename from vimcolor/solarized-master/img/skyhookmono14/screen-haskell-dark-th.png rename to .config/vim/vimcolor/solarized-master/img/skyhookmono14/screen-haskell-dark-th.png diff --git a/vimcolor/solarized-master/img/skyhookmono14/screen-haskell-dark.png b/.config/vim/vimcolor/solarized-master/img/skyhookmono14/screen-haskell-dark.png similarity index 100% rename from vimcolor/solarized-master/img/skyhookmono14/screen-haskell-dark.png rename to .config/vim/vimcolor/solarized-master/img/skyhookmono14/screen-haskell-dark.png diff --git a/vimcolor/solarized-master/img/skyhookmono14/screen-haskell-light-th.png b/.config/vim/vimcolor/solarized-master/img/skyhookmono14/screen-haskell-light-th.png similarity index 100% rename from vimcolor/solarized-master/img/skyhookmono14/screen-haskell-light-th.png rename to .config/vim/vimcolor/solarized-master/img/skyhookmono14/screen-haskell-light-th.png diff --git a/vimcolor/solarized-master/img/skyhookmono14/screen-haskell-light.png b/.config/vim/vimcolor/solarized-master/img/skyhookmono14/screen-haskell-light.png similarity index 100% rename from vimcolor/solarized-master/img/skyhookmono14/screen-haskell-light.png rename to .config/vim/vimcolor/solarized-master/img/skyhookmono14/screen-haskell-light.png diff --git a/vimcolor/solarized-master/img/skyhookmono14/screen-html-dark-th.png b/.config/vim/vimcolor/solarized-master/img/skyhookmono14/screen-html-dark-th.png similarity index 100% rename from vimcolor/solarized-master/img/skyhookmono14/screen-html-dark-th.png rename to .config/vim/vimcolor/solarized-master/img/skyhookmono14/screen-html-dark-th.png diff --git a/vimcolor/solarized-master/img/skyhookmono14/screen-html-dark.png b/.config/vim/vimcolor/solarized-master/img/skyhookmono14/screen-html-dark.png similarity index 100% rename from vimcolor/solarized-master/img/skyhookmono14/screen-html-dark.png rename to .config/vim/vimcolor/solarized-master/img/skyhookmono14/screen-html-dark.png diff --git a/vimcolor/solarized-master/img/skyhookmono14/screen-html-light-th.png b/.config/vim/vimcolor/solarized-master/img/skyhookmono14/screen-html-light-th.png similarity index 100% rename from vimcolor/solarized-master/img/skyhookmono14/screen-html-light-th.png rename to .config/vim/vimcolor/solarized-master/img/skyhookmono14/screen-html-light-th.png diff --git a/vimcolor/solarized-master/img/skyhookmono14/screen-html-light.png b/.config/vim/vimcolor/solarized-master/img/skyhookmono14/screen-html-light.png similarity index 100% rename from vimcolor/solarized-master/img/skyhookmono14/screen-html-light.png rename to .config/vim/vimcolor/solarized-master/img/skyhookmono14/screen-html-light.png diff --git a/vimcolor/solarized-master/img/skyhookmono14/screen-java-dark-th.png b/.config/vim/vimcolor/solarized-master/img/skyhookmono14/screen-java-dark-th.png similarity index 100% rename from vimcolor/solarized-master/img/skyhookmono14/screen-java-dark-th.png rename to .config/vim/vimcolor/solarized-master/img/skyhookmono14/screen-java-dark-th.png diff --git a/vimcolor/solarized-master/img/skyhookmono14/screen-java-dark.png b/.config/vim/vimcolor/solarized-master/img/skyhookmono14/screen-java-dark.png similarity index 100% rename from vimcolor/solarized-master/img/skyhookmono14/screen-java-dark.png rename to .config/vim/vimcolor/solarized-master/img/skyhookmono14/screen-java-dark.png diff --git a/vimcolor/solarized-master/img/skyhookmono14/screen-java-light-th.png b/.config/vim/vimcolor/solarized-master/img/skyhookmono14/screen-java-light-th.png similarity index 100% rename from vimcolor/solarized-master/img/skyhookmono14/screen-java-light-th.png rename to .config/vim/vimcolor/solarized-master/img/skyhookmono14/screen-java-light-th.png diff --git a/vimcolor/solarized-master/img/skyhookmono14/screen-java-light.png b/.config/vim/vimcolor/solarized-master/img/skyhookmono14/screen-java-light.png similarity index 100% rename from vimcolor/solarized-master/img/skyhookmono14/screen-java-light.png rename to .config/vim/vimcolor/solarized-master/img/skyhookmono14/screen-java-light.png diff --git a/vimcolor/solarized-master/img/skyhookmono14/screen-javascript-dark-th.png b/.config/vim/vimcolor/solarized-master/img/skyhookmono14/screen-javascript-dark-th.png similarity index 100% rename from vimcolor/solarized-master/img/skyhookmono14/screen-javascript-dark-th.png rename to .config/vim/vimcolor/solarized-master/img/skyhookmono14/screen-javascript-dark-th.png diff --git a/vimcolor/solarized-master/img/skyhookmono14/screen-javascript-dark.png b/.config/vim/vimcolor/solarized-master/img/skyhookmono14/screen-javascript-dark.png similarity index 100% rename from vimcolor/solarized-master/img/skyhookmono14/screen-javascript-dark.png rename to .config/vim/vimcolor/solarized-master/img/skyhookmono14/screen-javascript-dark.png diff --git a/vimcolor/solarized-master/img/skyhookmono14/screen-javascript-light-th.png b/.config/vim/vimcolor/solarized-master/img/skyhookmono14/screen-javascript-light-th.png similarity index 100% rename from vimcolor/solarized-master/img/skyhookmono14/screen-javascript-light-th.png rename to .config/vim/vimcolor/solarized-master/img/skyhookmono14/screen-javascript-light-th.png diff --git a/vimcolor/solarized-master/img/skyhookmono14/screen-javascript-light.png b/.config/vim/vimcolor/solarized-master/img/skyhookmono14/screen-javascript-light.png similarity index 100% rename from vimcolor/solarized-master/img/skyhookmono14/screen-javascript-light.png rename to .config/vim/vimcolor/solarized-master/img/skyhookmono14/screen-javascript-light.png diff --git a/vimcolor/solarized-master/img/skyhookmono14/screen-pandoc-dark-th.png b/.config/vim/vimcolor/solarized-master/img/skyhookmono14/screen-pandoc-dark-th.png similarity index 100% rename from vimcolor/solarized-master/img/skyhookmono14/screen-pandoc-dark-th.png rename to .config/vim/vimcolor/solarized-master/img/skyhookmono14/screen-pandoc-dark-th.png diff --git a/vimcolor/solarized-master/img/skyhookmono14/screen-pandoc-dark.png b/.config/vim/vimcolor/solarized-master/img/skyhookmono14/screen-pandoc-dark.png similarity index 100% rename from vimcolor/solarized-master/img/skyhookmono14/screen-pandoc-dark.png rename to .config/vim/vimcolor/solarized-master/img/skyhookmono14/screen-pandoc-dark.png diff --git a/vimcolor/solarized-master/img/skyhookmono14/screen-pandoc-light-th.png b/.config/vim/vimcolor/solarized-master/img/skyhookmono14/screen-pandoc-light-th.png similarity index 100% rename from vimcolor/solarized-master/img/skyhookmono14/screen-pandoc-light-th.png rename to .config/vim/vimcolor/solarized-master/img/skyhookmono14/screen-pandoc-light-th.png diff --git a/vimcolor/solarized-master/img/skyhookmono14/screen-pandoc-light.png b/.config/vim/vimcolor/solarized-master/img/skyhookmono14/screen-pandoc-light.png similarity index 100% rename from vimcolor/solarized-master/img/skyhookmono14/screen-pandoc-light.png rename to .config/vim/vimcolor/solarized-master/img/skyhookmono14/screen-pandoc-light.png diff --git a/vimcolor/solarized-master/img/skyhookmono14/screen-perl-dark-th.png b/.config/vim/vimcolor/solarized-master/img/skyhookmono14/screen-perl-dark-th.png similarity index 100% rename from vimcolor/solarized-master/img/skyhookmono14/screen-perl-dark-th.png rename to .config/vim/vimcolor/solarized-master/img/skyhookmono14/screen-perl-dark-th.png diff --git a/vimcolor/solarized-master/img/skyhookmono14/screen-perl-dark.png b/.config/vim/vimcolor/solarized-master/img/skyhookmono14/screen-perl-dark.png similarity index 100% rename from vimcolor/solarized-master/img/skyhookmono14/screen-perl-dark.png rename to .config/vim/vimcolor/solarized-master/img/skyhookmono14/screen-perl-dark.png diff --git a/vimcolor/solarized-master/img/skyhookmono14/screen-perl-light-th.png b/.config/vim/vimcolor/solarized-master/img/skyhookmono14/screen-perl-light-th.png similarity index 100% rename from vimcolor/solarized-master/img/skyhookmono14/screen-perl-light-th.png rename to .config/vim/vimcolor/solarized-master/img/skyhookmono14/screen-perl-light-th.png diff --git a/vimcolor/solarized-master/img/skyhookmono14/screen-perl-light.png b/.config/vim/vimcolor/solarized-master/img/skyhookmono14/screen-perl-light.png similarity index 100% rename from vimcolor/solarized-master/img/skyhookmono14/screen-perl-light.png rename to .config/vim/vimcolor/solarized-master/img/skyhookmono14/screen-perl-light.png diff --git a/vimcolor/solarized-master/img/skyhookmono14/screen-php-dark-th.png b/.config/vim/vimcolor/solarized-master/img/skyhookmono14/screen-php-dark-th.png similarity index 100% rename from vimcolor/solarized-master/img/skyhookmono14/screen-php-dark-th.png rename to .config/vim/vimcolor/solarized-master/img/skyhookmono14/screen-php-dark-th.png diff --git a/vimcolor/solarized-master/img/skyhookmono14/screen-php-dark.png b/.config/vim/vimcolor/solarized-master/img/skyhookmono14/screen-php-dark.png similarity index 100% rename from vimcolor/solarized-master/img/skyhookmono14/screen-php-dark.png rename to .config/vim/vimcolor/solarized-master/img/skyhookmono14/screen-php-dark.png diff --git a/vimcolor/solarized-master/img/skyhookmono14/screen-php-light-th.png b/.config/vim/vimcolor/solarized-master/img/skyhookmono14/screen-php-light-th.png similarity index 100% rename from vimcolor/solarized-master/img/skyhookmono14/screen-php-light-th.png rename to .config/vim/vimcolor/solarized-master/img/skyhookmono14/screen-php-light-th.png diff --git a/vimcolor/solarized-master/img/skyhookmono14/screen-php-light.png b/.config/vim/vimcolor/solarized-master/img/skyhookmono14/screen-php-light.png similarity index 100% rename from vimcolor/solarized-master/img/skyhookmono14/screen-php-light.png rename to .config/vim/vimcolor/solarized-master/img/skyhookmono14/screen-php-light.png diff --git a/vimcolor/solarized-master/img/skyhookmono14/screen-python-dark-th.png b/.config/vim/vimcolor/solarized-master/img/skyhookmono14/screen-python-dark-th.png similarity index 100% rename from vimcolor/solarized-master/img/skyhookmono14/screen-python-dark-th.png rename to .config/vim/vimcolor/solarized-master/img/skyhookmono14/screen-python-dark-th.png diff --git a/vimcolor/solarized-master/img/skyhookmono14/screen-python-dark.png b/.config/vim/vimcolor/solarized-master/img/skyhookmono14/screen-python-dark.png similarity index 100% rename from vimcolor/solarized-master/img/skyhookmono14/screen-python-dark.png rename to .config/vim/vimcolor/solarized-master/img/skyhookmono14/screen-python-dark.png diff --git a/vimcolor/solarized-master/img/skyhookmono14/screen-python-light-th.png b/.config/vim/vimcolor/solarized-master/img/skyhookmono14/screen-python-light-th.png similarity index 100% rename from vimcolor/solarized-master/img/skyhookmono14/screen-python-light-th.png rename to .config/vim/vimcolor/solarized-master/img/skyhookmono14/screen-python-light-th.png diff --git a/vimcolor/solarized-master/img/skyhookmono14/screen-python-light.png b/.config/vim/vimcolor/solarized-master/img/skyhookmono14/screen-python-light.png similarity index 100% rename from vimcolor/solarized-master/img/skyhookmono14/screen-python-light.png rename to .config/vim/vimcolor/solarized-master/img/skyhookmono14/screen-python-light.png diff --git a/vimcolor/solarized-master/img/skyhookmono14/screen-ruby-dark-th.png b/.config/vim/vimcolor/solarized-master/img/skyhookmono14/screen-ruby-dark-th.png similarity index 100% rename from vimcolor/solarized-master/img/skyhookmono14/screen-ruby-dark-th.png rename to .config/vim/vimcolor/solarized-master/img/skyhookmono14/screen-ruby-dark-th.png diff --git a/vimcolor/solarized-master/img/skyhookmono14/screen-ruby-dark.png b/.config/vim/vimcolor/solarized-master/img/skyhookmono14/screen-ruby-dark.png similarity index 100% rename from vimcolor/solarized-master/img/skyhookmono14/screen-ruby-dark.png rename to .config/vim/vimcolor/solarized-master/img/skyhookmono14/screen-ruby-dark.png diff --git a/vimcolor/solarized-master/img/skyhookmono14/screen-ruby-light-th.png b/.config/vim/vimcolor/solarized-master/img/skyhookmono14/screen-ruby-light-th.png similarity index 100% rename from vimcolor/solarized-master/img/skyhookmono14/screen-ruby-light-th.png rename to .config/vim/vimcolor/solarized-master/img/skyhookmono14/screen-ruby-light-th.png diff --git a/vimcolor/solarized-master/img/skyhookmono14/screen-ruby-light.png b/.config/vim/vimcolor/solarized-master/img/skyhookmono14/screen-ruby-light.png similarity index 100% rename from vimcolor/solarized-master/img/skyhookmono14/screen-ruby-light.png rename to .config/vim/vimcolor/solarized-master/img/skyhookmono14/screen-ruby-light.png diff --git a/vimcolor/solarized-master/img/skyhookmono14/screen-shell-dark-th.png b/.config/vim/vimcolor/solarized-master/img/skyhookmono14/screen-shell-dark-th.png similarity index 100% rename from vimcolor/solarized-master/img/skyhookmono14/screen-shell-dark-th.png rename to .config/vim/vimcolor/solarized-master/img/skyhookmono14/screen-shell-dark-th.png diff --git a/vimcolor/solarized-master/img/skyhookmono14/screen-shell-dark.png b/.config/vim/vimcolor/solarized-master/img/skyhookmono14/screen-shell-dark.png similarity index 100% rename from vimcolor/solarized-master/img/skyhookmono14/screen-shell-dark.png rename to .config/vim/vimcolor/solarized-master/img/skyhookmono14/screen-shell-dark.png diff --git a/vimcolor/solarized-master/img/skyhookmono14/screen-shell-light-th.png b/.config/vim/vimcolor/solarized-master/img/skyhookmono14/screen-shell-light-th.png similarity index 100% rename from vimcolor/solarized-master/img/skyhookmono14/screen-shell-light-th.png rename to .config/vim/vimcolor/solarized-master/img/skyhookmono14/screen-shell-light-th.png diff --git a/vimcolor/solarized-master/img/skyhookmono14/screen-shell-light.png b/.config/vim/vimcolor/solarized-master/img/skyhookmono14/screen-shell-light.png similarity index 100% rename from vimcolor/solarized-master/img/skyhookmono14/screen-shell-light.png rename to .config/vim/vimcolor/solarized-master/img/skyhookmono14/screen-shell-light.png diff --git a/vimcolor/solarized-master/img/skyhookmono14/screen-tex-dark-th.png b/.config/vim/vimcolor/solarized-master/img/skyhookmono14/screen-tex-dark-th.png similarity index 100% rename from vimcolor/solarized-master/img/skyhookmono14/screen-tex-dark-th.png rename to .config/vim/vimcolor/solarized-master/img/skyhookmono14/screen-tex-dark-th.png diff --git a/vimcolor/solarized-master/img/skyhookmono14/screen-tex-dark.png b/.config/vim/vimcolor/solarized-master/img/skyhookmono14/screen-tex-dark.png similarity index 100% rename from vimcolor/solarized-master/img/skyhookmono14/screen-tex-dark.png rename to .config/vim/vimcolor/solarized-master/img/skyhookmono14/screen-tex-dark.png diff --git a/vimcolor/solarized-master/img/skyhookmono14/screen-tex-light-th.png b/.config/vim/vimcolor/solarized-master/img/skyhookmono14/screen-tex-light-th.png similarity index 100% rename from vimcolor/solarized-master/img/skyhookmono14/screen-tex-light-th.png rename to .config/vim/vimcolor/solarized-master/img/skyhookmono14/screen-tex-light-th.png diff --git a/vimcolor/solarized-master/img/skyhookmono14/screen-tex-light.png b/.config/vim/vimcolor/solarized-master/img/skyhookmono14/screen-tex-light.png similarity index 100% rename from vimcolor/solarized-master/img/skyhookmono14/screen-tex-light.png rename to .config/vim/vimcolor/solarized-master/img/skyhookmono14/screen-tex-light.png diff --git a/vimcolor/solarized-master/img/solarized images build.psd b/.config/vim/vimcolor/solarized-master/img/solarized images build.psd similarity index 100% rename from vimcolor/solarized-master/img/solarized images build.psd rename to .config/vim/vimcolor/solarized-master/img/solarized images build.psd diff --git a/vimcolor/solarized-master/img/solarized-165.png b/.config/vim/vimcolor/solarized-master/img/solarized-165.png similarity index 100% rename from vimcolor/solarized-master/img/solarized-165.png rename to .config/vim/vimcolor/solarized-master/img/solarized-165.png diff --git a/vimcolor/solarized-master/img/solarized-dualmode.png b/.config/vim/vimcolor/solarized-master/img/solarized-dualmode.png similarity index 100% rename from vimcolor/solarized-master/img/solarized-dualmode.png rename to .config/vim/vimcolor/solarized-master/img/solarized-dualmode.png diff --git a/vimcolor/solarized-master/img/solarized-fontsamples-dark.png b/.config/vim/vimcolor/solarized-master/img/solarized-fontsamples-dark.png similarity index 100% rename from vimcolor/solarized-master/img/solarized-fontsamples-dark.png rename to .config/vim/vimcolor/solarized-master/img/solarized-fontsamples-dark.png diff --git a/vimcolor/solarized-master/img/solarized-fontsamples-light.png b/.config/vim/vimcolor/solarized-master/img/solarized-fontsamples-light.png similarity index 100% rename from vimcolor/solarized-master/img/solarized-fontsamples-light.png rename to .config/vim/vimcolor/solarized-master/img/solarized-fontsamples-light.png diff --git a/vimcolor/solarized-master/img/solarized-palette.png b/.config/vim/vimcolor/solarized-master/img/solarized-palette.png similarity index 100% rename from vimcolor/solarized-master/img/solarized-palette.png rename to .config/vim/vimcolor/solarized-master/img/solarized-palette.png diff --git a/vimcolor/solarized-master/img/solarized-selcon.png b/.config/vim/vimcolor/solarized-master/img/solarized-selcon.png similarity index 100% rename from vimcolor/solarized-master/img/solarized-selcon.png rename to .config/vim/vimcolor/solarized-master/img/solarized-selcon.png diff --git a/vimcolor/solarized-master/img/solarized-sym.png b/.config/vim/vimcolor/solarized-master/img/solarized-sym.png similarity index 100% rename from vimcolor/solarized-master/img/solarized-sym.png rename to .config/vim/vimcolor/solarized-master/img/solarized-sym.png diff --git a/vimcolor/solarized-master/img/solarized-values-dark.png b/.config/vim/vimcolor/solarized-master/img/solarized-values-dark.png similarity index 100% rename from vimcolor/solarized-master/img/solarized-values-dark.png rename to .config/vim/vimcolor/solarized-master/img/solarized-values-dark.png diff --git a/vimcolor/solarized-master/img/solarized-values-light.png b/.config/vim/vimcolor/solarized-master/img/solarized-values-light.png similarity index 100% rename from vimcolor/solarized-master/img/solarized-values-light.png rename to .config/vim/vimcolor/solarized-master/img/solarized-values-light.png diff --git a/vimcolor/solarized-master/img/solarized-vim.png b/.config/vim/vimcolor/solarized-master/img/solarized-vim.png similarity index 100% rename from vimcolor/solarized-master/img/solarized-vim.png rename to .config/vim/vimcolor/solarized-master/img/solarized-vim.png diff --git a/vimcolor/solarized-master/img/solarized-yinyang.png b/.config/vim/vimcolor/solarized-master/img/solarized-yinyang.png similarity index 100% rename from vimcolor/solarized-master/img/solarized-yinyang.png rename to .config/vim/vimcolor/solarized-master/img/solarized-yinyang.png diff --git a/vimcolor/solarized-master/img/terminus12/index.html b/.config/vim/vimcolor/solarized-master/img/terminus12/index.html similarity index 100% rename from vimcolor/solarized-master/img/terminus12/index.html rename to .config/vim/vimcolor/solarized-master/img/terminus12/index.html diff --git a/vimcolor/solarized-master/img/terminus12/screen-c-dark-th.png b/.config/vim/vimcolor/solarized-master/img/terminus12/screen-c-dark-th.png similarity index 100% rename from vimcolor/solarized-master/img/terminus12/screen-c-dark-th.png rename to .config/vim/vimcolor/solarized-master/img/terminus12/screen-c-dark-th.png diff --git a/vimcolor/solarized-master/img/terminus12/screen-c-dark.png b/.config/vim/vimcolor/solarized-master/img/terminus12/screen-c-dark.png similarity index 100% rename from vimcolor/solarized-master/img/terminus12/screen-c-dark.png rename to .config/vim/vimcolor/solarized-master/img/terminus12/screen-c-dark.png diff --git a/vimcolor/solarized-master/img/terminus12/screen-c-light-th.png b/.config/vim/vimcolor/solarized-master/img/terminus12/screen-c-light-th.png similarity index 100% rename from vimcolor/solarized-master/img/terminus12/screen-c-light-th.png rename to .config/vim/vimcolor/solarized-master/img/terminus12/screen-c-light-th.png diff --git a/vimcolor/solarized-master/img/terminus12/screen-c-light.png b/.config/vim/vimcolor/solarized-master/img/terminus12/screen-c-light.png similarity index 100% rename from vimcolor/solarized-master/img/terminus12/screen-c-light.png rename to .config/vim/vimcolor/solarized-master/img/terminus12/screen-c-light.png diff --git a/vimcolor/solarized-master/img/terminus12/screen-haskell-dark-th.png b/.config/vim/vimcolor/solarized-master/img/terminus12/screen-haskell-dark-th.png similarity index 100% rename from vimcolor/solarized-master/img/terminus12/screen-haskell-dark-th.png rename to .config/vim/vimcolor/solarized-master/img/terminus12/screen-haskell-dark-th.png diff --git a/vimcolor/solarized-master/img/terminus12/screen-haskell-dark.png b/.config/vim/vimcolor/solarized-master/img/terminus12/screen-haskell-dark.png similarity index 100% rename from vimcolor/solarized-master/img/terminus12/screen-haskell-dark.png rename to .config/vim/vimcolor/solarized-master/img/terminus12/screen-haskell-dark.png diff --git a/vimcolor/solarized-master/img/terminus12/screen-haskell-light-th.png b/.config/vim/vimcolor/solarized-master/img/terminus12/screen-haskell-light-th.png similarity index 100% rename from vimcolor/solarized-master/img/terminus12/screen-haskell-light-th.png rename to .config/vim/vimcolor/solarized-master/img/terminus12/screen-haskell-light-th.png diff --git a/vimcolor/solarized-master/img/terminus12/screen-haskell-light.png b/.config/vim/vimcolor/solarized-master/img/terminus12/screen-haskell-light.png similarity index 100% rename from vimcolor/solarized-master/img/terminus12/screen-haskell-light.png rename to .config/vim/vimcolor/solarized-master/img/terminus12/screen-haskell-light.png diff --git a/vimcolor/solarized-master/img/terminus12/screen-html-dark-th.png b/.config/vim/vimcolor/solarized-master/img/terminus12/screen-html-dark-th.png similarity index 100% rename from vimcolor/solarized-master/img/terminus12/screen-html-dark-th.png rename to .config/vim/vimcolor/solarized-master/img/terminus12/screen-html-dark-th.png diff --git a/vimcolor/solarized-master/img/terminus12/screen-html-dark.png b/.config/vim/vimcolor/solarized-master/img/terminus12/screen-html-dark.png similarity index 100% rename from vimcolor/solarized-master/img/terminus12/screen-html-dark.png rename to .config/vim/vimcolor/solarized-master/img/terminus12/screen-html-dark.png diff --git a/vimcolor/solarized-master/img/terminus12/screen-html-light-th.png b/.config/vim/vimcolor/solarized-master/img/terminus12/screen-html-light-th.png similarity index 100% rename from vimcolor/solarized-master/img/terminus12/screen-html-light-th.png rename to .config/vim/vimcolor/solarized-master/img/terminus12/screen-html-light-th.png diff --git a/vimcolor/solarized-master/img/terminus12/screen-html-light.png b/.config/vim/vimcolor/solarized-master/img/terminus12/screen-html-light.png similarity index 100% rename from vimcolor/solarized-master/img/terminus12/screen-html-light.png rename to .config/vim/vimcolor/solarized-master/img/terminus12/screen-html-light.png diff --git a/vimcolor/solarized-master/img/terminus12/screen-java-dark-th.png b/.config/vim/vimcolor/solarized-master/img/terminus12/screen-java-dark-th.png similarity index 100% rename from vimcolor/solarized-master/img/terminus12/screen-java-dark-th.png rename to .config/vim/vimcolor/solarized-master/img/terminus12/screen-java-dark-th.png diff --git a/vimcolor/solarized-master/img/terminus12/screen-java-dark.png b/.config/vim/vimcolor/solarized-master/img/terminus12/screen-java-dark.png similarity index 100% rename from vimcolor/solarized-master/img/terminus12/screen-java-dark.png rename to .config/vim/vimcolor/solarized-master/img/terminus12/screen-java-dark.png diff --git a/vimcolor/solarized-master/img/terminus12/screen-java-light-th.png b/.config/vim/vimcolor/solarized-master/img/terminus12/screen-java-light-th.png similarity index 100% rename from vimcolor/solarized-master/img/terminus12/screen-java-light-th.png rename to .config/vim/vimcolor/solarized-master/img/terminus12/screen-java-light-th.png diff --git a/vimcolor/solarized-master/img/terminus12/screen-java-light.png b/.config/vim/vimcolor/solarized-master/img/terminus12/screen-java-light.png similarity index 100% rename from vimcolor/solarized-master/img/terminus12/screen-java-light.png rename to .config/vim/vimcolor/solarized-master/img/terminus12/screen-java-light.png diff --git a/vimcolor/solarized-master/img/terminus12/screen-javascript-dark-th.png b/.config/vim/vimcolor/solarized-master/img/terminus12/screen-javascript-dark-th.png similarity index 100% rename from vimcolor/solarized-master/img/terminus12/screen-javascript-dark-th.png rename to .config/vim/vimcolor/solarized-master/img/terminus12/screen-javascript-dark-th.png diff --git a/vimcolor/solarized-master/img/terminus12/screen-javascript-dark.png b/.config/vim/vimcolor/solarized-master/img/terminus12/screen-javascript-dark.png similarity index 100% rename from vimcolor/solarized-master/img/terminus12/screen-javascript-dark.png rename to .config/vim/vimcolor/solarized-master/img/terminus12/screen-javascript-dark.png diff --git a/vimcolor/solarized-master/img/terminus12/screen-javascript-light-th.png b/.config/vim/vimcolor/solarized-master/img/terminus12/screen-javascript-light-th.png similarity index 100% rename from vimcolor/solarized-master/img/terminus12/screen-javascript-light-th.png rename to .config/vim/vimcolor/solarized-master/img/terminus12/screen-javascript-light-th.png diff --git a/vimcolor/solarized-master/img/terminus12/screen-javascript-light.png b/.config/vim/vimcolor/solarized-master/img/terminus12/screen-javascript-light.png similarity index 100% rename from vimcolor/solarized-master/img/terminus12/screen-javascript-light.png rename to .config/vim/vimcolor/solarized-master/img/terminus12/screen-javascript-light.png diff --git a/vimcolor/solarized-master/img/terminus12/screen-pandoc-dark-th.png b/.config/vim/vimcolor/solarized-master/img/terminus12/screen-pandoc-dark-th.png similarity index 100% rename from vimcolor/solarized-master/img/terminus12/screen-pandoc-dark-th.png rename to .config/vim/vimcolor/solarized-master/img/terminus12/screen-pandoc-dark-th.png diff --git a/vimcolor/solarized-master/img/terminus12/screen-pandoc-dark.png b/.config/vim/vimcolor/solarized-master/img/terminus12/screen-pandoc-dark.png similarity index 100% rename from vimcolor/solarized-master/img/terminus12/screen-pandoc-dark.png rename to .config/vim/vimcolor/solarized-master/img/terminus12/screen-pandoc-dark.png diff --git a/vimcolor/solarized-master/img/terminus12/screen-pandoc-light-th.png b/.config/vim/vimcolor/solarized-master/img/terminus12/screen-pandoc-light-th.png similarity index 100% rename from vimcolor/solarized-master/img/terminus12/screen-pandoc-light-th.png rename to .config/vim/vimcolor/solarized-master/img/terminus12/screen-pandoc-light-th.png diff --git a/vimcolor/solarized-master/img/terminus12/screen-pandoc-light.png b/.config/vim/vimcolor/solarized-master/img/terminus12/screen-pandoc-light.png similarity index 100% rename from vimcolor/solarized-master/img/terminus12/screen-pandoc-light.png rename to .config/vim/vimcolor/solarized-master/img/terminus12/screen-pandoc-light.png diff --git a/vimcolor/solarized-master/img/terminus12/screen-perl-dark-th.png b/.config/vim/vimcolor/solarized-master/img/terminus12/screen-perl-dark-th.png similarity index 100% rename from vimcolor/solarized-master/img/terminus12/screen-perl-dark-th.png rename to .config/vim/vimcolor/solarized-master/img/terminus12/screen-perl-dark-th.png diff --git a/vimcolor/solarized-master/img/terminus12/screen-perl-dark.png b/.config/vim/vimcolor/solarized-master/img/terminus12/screen-perl-dark.png similarity index 100% rename from vimcolor/solarized-master/img/terminus12/screen-perl-dark.png rename to .config/vim/vimcolor/solarized-master/img/terminus12/screen-perl-dark.png diff --git a/vimcolor/solarized-master/img/terminus12/screen-perl-light-th.png b/.config/vim/vimcolor/solarized-master/img/terminus12/screen-perl-light-th.png similarity index 100% rename from vimcolor/solarized-master/img/terminus12/screen-perl-light-th.png rename to .config/vim/vimcolor/solarized-master/img/terminus12/screen-perl-light-th.png diff --git a/vimcolor/solarized-master/img/terminus12/screen-perl-light.png b/.config/vim/vimcolor/solarized-master/img/terminus12/screen-perl-light.png similarity index 100% rename from vimcolor/solarized-master/img/terminus12/screen-perl-light.png rename to .config/vim/vimcolor/solarized-master/img/terminus12/screen-perl-light.png diff --git a/vimcolor/solarized-master/img/terminus12/screen-php-dark-th.png b/.config/vim/vimcolor/solarized-master/img/terminus12/screen-php-dark-th.png similarity index 100% rename from vimcolor/solarized-master/img/terminus12/screen-php-dark-th.png rename to .config/vim/vimcolor/solarized-master/img/terminus12/screen-php-dark-th.png diff --git a/vimcolor/solarized-master/img/terminus12/screen-php-dark.png b/.config/vim/vimcolor/solarized-master/img/terminus12/screen-php-dark.png similarity index 100% rename from vimcolor/solarized-master/img/terminus12/screen-php-dark.png rename to .config/vim/vimcolor/solarized-master/img/terminus12/screen-php-dark.png diff --git a/vimcolor/solarized-master/img/terminus12/screen-php-light-th.png b/.config/vim/vimcolor/solarized-master/img/terminus12/screen-php-light-th.png similarity index 100% rename from vimcolor/solarized-master/img/terminus12/screen-php-light-th.png rename to .config/vim/vimcolor/solarized-master/img/terminus12/screen-php-light-th.png diff --git a/vimcolor/solarized-master/img/terminus12/screen-php-light.png b/.config/vim/vimcolor/solarized-master/img/terminus12/screen-php-light.png similarity index 100% rename from vimcolor/solarized-master/img/terminus12/screen-php-light.png rename to .config/vim/vimcolor/solarized-master/img/terminus12/screen-php-light.png diff --git a/vimcolor/solarized-master/img/terminus12/screen-python-dark-th.png b/.config/vim/vimcolor/solarized-master/img/terminus12/screen-python-dark-th.png similarity index 100% rename from vimcolor/solarized-master/img/terminus12/screen-python-dark-th.png rename to .config/vim/vimcolor/solarized-master/img/terminus12/screen-python-dark-th.png diff --git a/vimcolor/solarized-master/img/terminus12/screen-python-dark.png b/.config/vim/vimcolor/solarized-master/img/terminus12/screen-python-dark.png similarity index 100% rename from vimcolor/solarized-master/img/terminus12/screen-python-dark.png rename to .config/vim/vimcolor/solarized-master/img/terminus12/screen-python-dark.png diff --git a/vimcolor/solarized-master/img/terminus12/screen-python-light-th.png b/.config/vim/vimcolor/solarized-master/img/terminus12/screen-python-light-th.png similarity index 100% rename from vimcolor/solarized-master/img/terminus12/screen-python-light-th.png rename to .config/vim/vimcolor/solarized-master/img/terminus12/screen-python-light-th.png diff --git a/vimcolor/solarized-master/img/terminus12/screen-python-light.png b/.config/vim/vimcolor/solarized-master/img/terminus12/screen-python-light.png similarity index 100% rename from vimcolor/solarized-master/img/terminus12/screen-python-light.png rename to .config/vim/vimcolor/solarized-master/img/terminus12/screen-python-light.png diff --git a/vimcolor/solarized-master/img/terminus12/screen-ruby-dark-th.png b/.config/vim/vimcolor/solarized-master/img/terminus12/screen-ruby-dark-th.png similarity index 100% rename from vimcolor/solarized-master/img/terminus12/screen-ruby-dark-th.png rename to .config/vim/vimcolor/solarized-master/img/terminus12/screen-ruby-dark-th.png diff --git a/vimcolor/solarized-master/img/terminus12/screen-ruby-dark.png b/.config/vim/vimcolor/solarized-master/img/terminus12/screen-ruby-dark.png similarity index 100% rename from vimcolor/solarized-master/img/terminus12/screen-ruby-dark.png rename to .config/vim/vimcolor/solarized-master/img/terminus12/screen-ruby-dark.png diff --git a/vimcolor/solarized-master/img/terminus12/screen-ruby-light-th.png b/.config/vim/vimcolor/solarized-master/img/terminus12/screen-ruby-light-th.png similarity index 100% rename from vimcolor/solarized-master/img/terminus12/screen-ruby-light-th.png rename to .config/vim/vimcolor/solarized-master/img/terminus12/screen-ruby-light-th.png diff --git a/vimcolor/solarized-master/img/terminus12/screen-ruby-light.png b/.config/vim/vimcolor/solarized-master/img/terminus12/screen-ruby-light.png similarity index 100% rename from vimcolor/solarized-master/img/terminus12/screen-ruby-light.png rename to .config/vim/vimcolor/solarized-master/img/terminus12/screen-ruby-light.png diff --git a/vimcolor/solarized-master/img/terminus12/screen-shell-dark-th.png b/.config/vim/vimcolor/solarized-master/img/terminus12/screen-shell-dark-th.png similarity index 100% rename from vimcolor/solarized-master/img/terminus12/screen-shell-dark-th.png rename to .config/vim/vimcolor/solarized-master/img/terminus12/screen-shell-dark-th.png diff --git a/vimcolor/solarized-master/img/terminus12/screen-shell-dark.png b/.config/vim/vimcolor/solarized-master/img/terminus12/screen-shell-dark.png similarity index 100% rename from vimcolor/solarized-master/img/terminus12/screen-shell-dark.png rename to .config/vim/vimcolor/solarized-master/img/terminus12/screen-shell-dark.png diff --git a/vimcolor/solarized-master/img/terminus12/screen-shell-light-th.png b/.config/vim/vimcolor/solarized-master/img/terminus12/screen-shell-light-th.png similarity index 100% rename from vimcolor/solarized-master/img/terminus12/screen-shell-light-th.png rename to .config/vim/vimcolor/solarized-master/img/terminus12/screen-shell-light-th.png diff --git a/vimcolor/solarized-master/img/terminus12/screen-shell-light.png b/.config/vim/vimcolor/solarized-master/img/terminus12/screen-shell-light.png similarity index 100% rename from vimcolor/solarized-master/img/terminus12/screen-shell-light.png rename to .config/vim/vimcolor/solarized-master/img/terminus12/screen-shell-light.png diff --git a/vimcolor/solarized-master/img/terminus12/screen-tex-dark-th.png b/.config/vim/vimcolor/solarized-master/img/terminus12/screen-tex-dark-th.png similarity index 100% rename from vimcolor/solarized-master/img/terminus12/screen-tex-dark-th.png rename to .config/vim/vimcolor/solarized-master/img/terminus12/screen-tex-dark-th.png diff --git a/vimcolor/solarized-master/img/terminus12/screen-tex-dark.png b/.config/vim/vimcolor/solarized-master/img/terminus12/screen-tex-dark.png similarity index 100% rename from vimcolor/solarized-master/img/terminus12/screen-tex-dark.png rename to .config/vim/vimcolor/solarized-master/img/terminus12/screen-tex-dark.png diff --git a/vimcolor/solarized-master/img/terminus12/screen-tex-light-th.png b/.config/vim/vimcolor/solarized-master/img/terminus12/screen-tex-light-th.png similarity index 100% rename from vimcolor/solarized-master/img/terminus12/screen-tex-light-th.png rename to .config/vim/vimcolor/solarized-master/img/terminus12/screen-tex-light-th.png diff --git a/vimcolor/solarized-master/img/terminus12/screen-tex-light.png b/.config/vim/vimcolor/solarized-master/img/terminus12/screen-tex-light.png similarity index 100% rename from vimcolor/solarized-master/img/terminus12/screen-tex-light.png rename to .config/vim/vimcolor/solarized-master/img/terminus12/screen-tex-light.png diff --git a/vimcolor/solarized-master/img/terminus20/index.html b/.config/vim/vimcolor/solarized-master/img/terminus20/index.html similarity index 100% rename from vimcolor/solarized-master/img/terminus20/index.html rename to .config/vim/vimcolor/solarized-master/img/terminus20/index.html diff --git a/vimcolor/solarized-master/img/terminus20/screen-c-dark-th.png b/.config/vim/vimcolor/solarized-master/img/terminus20/screen-c-dark-th.png similarity index 100% rename from vimcolor/solarized-master/img/terminus20/screen-c-dark-th.png rename to .config/vim/vimcolor/solarized-master/img/terminus20/screen-c-dark-th.png diff --git a/vimcolor/solarized-master/img/terminus20/screen-c-dark.png b/.config/vim/vimcolor/solarized-master/img/terminus20/screen-c-dark.png similarity index 100% rename from vimcolor/solarized-master/img/terminus20/screen-c-dark.png rename to .config/vim/vimcolor/solarized-master/img/terminus20/screen-c-dark.png diff --git a/vimcolor/solarized-master/img/terminus20/screen-c-light-th.png b/.config/vim/vimcolor/solarized-master/img/terminus20/screen-c-light-th.png similarity index 100% rename from vimcolor/solarized-master/img/terminus20/screen-c-light-th.png rename to .config/vim/vimcolor/solarized-master/img/terminus20/screen-c-light-th.png diff --git a/vimcolor/solarized-master/img/terminus20/screen-c-light.png b/.config/vim/vimcolor/solarized-master/img/terminus20/screen-c-light.png similarity index 100% rename from vimcolor/solarized-master/img/terminus20/screen-c-light.png rename to .config/vim/vimcolor/solarized-master/img/terminus20/screen-c-light.png diff --git a/vimcolor/solarized-master/img/terminus20/screen-haskell-dark-th.png b/.config/vim/vimcolor/solarized-master/img/terminus20/screen-haskell-dark-th.png similarity index 100% rename from vimcolor/solarized-master/img/terminus20/screen-haskell-dark-th.png rename to .config/vim/vimcolor/solarized-master/img/terminus20/screen-haskell-dark-th.png diff --git a/vimcolor/solarized-master/img/terminus20/screen-haskell-dark.png b/.config/vim/vimcolor/solarized-master/img/terminus20/screen-haskell-dark.png similarity index 100% rename from vimcolor/solarized-master/img/terminus20/screen-haskell-dark.png rename to .config/vim/vimcolor/solarized-master/img/terminus20/screen-haskell-dark.png diff --git a/vimcolor/solarized-master/img/terminus20/screen-haskell-light-th.png b/.config/vim/vimcolor/solarized-master/img/terminus20/screen-haskell-light-th.png similarity index 100% rename from vimcolor/solarized-master/img/terminus20/screen-haskell-light-th.png rename to .config/vim/vimcolor/solarized-master/img/terminus20/screen-haskell-light-th.png diff --git a/vimcolor/solarized-master/img/terminus20/screen-haskell-light.png b/.config/vim/vimcolor/solarized-master/img/terminus20/screen-haskell-light.png similarity index 100% rename from vimcolor/solarized-master/img/terminus20/screen-haskell-light.png rename to .config/vim/vimcolor/solarized-master/img/terminus20/screen-haskell-light.png diff --git a/vimcolor/solarized-master/img/terminus20/screen-html-dark-th.png b/.config/vim/vimcolor/solarized-master/img/terminus20/screen-html-dark-th.png similarity index 100% rename from vimcolor/solarized-master/img/terminus20/screen-html-dark-th.png rename to .config/vim/vimcolor/solarized-master/img/terminus20/screen-html-dark-th.png diff --git a/vimcolor/solarized-master/img/terminus20/screen-html-dark.png b/.config/vim/vimcolor/solarized-master/img/terminus20/screen-html-dark.png similarity index 100% rename from vimcolor/solarized-master/img/terminus20/screen-html-dark.png rename to .config/vim/vimcolor/solarized-master/img/terminus20/screen-html-dark.png diff --git a/vimcolor/solarized-master/img/terminus20/screen-html-light-th.png b/.config/vim/vimcolor/solarized-master/img/terminus20/screen-html-light-th.png similarity index 100% rename from vimcolor/solarized-master/img/terminus20/screen-html-light-th.png rename to .config/vim/vimcolor/solarized-master/img/terminus20/screen-html-light-th.png diff --git a/vimcolor/solarized-master/img/terminus20/screen-html-light.png b/.config/vim/vimcolor/solarized-master/img/terminus20/screen-html-light.png similarity index 100% rename from vimcolor/solarized-master/img/terminus20/screen-html-light.png rename to .config/vim/vimcolor/solarized-master/img/terminus20/screen-html-light.png diff --git a/vimcolor/solarized-master/img/terminus20/screen-java-dark-th.png b/.config/vim/vimcolor/solarized-master/img/terminus20/screen-java-dark-th.png similarity index 100% rename from vimcolor/solarized-master/img/terminus20/screen-java-dark-th.png rename to .config/vim/vimcolor/solarized-master/img/terminus20/screen-java-dark-th.png diff --git a/vimcolor/solarized-master/img/terminus20/screen-java-dark.png b/.config/vim/vimcolor/solarized-master/img/terminus20/screen-java-dark.png similarity index 100% rename from vimcolor/solarized-master/img/terminus20/screen-java-dark.png rename to .config/vim/vimcolor/solarized-master/img/terminus20/screen-java-dark.png diff --git a/vimcolor/solarized-master/img/terminus20/screen-java-light-th.png b/.config/vim/vimcolor/solarized-master/img/terminus20/screen-java-light-th.png similarity index 100% rename from vimcolor/solarized-master/img/terminus20/screen-java-light-th.png rename to .config/vim/vimcolor/solarized-master/img/terminus20/screen-java-light-th.png diff --git a/vimcolor/solarized-master/img/terminus20/screen-java-light.png b/.config/vim/vimcolor/solarized-master/img/terminus20/screen-java-light.png similarity index 100% rename from vimcolor/solarized-master/img/terminus20/screen-java-light.png rename to .config/vim/vimcolor/solarized-master/img/terminus20/screen-java-light.png diff --git a/vimcolor/solarized-master/img/terminus20/screen-javascript-dark-th.png b/.config/vim/vimcolor/solarized-master/img/terminus20/screen-javascript-dark-th.png similarity index 100% rename from vimcolor/solarized-master/img/terminus20/screen-javascript-dark-th.png rename to .config/vim/vimcolor/solarized-master/img/terminus20/screen-javascript-dark-th.png diff --git a/vimcolor/solarized-master/img/terminus20/screen-javascript-dark.png b/.config/vim/vimcolor/solarized-master/img/terminus20/screen-javascript-dark.png similarity index 100% rename from vimcolor/solarized-master/img/terminus20/screen-javascript-dark.png rename to .config/vim/vimcolor/solarized-master/img/terminus20/screen-javascript-dark.png diff --git a/vimcolor/solarized-master/img/terminus20/screen-javascript-light-th.png b/.config/vim/vimcolor/solarized-master/img/terminus20/screen-javascript-light-th.png similarity index 100% rename from vimcolor/solarized-master/img/terminus20/screen-javascript-light-th.png rename to .config/vim/vimcolor/solarized-master/img/terminus20/screen-javascript-light-th.png diff --git a/vimcolor/solarized-master/img/terminus20/screen-javascript-light.png b/.config/vim/vimcolor/solarized-master/img/terminus20/screen-javascript-light.png similarity index 100% rename from vimcolor/solarized-master/img/terminus20/screen-javascript-light.png rename to .config/vim/vimcolor/solarized-master/img/terminus20/screen-javascript-light.png diff --git a/vimcolor/solarized-master/img/terminus20/screen-pandoc-dark-th.png b/.config/vim/vimcolor/solarized-master/img/terminus20/screen-pandoc-dark-th.png similarity index 100% rename from vimcolor/solarized-master/img/terminus20/screen-pandoc-dark-th.png rename to .config/vim/vimcolor/solarized-master/img/terminus20/screen-pandoc-dark-th.png diff --git a/vimcolor/solarized-master/img/terminus20/screen-pandoc-dark.png b/.config/vim/vimcolor/solarized-master/img/terminus20/screen-pandoc-dark.png similarity index 100% rename from vimcolor/solarized-master/img/terminus20/screen-pandoc-dark.png rename to .config/vim/vimcolor/solarized-master/img/terminus20/screen-pandoc-dark.png diff --git a/vimcolor/solarized-master/img/terminus20/screen-pandoc-light-th.png b/.config/vim/vimcolor/solarized-master/img/terminus20/screen-pandoc-light-th.png similarity index 100% rename from vimcolor/solarized-master/img/terminus20/screen-pandoc-light-th.png rename to .config/vim/vimcolor/solarized-master/img/terminus20/screen-pandoc-light-th.png diff --git a/vimcolor/solarized-master/img/terminus20/screen-pandoc-light.png b/.config/vim/vimcolor/solarized-master/img/terminus20/screen-pandoc-light.png similarity index 100% rename from vimcolor/solarized-master/img/terminus20/screen-pandoc-light.png rename to .config/vim/vimcolor/solarized-master/img/terminus20/screen-pandoc-light.png diff --git a/vimcolor/solarized-master/img/terminus20/screen-perl-dark-th.png b/.config/vim/vimcolor/solarized-master/img/terminus20/screen-perl-dark-th.png similarity index 100% rename from vimcolor/solarized-master/img/terminus20/screen-perl-dark-th.png rename to .config/vim/vimcolor/solarized-master/img/terminus20/screen-perl-dark-th.png diff --git a/vimcolor/solarized-master/img/terminus20/screen-perl-dark.png b/.config/vim/vimcolor/solarized-master/img/terminus20/screen-perl-dark.png similarity index 100% rename from vimcolor/solarized-master/img/terminus20/screen-perl-dark.png rename to .config/vim/vimcolor/solarized-master/img/terminus20/screen-perl-dark.png diff --git a/vimcolor/solarized-master/img/terminus20/screen-perl-light-th.png b/.config/vim/vimcolor/solarized-master/img/terminus20/screen-perl-light-th.png similarity index 100% rename from vimcolor/solarized-master/img/terminus20/screen-perl-light-th.png rename to .config/vim/vimcolor/solarized-master/img/terminus20/screen-perl-light-th.png diff --git a/vimcolor/solarized-master/img/terminus20/screen-perl-light.png b/.config/vim/vimcolor/solarized-master/img/terminus20/screen-perl-light.png similarity index 100% rename from vimcolor/solarized-master/img/terminus20/screen-perl-light.png rename to .config/vim/vimcolor/solarized-master/img/terminus20/screen-perl-light.png diff --git a/vimcolor/solarized-master/img/terminus20/screen-php-dark-th.png b/.config/vim/vimcolor/solarized-master/img/terminus20/screen-php-dark-th.png similarity index 100% rename from vimcolor/solarized-master/img/terminus20/screen-php-dark-th.png rename to .config/vim/vimcolor/solarized-master/img/terminus20/screen-php-dark-th.png diff --git a/vimcolor/solarized-master/img/terminus20/screen-php-dark.png b/.config/vim/vimcolor/solarized-master/img/terminus20/screen-php-dark.png similarity index 100% rename from vimcolor/solarized-master/img/terminus20/screen-php-dark.png rename to .config/vim/vimcolor/solarized-master/img/terminus20/screen-php-dark.png diff --git a/vimcolor/solarized-master/img/terminus20/screen-php-light-th.png b/.config/vim/vimcolor/solarized-master/img/terminus20/screen-php-light-th.png similarity index 100% rename from vimcolor/solarized-master/img/terminus20/screen-php-light-th.png rename to .config/vim/vimcolor/solarized-master/img/terminus20/screen-php-light-th.png diff --git a/vimcolor/solarized-master/img/terminus20/screen-php-light.png b/.config/vim/vimcolor/solarized-master/img/terminus20/screen-php-light.png similarity index 100% rename from vimcolor/solarized-master/img/terminus20/screen-php-light.png rename to .config/vim/vimcolor/solarized-master/img/terminus20/screen-php-light.png diff --git a/vimcolor/solarized-master/img/terminus20/screen-python-dark-th.png b/.config/vim/vimcolor/solarized-master/img/terminus20/screen-python-dark-th.png similarity index 100% rename from vimcolor/solarized-master/img/terminus20/screen-python-dark-th.png rename to .config/vim/vimcolor/solarized-master/img/terminus20/screen-python-dark-th.png diff --git a/vimcolor/solarized-master/img/terminus20/screen-python-dark.png b/.config/vim/vimcolor/solarized-master/img/terminus20/screen-python-dark.png similarity index 100% rename from vimcolor/solarized-master/img/terminus20/screen-python-dark.png rename to .config/vim/vimcolor/solarized-master/img/terminus20/screen-python-dark.png diff --git a/vimcolor/solarized-master/img/terminus20/screen-python-light-th.png b/.config/vim/vimcolor/solarized-master/img/terminus20/screen-python-light-th.png similarity index 100% rename from vimcolor/solarized-master/img/terminus20/screen-python-light-th.png rename to .config/vim/vimcolor/solarized-master/img/terminus20/screen-python-light-th.png diff --git a/vimcolor/solarized-master/img/terminus20/screen-python-light.png b/.config/vim/vimcolor/solarized-master/img/terminus20/screen-python-light.png similarity index 100% rename from vimcolor/solarized-master/img/terminus20/screen-python-light.png rename to .config/vim/vimcolor/solarized-master/img/terminus20/screen-python-light.png diff --git a/vimcolor/solarized-master/img/terminus20/screen-ruby-dark-th.png b/.config/vim/vimcolor/solarized-master/img/terminus20/screen-ruby-dark-th.png similarity index 100% rename from vimcolor/solarized-master/img/terminus20/screen-ruby-dark-th.png rename to .config/vim/vimcolor/solarized-master/img/terminus20/screen-ruby-dark-th.png diff --git a/vimcolor/solarized-master/img/terminus20/screen-ruby-dark.png b/.config/vim/vimcolor/solarized-master/img/terminus20/screen-ruby-dark.png similarity index 100% rename from vimcolor/solarized-master/img/terminus20/screen-ruby-dark.png rename to .config/vim/vimcolor/solarized-master/img/terminus20/screen-ruby-dark.png diff --git a/vimcolor/solarized-master/img/terminus20/screen-ruby-light-th.png b/.config/vim/vimcolor/solarized-master/img/terminus20/screen-ruby-light-th.png similarity index 100% rename from vimcolor/solarized-master/img/terminus20/screen-ruby-light-th.png rename to .config/vim/vimcolor/solarized-master/img/terminus20/screen-ruby-light-th.png diff --git a/vimcolor/solarized-master/img/terminus20/screen-ruby-light.png b/.config/vim/vimcolor/solarized-master/img/terminus20/screen-ruby-light.png similarity index 100% rename from vimcolor/solarized-master/img/terminus20/screen-ruby-light.png rename to .config/vim/vimcolor/solarized-master/img/terminus20/screen-ruby-light.png diff --git a/vimcolor/solarized-master/img/terminus20/screen-shell-dark-th.png b/.config/vim/vimcolor/solarized-master/img/terminus20/screen-shell-dark-th.png similarity index 100% rename from vimcolor/solarized-master/img/terminus20/screen-shell-dark-th.png rename to .config/vim/vimcolor/solarized-master/img/terminus20/screen-shell-dark-th.png diff --git a/vimcolor/solarized-master/img/terminus20/screen-shell-dark.png b/.config/vim/vimcolor/solarized-master/img/terminus20/screen-shell-dark.png similarity index 100% rename from vimcolor/solarized-master/img/terminus20/screen-shell-dark.png rename to .config/vim/vimcolor/solarized-master/img/terminus20/screen-shell-dark.png diff --git a/vimcolor/solarized-master/img/terminus20/screen-shell-light-th.png b/.config/vim/vimcolor/solarized-master/img/terminus20/screen-shell-light-th.png similarity index 100% rename from vimcolor/solarized-master/img/terminus20/screen-shell-light-th.png rename to .config/vim/vimcolor/solarized-master/img/terminus20/screen-shell-light-th.png diff --git a/vimcolor/solarized-master/img/terminus20/screen-shell-light.png b/.config/vim/vimcolor/solarized-master/img/terminus20/screen-shell-light.png similarity index 100% rename from vimcolor/solarized-master/img/terminus20/screen-shell-light.png rename to .config/vim/vimcolor/solarized-master/img/terminus20/screen-shell-light.png diff --git a/vimcolor/solarized-master/img/terminus20/screen-tex-dark-th.png b/.config/vim/vimcolor/solarized-master/img/terminus20/screen-tex-dark-th.png similarity index 100% rename from vimcolor/solarized-master/img/terminus20/screen-tex-dark-th.png rename to .config/vim/vimcolor/solarized-master/img/terminus20/screen-tex-dark-th.png diff --git a/vimcolor/solarized-master/img/terminus20/screen-tex-dark.png b/.config/vim/vimcolor/solarized-master/img/terminus20/screen-tex-dark.png similarity index 100% rename from vimcolor/solarized-master/img/terminus20/screen-tex-dark.png rename to .config/vim/vimcolor/solarized-master/img/terminus20/screen-tex-dark.png diff --git a/vimcolor/solarized-master/img/terminus20/screen-tex-light-th.png b/.config/vim/vimcolor/solarized-master/img/terminus20/screen-tex-light-th.png similarity index 100% rename from vimcolor/solarized-master/img/terminus20/screen-tex-light-th.png rename to .config/vim/vimcolor/solarized-master/img/terminus20/screen-tex-light-th.png diff --git a/vimcolor/solarized-master/img/terminus20/screen-tex-light.png b/.config/vim/vimcolor/solarized-master/img/terminus20/screen-tex-light.png similarity index 100% rename from vimcolor/solarized-master/img/terminus20/screen-tex-light.png rename to .config/vim/vimcolor/solarized-master/img/terminus20/screen-tex-light.png diff --git a/vimcolor/solarized-master/intellij-colors-solarized/README.md b/.config/vim/vimcolor/solarized-master/intellij-colors-solarized/README.md similarity index 100% rename from vimcolor/solarized-master/intellij-colors-solarized/README.md rename to .config/vim/vimcolor/solarized-master/intellij-colors-solarized/README.md diff --git a/vimcolor/solarized-master/intellij-colors-solarized/Solarized Dark.xml b/.config/vim/vimcolor/solarized-master/intellij-colors-solarized/Solarized Dark.xml similarity index 100% rename from vimcolor/solarized-master/intellij-colors-solarized/Solarized Dark.xml rename to .config/vim/vimcolor/solarized-master/intellij-colors-solarized/Solarized Dark.xml diff --git a/vimcolor/solarized-master/intellij-colors-solarized/Solarized Light.xml b/.config/vim/vimcolor/solarized-master/intellij-colors-solarized/Solarized Light.xml similarity index 100% rename from vimcolor/solarized-master/intellij-colors-solarized/Solarized Light.xml rename to .config/vim/vimcolor/solarized-master/intellij-colors-solarized/Solarized Light.xml diff --git a/vimcolor/solarized-master/intellij-colors-solarized/buildjar.sh b/.config/vim/vimcolor/solarized-master/intellij-colors-solarized/buildjar.sh similarity index 100% rename from vimcolor/solarized-master/intellij-colors-solarized/buildjar.sh rename to .config/vim/vimcolor/solarized-master/intellij-colors-solarized/buildjar.sh diff --git a/vimcolor/solarized-master/intellij-colors-solarized/settings.jar b/.config/vim/vimcolor/solarized-master/intellij-colors-solarized/settings.jar similarity index 100% rename from vimcolor/solarized-master/intellij-colors-solarized/settings.jar rename to .config/vim/vimcolor/solarized-master/intellij-colors-solarized/settings.jar diff --git a/vimcolor/solarized-master/iterm2-colors-solarized/README.md b/.config/vim/vimcolor/solarized-master/iterm2-colors-solarized/README.md similarity index 100% rename from vimcolor/solarized-master/iterm2-colors-solarized/README.md rename to .config/vim/vimcolor/solarized-master/iterm2-colors-solarized/README.md diff --git a/vimcolor/solarized-master/iterm2-colors-solarized/Solarized Dark.itermcolors b/.config/vim/vimcolor/solarized-master/iterm2-colors-solarized/Solarized Dark.itermcolors similarity index 100% rename from vimcolor/solarized-master/iterm2-colors-solarized/Solarized Dark.itermcolors rename to .config/vim/vimcolor/solarized-master/iterm2-colors-solarized/Solarized Dark.itermcolors diff --git a/vimcolor/solarized-master/iterm2-colors-solarized/Solarized Light.itermcolors b/.config/vim/vimcolor/solarized-master/iterm2-colors-solarized/Solarized Light.itermcolors similarity index 100% rename from vimcolor/solarized-master/iterm2-colors-solarized/Solarized Light.itermcolors rename to .config/vim/vimcolor/solarized-master/iterm2-colors-solarized/Solarized Light.itermcolors diff --git a/vimcolor/solarized-master/mutt-colors-solarized/README.md b/.config/vim/vimcolor/solarized-master/mutt-colors-solarized/README.md similarity index 100% rename from vimcolor/solarized-master/mutt-colors-solarized/README.md rename to .config/vim/vimcolor/solarized-master/mutt-colors-solarized/README.md diff --git a/vimcolor/solarized-master/mutt-colors-solarized/mutt-colors-solarized-dark-16.muttrc b/.config/vim/vimcolor/solarized-master/mutt-colors-solarized/mutt-colors-solarized-dark-16.muttrc similarity index 100% rename from vimcolor/solarized-master/mutt-colors-solarized/mutt-colors-solarized-dark-16.muttrc rename to .config/vim/vimcolor/solarized-master/mutt-colors-solarized/mutt-colors-solarized-dark-16.muttrc diff --git a/vimcolor/solarized-master/mutt-colors-solarized/mutt-colors-solarized-dark-256.muttrc b/.config/vim/vimcolor/solarized-master/mutt-colors-solarized/mutt-colors-solarized-dark-256.muttrc similarity index 100% rename from vimcolor/solarized-master/mutt-colors-solarized/mutt-colors-solarized-dark-256.muttrc rename to .config/vim/vimcolor/solarized-master/mutt-colors-solarized/mutt-colors-solarized-dark-256.muttrc diff --git a/vimcolor/solarized-master/mutt-colors-solarized/mutt-colors-solarized-light-16.muttrc b/.config/vim/vimcolor/solarized-master/mutt-colors-solarized/mutt-colors-solarized-light-16.muttrc similarity index 100% rename from vimcolor/solarized-master/mutt-colors-solarized/mutt-colors-solarized-light-16.muttrc rename to .config/vim/vimcolor/solarized-master/mutt-colors-solarized/mutt-colors-solarized-light-16.muttrc diff --git a/vimcolor/solarized-master/mutt-colors-solarized/mutt-colors-solarized-light-256.muttrc b/.config/vim/vimcolor/solarized-master/mutt-colors-solarized/mutt-colors-solarized-light-256.muttrc similarity index 100% rename from vimcolor/solarized-master/mutt-colors-solarized/mutt-colors-solarized-light-256.muttrc rename to .config/vim/vimcolor/solarized-master/mutt-colors-solarized/mutt-colors-solarized-light-256.muttrc diff --git a/vimcolor/solarized-master/mutt-colors-solarized/mutt-colors-solarized-template.muttrc b/.config/vim/vimcolor/solarized-master/mutt-colors-solarized/mutt-colors-solarized-template.muttrc similarity index 100% rename from vimcolor/solarized-master/mutt-colors-solarized/mutt-colors-solarized-template.muttrc rename to .config/vim/vimcolor/solarized-master/mutt-colors-solarized/mutt-colors-solarized-template.muttrc diff --git a/vimcolor/solarized-master/mutt-colors-solarized/mutt-compile-colors.sh b/.config/vim/vimcolor/solarized-master/mutt-colors-solarized/mutt-compile-colors.sh similarity index 100% rename from vimcolor/solarized-master/mutt-colors-solarized/mutt-compile-colors.sh rename to .config/vim/vimcolor/solarized-master/mutt-colors-solarized/mutt-compile-colors.sh diff --git a/vimcolor/solarized-master/netbeans-colors-solarized/README.md b/.config/vim/vimcolor/solarized-master/netbeans-colors-solarized/README.md similarity index 100% rename from vimcolor/solarized-master/netbeans-colors-solarized/README.md rename to .config/vim/vimcolor/solarized-master/netbeans-colors-solarized/README.md diff --git a/vimcolor/solarized-master/netbeans-colors-solarized/config/.nbattrs b/.config/vim/vimcolor/solarized-master/netbeans-colors-solarized/config/.nbattrs similarity index 100% rename from vimcolor/solarized-master/netbeans-colors-solarized/config/.nbattrs rename to .config/vim/vimcolor/solarized-master/netbeans-colors-solarized/config/.nbattrs diff --git a/vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/FontsColors/Netbeans_Solarized_Dark/.nbattrs b/.config/vim/vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/FontsColors/Netbeans_Solarized_Dark/.nbattrs similarity index 100% rename from vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/FontsColors/Netbeans_Solarized_Dark/.nbattrs rename to .config/vim/vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/FontsColors/Netbeans_Solarized_Dark/.nbattrs diff --git a/vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/FontsColors/Netbeans_Solarized_Dark/org-netbeans-modules-editor-settings-CustomFontsColors-highlights.xml b/.config/vim/vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/FontsColors/Netbeans_Solarized_Dark/org-netbeans-modules-editor-settings-CustomFontsColors-highlights.xml similarity index 100% rename from vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/FontsColors/Netbeans_Solarized_Dark/org-netbeans-modules-editor-settings-CustomFontsColors-highlights.xml rename to .config/vim/vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/FontsColors/Netbeans_Solarized_Dark/org-netbeans-modules-editor-settings-CustomFontsColors-highlights.xml diff --git a/vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/FontsColors/Netbeans_Solarized_Dark/org-netbeans-modules-editor-settings-CustomFontsColors-tokenColorings.xml b/.config/vim/vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/FontsColors/Netbeans_Solarized_Dark/org-netbeans-modules-editor-settings-CustomFontsColors-tokenColorings.xml similarity index 100% rename from vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/FontsColors/Netbeans_Solarized_Dark/org-netbeans-modules-editor-settings-CustomFontsColors-tokenColorings.xml rename to .config/vim/vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/FontsColors/Netbeans_Solarized_Dark/org-netbeans-modules-editor-settings-CustomFontsColors-tokenColorings.xml diff --git a/vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/application/xml-dtd/FontsColors/Netbeans_Solarized_Dark/.nbattrs b/.config/vim/vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/application/xml-dtd/FontsColors/Netbeans_Solarized_Dark/.nbattrs similarity index 100% rename from vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/application/xml-dtd/FontsColors/Netbeans_Solarized_Dark/.nbattrs rename to .config/vim/vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/application/xml-dtd/FontsColors/Netbeans_Solarized_Dark/.nbattrs diff --git a/vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/application/xml-dtd/FontsColors/Netbeans_Solarized_Dark/org-netbeans-modules-editor-settings-CustomFontsColors-tokenColorings.xml b/.config/vim/vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/application/xml-dtd/FontsColors/Netbeans_Solarized_Dark/org-netbeans-modules-editor-settings-CustomFontsColors-tokenColorings.xml similarity index 100% rename from vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/application/xml-dtd/FontsColors/Netbeans_Solarized_Dark/org-netbeans-modules-editor-settings-CustomFontsColors-tokenColorings.xml rename to .config/vim/vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/application/xml-dtd/FontsColors/Netbeans_Solarized_Dark/org-netbeans-modules-editor-settings-CustomFontsColors-tokenColorings.xml diff --git a/vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/html/FontsColors/Netbeans_Solarized_Dark/.nbattrs b/.config/vim/vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/html/FontsColors/Netbeans_Solarized_Dark/.nbattrs similarity index 100% rename from vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/html/FontsColors/Netbeans_Solarized_Dark/.nbattrs rename to .config/vim/vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/html/FontsColors/Netbeans_Solarized_Dark/.nbattrs diff --git a/vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/html/FontsColors/Netbeans_Solarized_Dark/org-netbeans-modules-editor-settings-CustomFontsColors-tokenColorings.xml b/.config/vim/vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/html/FontsColors/Netbeans_Solarized_Dark/org-netbeans-modules-editor-settings-CustomFontsColors-tokenColorings.xml similarity index 100% rename from vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/html/FontsColors/Netbeans_Solarized_Dark/org-netbeans-modules-editor-settings-CustomFontsColors-tokenColorings.xml rename to .config/vim/vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/html/FontsColors/Netbeans_Solarized_Dark/org-netbeans-modules-editor-settings-CustomFontsColors-tokenColorings.xml diff --git a/vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/javascript/FontsColors/Netbeans_Solarized_Dark/.nbattrs b/.config/vim/vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/javascript/FontsColors/Netbeans_Solarized_Dark/.nbattrs similarity index 100% rename from vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/javascript/FontsColors/Netbeans_Solarized_Dark/.nbattrs rename to .config/vim/vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/javascript/FontsColors/Netbeans_Solarized_Dark/.nbattrs diff --git a/vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/javascript/FontsColors/Netbeans_Solarized_Dark/org-netbeans-modules-editor-settings-CustomFontsColors-tokenColorings.xml b/.config/vim/vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/javascript/FontsColors/Netbeans_Solarized_Dark/org-netbeans-modules-editor-settings-CustomFontsColors-tokenColorings.xml similarity index 100% rename from vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/javascript/FontsColors/Netbeans_Solarized_Dark/org-netbeans-modules-editor-settings-CustomFontsColors-tokenColorings.xml rename to .config/vim/vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/javascript/FontsColors/Netbeans_Solarized_Dark/org-netbeans-modules-editor-settings-CustomFontsColors-tokenColorings.xml diff --git a/vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/plain/FontsColors/Netbeans_Solarized_Dark/.nbattrs b/.config/vim/vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/plain/FontsColors/Netbeans_Solarized_Dark/.nbattrs similarity index 100% rename from vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/plain/FontsColors/Netbeans_Solarized_Dark/.nbattrs rename to .config/vim/vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/plain/FontsColors/Netbeans_Solarized_Dark/.nbattrs diff --git a/vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/plain/FontsColors/Netbeans_Solarized_Dark/org-netbeans-modules-editor-settings-CustomFontsColors-tokenColorings.xml b/.config/vim/vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/plain/FontsColors/Netbeans_Solarized_Dark/org-netbeans-modules-editor-settings-CustomFontsColors-tokenColorings.xml similarity index 100% rename from vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/plain/FontsColors/Netbeans_Solarized_Dark/org-netbeans-modules-editor-settings-CustomFontsColors-tokenColorings.xml rename to .config/vim/vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/plain/FontsColors/Netbeans_Solarized_Dark/org-netbeans-modules-editor-settings-CustomFontsColors-tokenColorings.xml diff --git a/vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/x-css/FontsColors/Netbeans_Solarized_Dark/.nbattrs b/.config/vim/vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/x-css/FontsColors/Netbeans_Solarized_Dark/.nbattrs similarity index 100% rename from vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/x-css/FontsColors/Netbeans_Solarized_Dark/.nbattrs rename to .config/vim/vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/x-css/FontsColors/Netbeans_Solarized_Dark/.nbattrs diff --git a/vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/x-css/FontsColors/Netbeans_Solarized_Dark/org-netbeans-modules-editor-settings-CustomFontsColors-tokenColorings.xml b/.config/vim/vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/x-css/FontsColors/Netbeans_Solarized_Dark/org-netbeans-modules-editor-settings-CustomFontsColors-tokenColorings.xml similarity index 100% rename from vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/x-css/FontsColors/Netbeans_Solarized_Dark/org-netbeans-modules-editor-settings-CustomFontsColors-tokenColorings.xml rename to .config/vim/vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/x-css/FontsColors/Netbeans_Solarized_Dark/org-netbeans-modules-editor-settings-CustomFontsColors-tokenColorings.xml diff --git a/vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/x-diff/FontsColors/Netbeans_Solarized_Dark/.nbattrs b/.config/vim/vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/x-diff/FontsColors/Netbeans_Solarized_Dark/.nbattrs similarity index 100% rename from vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/x-diff/FontsColors/Netbeans_Solarized_Dark/.nbattrs rename to .config/vim/vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/x-diff/FontsColors/Netbeans_Solarized_Dark/.nbattrs diff --git a/vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/x-diff/FontsColors/Netbeans_Solarized_Dark/org-netbeans-modules-editor-settings-CustomFontsColors-tokenColorings.xml b/.config/vim/vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/x-diff/FontsColors/Netbeans_Solarized_Dark/org-netbeans-modules-editor-settings-CustomFontsColors-tokenColorings.xml similarity index 100% rename from vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/x-diff/FontsColors/Netbeans_Solarized_Dark/org-netbeans-modules-editor-settings-CustomFontsColors-tokenColorings.xml rename to .config/vim/vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/x-diff/FontsColors/Netbeans_Solarized_Dark/org-netbeans-modules-editor-settings-CustomFontsColors-tokenColorings.xml diff --git a/vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/x-ini/FontsColors/Netbeans_Solarized_Dark/.nbattrs b/.config/vim/vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/x-ini/FontsColors/Netbeans_Solarized_Dark/.nbattrs similarity index 100% rename from vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/x-ini/FontsColors/Netbeans_Solarized_Dark/.nbattrs rename to .config/vim/vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/x-ini/FontsColors/Netbeans_Solarized_Dark/.nbattrs diff --git a/vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/x-ini/FontsColors/Netbeans_Solarized_Dark/org-netbeans-modules-editor-settings-CustomFontsColors-tokenColorings.xml b/.config/vim/vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/x-ini/FontsColors/Netbeans_Solarized_Dark/org-netbeans-modules-editor-settings-CustomFontsColors-tokenColorings.xml similarity index 100% rename from vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/x-ini/FontsColors/Netbeans_Solarized_Dark/org-netbeans-modules-editor-settings-CustomFontsColors-tokenColorings.xml rename to .config/vim/vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/x-ini/FontsColors/Netbeans_Solarized_Dark/org-netbeans-modules-editor-settings-CustomFontsColors-tokenColorings.xml diff --git a/vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/x-javascript-comment/FontsColors/Netbeans_Solarized_Dark/.nbattrs b/.config/vim/vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/x-javascript-comment/FontsColors/Netbeans_Solarized_Dark/.nbattrs similarity index 100% rename from vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/x-javascript-comment/FontsColors/Netbeans_Solarized_Dark/.nbattrs rename to .config/vim/vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/x-javascript-comment/FontsColors/Netbeans_Solarized_Dark/.nbattrs diff --git a/vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/x-javascript-comment/FontsColors/Netbeans_Solarized_Dark/org-netbeans-modules-editor-settings-CustomFontsColors-tokenColorings.xml b/.config/vim/vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/x-javascript-comment/FontsColors/Netbeans_Solarized_Dark/org-netbeans-modules-editor-settings-CustomFontsColors-tokenColorings.xml similarity index 100% rename from vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/x-javascript-comment/FontsColors/Netbeans_Solarized_Dark/org-netbeans-modules-editor-settings-CustomFontsColors-tokenColorings.xml rename to .config/vim/vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/x-javascript-comment/FontsColors/Netbeans_Solarized_Dark/org-netbeans-modules-editor-settings-CustomFontsColors-tokenColorings.xml diff --git a/vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/x-javascript-string/FontsColors/Netbeans_Solarized_Dark/.nbattrs b/.config/vim/vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/x-javascript-string/FontsColors/Netbeans_Solarized_Dark/.nbattrs similarity index 100% rename from vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/x-javascript-string/FontsColors/Netbeans_Solarized_Dark/.nbattrs rename to .config/vim/vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/x-javascript-string/FontsColors/Netbeans_Solarized_Dark/.nbattrs diff --git a/vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/x-javascript-string/FontsColors/Netbeans_Solarized_Dark/org-netbeans-modules-editor-settings-CustomFontsColors-tokenColorings.xml b/.config/vim/vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/x-javascript-string/FontsColors/Netbeans_Solarized_Dark/org-netbeans-modules-editor-settings-CustomFontsColors-tokenColorings.xml similarity index 100% rename from vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/x-javascript-string/FontsColors/Netbeans_Solarized_Dark/org-netbeans-modules-editor-settings-CustomFontsColors-tokenColorings.xml rename to .config/vim/vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/x-javascript-string/FontsColors/Netbeans_Solarized_Dark/org-netbeans-modules-editor-settings-CustomFontsColors-tokenColorings.xml diff --git a/vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/x-json/FontsColors/Netbeans_Solarized_Dark/.nbattrs b/.config/vim/vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/x-json/FontsColors/Netbeans_Solarized_Dark/.nbattrs similarity index 100% rename from vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/x-json/FontsColors/Netbeans_Solarized_Dark/.nbattrs rename to .config/vim/vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/x-json/FontsColors/Netbeans_Solarized_Dark/.nbattrs diff --git a/vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/x-json/FontsColors/Netbeans_Solarized_Dark/org-netbeans-modules-editor-settings-CustomFontsColors-tokenColorings.xml b/.config/vim/vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/x-json/FontsColors/Netbeans_Solarized_Dark/org-netbeans-modules-editor-settings-CustomFontsColors-tokenColorings.xml similarity index 100% rename from vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/x-json/FontsColors/Netbeans_Solarized_Dark/org-netbeans-modules-editor-settings-CustomFontsColors-tokenColorings.xml rename to .config/vim/vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/x-json/FontsColors/Netbeans_Solarized_Dark/org-netbeans-modules-editor-settings-CustomFontsColors-tokenColorings.xml diff --git a/vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/x-php5/FontsColors/Netbeans_Solarized_Dark/.nbattrs b/.config/vim/vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/x-php5/FontsColors/Netbeans_Solarized_Dark/.nbattrs similarity index 100% rename from vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/x-php5/FontsColors/Netbeans_Solarized_Dark/.nbattrs rename to .config/vim/vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/x-php5/FontsColors/Netbeans_Solarized_Dark/.nbattrs diff --git a/vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/x-php5/FontsColors/Netbeans_Solarized_Dark/org-netbeans-modules-editor-settings-CustomFontsColors-tokenColorings.xml b/.config/vim/vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/x-php5/FontsColors/Netbeans_Solarized_Dark/org-netbeans-modules-editor-settings-CustomFontsColors-tokenColorings.xml similarity index 100% rename from vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/x-php5/FontsColors/Netbeans_Solarized_Dark/org-netbeans-modules-editor-settings-CustomFontsColors-tokenColorings.xml rename to .config/vim/vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/x-php5/FontsColors/Netbeans_Solarized_Dark/org-netbeans-modules-editor-settings-CustomFontsColors-tokenColorings.xml diff --git a/vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/x-properties/FontsColors/Netbeans_Solarized_Dark/.nbattrs b/.config/vim/vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/x-properties/FontsColors/Netbeans_Solarized_Dark/.nbattrs similarity index 100% rename from vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/x-properties/FontsColors/Netbeans_Solarized_Dark/.nbattrs rename to .config/vim/vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/x-properties/FontsColors/Netbeans_Solarized_Dark/.nbattrs diff --git a/vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/x-properties/FontsColors/Netbeans_Solarized_Dark/org-netbeans-modules-editor-settings-CustomFontsColors-tokenColorings.xml b/.config/vim/vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/x-properties/FontsColors/Netbeans_Solarized_Dark/org-netbeans-modules-editor-settings-CustomFontsColors-tokenColorings.xml similarity index 100% rename from vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/x-properties/FontsColors/Netbeans_Solarized_Dark/org-netbeans-modules-editor-settings-CustomFontsColors-tokenColorings.xml rename to .config/vim/vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/x-properties/FontsColors/Netbeans_Solarized_Dark/org-netbeans-modules-editor-settings-CustomFontsColors-tokenColorings.xml diff --git a/vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/x-sql/FontsColors/Netbeans_Solarized_Dark/.nbattrs b/.config/vim/vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/x-sql/FontsColors/Netbeans_Solarized_Dark/.nbattrs similarity index 100% rename from vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/x-sql/FontsColors/Netbeans_Solarized_Dark/.nbattrs rename to .config/vim/vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/x-sql/FontsColors/Netbeans_Solarized_Dark/.nbattrs diff --git a/vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/x-sql/FontsColors/Netbeans_Solarized_Dark/org-netbeans-modules-editor-settings-CustomFontsColors-tokenColorings.xml b/.config/vim/vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/x-sql/FontsColors/Netbeans_Solarized_Dark/org-netbeans-modules-editor-settings-CustomFontsColors-tokenColorings.xml similarity index 100% rename from vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/x-sql/FontsColors/Netbeans_Solarized_Dark/org-netbeans-modules-editor-settings-CustomFontsColors-tokenColorings.xml rename to .config/vim/vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/x-sql/FontsColors/Netbeans_Solarized_Dark/org-netbeans-modules-editor-settings-CustomFontsColors-tokenColorings.xml diff --git a/vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/x-yaml/FontsColors/Netbeans_Solarized_Dark/.nbattrs b/.config/vim/vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/x-yaml/FontsColors/Netbeans_Solarized_Dark/.nbattrs similarity index 100% rename from vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/x-yaml/FontsColors/Netbeans_Solarized_Dark/.nbattrs rename to .config/vim/vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/x-yaml/FontsColors/Netbeans_Solarized_Dark/.nbattrs diff --git a/vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/x-yaml/FontsColors/Netbeans_Solarized_Dark/org-netbeans-modules-editor-settings-CustomFontsColors-tokenColorings.xml b/.config/vim/vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/x-yaml/FontsColors/Netbeans_Solarized_Dark/org-netbeans-modules-editor-settings-CustomFontsColors-tokenColorings.xml similarity index 100% rename from vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/x-yaml/FontsColors/Netbeans_Solarized_Dark/org-netbeans-modules-editor-settings-CustomFontsColors-tokenColorings.xml rename to .config/vim/vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/x-yaml/FontsColors/Netbeans_Solarized_Dark/org-netbeans-modules-editor-settings-CustomFontsColors-tokenColorings.xml diff --git a/vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/xhtml/FontsColors/Netbeans_Solarized_Dark/.nbattrs b/.config/vim/vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/xhtml/FontsColors/Netbeans_Solarized_Dark/.nbattrs similarity index 100% rename from vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/xhtml/FontsColors/Netbeans_Solarized_Dark/.nbattrs rename to .config/vim/vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/xhtml/FontsColors/Netbeans_Solarized_Dark/.nbattrs diff --git a/vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/xhtml/FontsColors/Netbeans_Solarized_Dark/org-netbeans-modules-editor-settings-CustomFontsColors-tokenColorings.xml b/.config/vim/vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/xhtml/FontsColors/Netbeans_Solarized_Dark/org-netbeans-modules-editor-settings-CustomFontsColors-tokenColorings.xml similarity index 100% rename from vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/xhtml/FontsColors/Netbeans_Solarized_Dark/org-netbeans-modules-editor-settings-CustomFontsColors-tokenColorings.xml rename to .config/vim/vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/xhtml/FontsColors/Netbeans_Solarized_Dark/org-netbeans-modules-editor-settings-CustomFontsColors-tokenColorings.xml diff --git a/vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/xml-external-parsed-entity/FontsColors/Netbeans_Solarized_Dark/.nbattrs b/.config/vim/vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/xml-external-parsed-entity/FontsColors/Netbeans_Solarized_Dark/.nbattrs similarity index 100% rename from vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/xml-external-parsed-entity/FontsColors/Netbeans_Solarized_Dark/.nbattrs rename to .config/vim/vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/xml-external-parsed-entity/FontsColors/Netbeans_Solarized_Dark/.nbattrs diff --git a/vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/xml-external-parsed-entity/FontsColors/Netbeans_Solarized_Dark/org-netbeans-modules-editor-settings-CustomFontsColors-tokenColorings.xml b/.config/vim/vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/xml-external-parsed-entity/FontsColors/Netbeans_Solarized_Dark/org-netbeans-modules-editor-settings-CustomFontsColors-tokenColorings.xml similarity index 100% rename from vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/xml-external-parsed-entity/FontsColors/Netbeans_Solarized_Dark/org-netbeans-modules-editor-settings-CustomFontsColors-tokenColorings.xml rename to .config/vim/vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/xml-external-parsed-entity/FontsColors/Netbeans_Solarized_Dark/org-netbeans-modules-editor-settings-CustomFontsColors-tokenColorings.xml diff --git a/vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/xml/FontsColors/Netbeans_Solarized_Dark/.nbattrs b/.config/vim/vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/xml/FontsColors/Netbeans_Solarized_Dark/.nbattrs similarity index 100% rename from vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/xml/FontsColors/Netbeans_Solarized_Dark/.nbattrs rename to .config/vim/vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/xml/FontsColors/Netbeans_Solarized_Dark/.nbattrs diff --git a/vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/xml/FontsColors/Netbeans_Solarized_Dark/org-netbeans-modules-editor-settings-CustomFontsColors-tokenColorings.xml b/.config/vim/vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/xml/FontsColors/Netbeans_Solarized_Dark/org-netbeans-modules-editor-settings-CustomFontsColors-tokenColorings.xml similarity index 100% rename from vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/xml/FontsColors/Netbeans_Solarized_Dark/org-netbeans-modules-editor-settings-CustomFontsColors-tokenColorings.xml rename to .config/vim/vimcolor/solarized-master/netbeans-colors-solarized/config/Editors/text/xml/FontsColors/Netbeans_Solarized_Dark/org-netbeans-modules-editor-settings-CustomFontsColors-tokenColorings.xml diff --git a/vimcolor/solarized-master/osx-terminal.app-colors-solarized/README.md b/.config/vim/vimcolor/solarized-master/osx-terminal.app-colors-solarized/README.md similarity index 100% rename from vimcolor/solarized-master/osx-terminal.app-colors-solarized/README.md rename to .config/vim/vimcolor/solarized-master/osx-terminal.app-colors-solarized/README.md diff --git a/vimcolor/solarized-master/osx-terminal.app-colors-solarized/Solarized Dark ansi.terminal b/.config/vim/vimcolor/solarized-master/osx-terminal.app-colors-solarized/Solarized Dark ansi.terminal similarity index 100% rename from vimcolor/solarized-master/osx-terminal.app-colors-solarized/Solarized Dark ansi.terminal rename to .config/vim/vimcolor/solarized-master/osx-terminal.app-colors-solarized/Solarized Dark ansi.terminal diff --git a/vimcolor/solarized-master/osx-terminal.app-colors-solarized/Solarized Light ansi.terminal b/.config/vim/vimcolor/solarized-master/osx-terminal.app-colors-solarized/Solarized Light ansi.terminal similarity index 100% rename from vimcolor/solarized-master/osx-terminal.app-colors-solarized/Solarized Light ansi.terminal rename to .config/vim/vimcolor/solarized-master/osx-terminal.app-colors-solarized/Solarized Light ansi.terminal diff --git a/vimcolor/solarized-master/osx-terminal.app-colors-solarized/xterm-256color/README.md b/.config/vim/vimcolor/solarized-master/osx-terminal.app-colors-solarized/xterm-256color/README.md similarity index 100% rename from vimcolor/solarized-master/osx-terminal.app-colors-solarized/xterm-256color/README.md rename to .config/vim/vimcolor/solarized-master/osx-terminal.app-colors-solarized/xterm-256color/README.md diff --git a/vimcolor/solarized-master/osx-terminal.app-colors-solarized/xterm-256color/Solarized Dark xterm-256color.terminal b/.config/vim/vimcolor/solarized-master/osx-terminal.app-colors-solarized/xterm-256color/Solarized Dark xterm-256color.terminal similarity index 100% rename from vimcolor/solarized-master/osx-terminal.app-colors-solarized/xterm-256color/Solarized Dark xterm-256color.terminal rename to .config/vim/vimcolor/solarized-master/osx-terminal.app-colors-solarized/xterm-256color/Solarized Dark xterm-256color.terminal diff --git a/vimcolor/solarized-master/osx-terminal.app-colors-solarized/xterm-256color/Solarized Light xterm-256color.terminal b/.config/vim/vimcolor/solarized-master/osx-terminal.app-colors-solarized/xterm-256color/Solarized Light xterm-256color.terminal similarity index 100% rename from vimcolor/solarized-master/osx-terminal.app-colors-solarized/xterm-256color/Solarized Light xterm-256color.terminal rename to .config/vim/vimcolor/solarized-master/osx-terminal.app-colors-solarized/xterm-256color/Solarized Light xterm-256color.terminal diff --git a/vimcolor/solarized-master/putty-colors-solarized/README.mkd b/.config/vim/vimcolor/solarized-master/putty-colors-solarized/README.mkd similarity index 100% rename from vimcolor/solarized-master/putty-colors-solarized/README.mkd rename to .config/vim/vimcolor/solarized-master/putty-colors-solarized/README.mkd diff --git a/vimcolor/solarized-master/putty-colors-solarized/dark.png b/.config/vim/vimcolor/solarized-master/putty-colors-solarized/dark.png similarity index 100% rename from vimcolor/solarized-master/putty-colors-solarized/dark.png rename to .config/vim/vimcolor/solarized-master/putty-colors-solarized/dark.png diff --git a/vimcolor/solarized-master/putty-colors-solarized/light.png b/.config/vim/vimcolor/solarized-master/putty-colors-solarized/light.png similarity index 100% rename from vimcolor/solarized-master/putty-colors-solarized/light.png rename to .config/vim/vimcolor/solarized-master/putty-colors-solarized/light.png diff --git a/vimcolor/solarized-master/putty-colors-solarized/solarized_dark.reg b/.config/vim/vimcolor/solarized-master/putty-colors-solarized/solarized_dark.reg similarity index 100% rename from vimcolor/solarized-master/putty-colors-solarized/solarized_dark.reg rename to .config/vim/vimcolor/solarized-master/putty-colors-solarized/solarized_dark.reg diff --git a/vimcolor/solarized-master/putty-colors-solarized/solarized_dark_puttytray.txt b/.config/vim/vimcolor/solarized-master/putty-colors-solarized/solarized_dark_puttytray.txt similarity index 100% rename from vimcolor/solarized-master/putty-colors-solarized/solarized_dark_puttytray.txt rename to .config/vim/vimcolor/solarized-master/putty-colors-solarized/solarized_dark_puttytray.txt diff --git a/vimcolor/solarized-master/putty-colors-solarized/solarized_light.reg b/.config/vim/vimcolor/solarized-master/putty-colors-solarized/solarized_light.reg similarity index 100% rename from vimcolor/solarized-master/putty-colors-solarized/solarized_light.reg rename to .config/vim/vimcolor/solarized-master/putty-colors-solarized/solarized_light.reg diff --git a/vimcolor/solarized-master/putty-colors-solarized/solarized_light_puttytray.txt b/.config/vim/vimcolor/solarized-master/putty-colors-solarized/solarized_light_puttytray.txt similarity index 100% rename from vimcolor/solarized-master/putty-colors-solarized/solarized_light_puttytray.txt rename to .config/vim/vimcolor/solarized-master/putty-colors-solarized/solarized_light_puttytray.txt diff --git a/vimcolor/solarized-master/qtcreator/QtCreator.png b/.config/vim/vimcolor/solarized-master/qtcreator/QtCreator.png similarity index 100% rename from vimcolor/solarized-master/qtcreator/QtCreator.png rename to .config/vim/vimcolor/solarized-master/qtcreator/QtCreator.png diff --git a/vimcolor/solarized-master/qtcreator/README.md b/.config/vim/vimcolor/solarized-master/qtcreator/README.md similarity index 100% rename from vimcolor/solarized-master/qtcreator/README.md rename to .config/vim/vimcolor/solarized-master/qtcreator/README.md diff --git a/vimcolor/solarized-master/qtcreator/generate-styles.pl b/.config/vim/vimcolor/solarized-master/qtcreator/generate-styles.pl similarity index 100% rename from vimcolor/solarized-master/qtcreator/generate-styles.pl rename to .config/vim/vimcolor/solarized-master/qtcreator/generate-styles.pl diff --git a/vimcolor/solarized-master/qtcreator/qtcreator-template.xml b/.config/vim/vimcolor/solarized-master/qtcreator/qtcreator-template.xml similarity index 100% rename from vimcolor/solarized-master/qtcreator/qtcreator-template.xml rename to .config/vim/vimcolor/solarized-master/qtcreator/qtcreator-template.xml diff --git a/vimcolor/solarized-master/qtcreator/solarized-dark.xml b/.config/vim/vimcolor/solarized-master/qtcreator/solarized-dark.xml similarity index 100% rename from vimcolor/solarized-master/qtcreator/solarized-dark.xml rename to .config/vim/vimcolor/solarized-master/qtcreator/solarized-dark.xml diff --git a/vimcolor/solarized-master/qtcreator/solarized-light.xml b/.config/vim/vimcolor/solarized-master/qtcreator/solarized-light.xml similarity index 100% rename from vimcolor/solarized-master/qtcreator/solarized-light.xml rename to .config/vim/vimcolor/solarized-master/qtcreator/solarized-light.xml diff --git a/vimcolor/solarized-master/seestyle-colors-solarized/README.md b/.config/vim/vimcolor/solarized-master/seestyle-colors-solarized/README.md similarity index 100% rename from vimcolor/solarized-master/seestyle-colors-solarized/README.md rename to .config/vim/vimcolor/solarized-master/seestyle-colors-solarized/README.md diff --git a/vimcolor/solarized-master/seestyle-colors-solarized/Solarized.seestyle b/.config/vim/vimcolor/solarized-master/seestyle-colors-solarized/Solarized.seestyle similarity index 100% rename from vimcolor/solarized-master/seestyle-colors-solarized/Solarized.seestyle rename to .config/vim/vimcolor/solarized-master/seestyle-colors-solarized/Solarized.seestyle diff --git a/vimcolor/solarized-master/textmate-colors-solarized/README.mkd b/.config/vim/vimcolor/solarized-master/textmate-colors-solarized/README.mkd similarity index 100% rename from vimcolor/solarized-master/textmate-colors-solarized/README.mkd rename to .config/vim/vimcolor/solarized-master/textmate-colors-solarized/README.mkd diff --git a/vimcolor/solarized-master/textmate-colors-solarized/Solarized (dark).tmTheme b/.config/vim/vimcolor/solarized-master/textmate-colors-solarized/Solarized (dark).tmTheme similarity index 100% rename from vimcolor/solarized-master/textmate-colors-solarized/Solarized (dark).tmTheme rename to .config/vim/vimcolor/solarized-master/textmate-colors-solarized/Solarized (dark).tmTheme diff --git a/vimcolor/solarized-master/textmate-colors-solarized/Solarized (light).tmTheme b/.config/vim/vimcolor/solarized-master/textmate-colors-solarized/Solarized (light).tmTheme similarity index 100% rename from vimcolor/solarized-master/textmate-colors-solarized/Solarized (light).tmTheme rename to .config/vim/vimcolor/solarized-master/textmate-colors-solarized/Solarized (light).tmTheme diff --git a/vimcolor/solarized-master/textwrangler-bbedit-colors-solarized/README.mkd b/.config/vim/vimcolor/solarized-master/textwrangler-bbedit-colors-solarized/README.mkd similarity index 100% rename from vimcolor/solarized-master/textwrangler-bbedit-colors-solarized/README.mkd rename to .config/vim/vimcolor/solarized-master/textwrangler-bbedit-colors-solarized/README.mkd diff --git a/vimcolor/solarized-master/textwrangler-bbedit-colors-solarized/Solarized Dark.bbcolors b/.config/vim/vimcolor/solarized-master/textwrangler-bbedit-colors-solarized/Solarized Dark.bbcolors similarity index 100% rename from vimcolor/solarized-master/textwrangler-bbedit-colors-solarized/Solarized Dark.bbcolors rename to .config/vim/vimcolor/solarized-master/textwrangler-bbedit-colors-solarized/Solarized Dark.bbcolors diff --git a/vimcolor/solarized-master/textwrangler-bbedit-colors-solarized/Solarized Light.bbcolors b/.config/vim/vimcolor/solarized-master/textwrangler-bbedit-colors-solarized/Solarized Light.bbcolors similarity index 100% rename from vimcolor/solarized-master/textwrangler-bbedit-colors-solarized/Solarized Light.bbcolors rename to .config/vim/vimcolor/solarized-master/textwrangler-bbedit-colors-solarized/Solarized Light.bbcolors diff --git a/vimcolor/solarized-master/textwrangler-bbedit-colors-solarized/bbcolors b/.config/vim/vimcolor/solarized-master/textwrangler-bbedit-colors-solarized/bbcolors similarity index 100% rename from vimcolor/solarized-master/textwrangler-bbedit-colors-solarized/bbcolors rename to .config/vim/vimcolor/solarized-master/textwrangler-bbedit-colors-solarized/bbcolors diff --git a/vimcolor/solarized-master/tmux/README.md b/.config/vim/vimcolor/solarized-master/tmux/README.md similarity index 100% rename from vimcolor/solarized-master/tmux/README.md rename to .config/vim/vimcolor/solarized-master/tmux/README.md diff --git a/vimcolor/solarized-master/tmux/tmuxcolors-256.conf b/.config/vim/vimcolor/solarized-master/tmux/tmuxcolors-256.conf similarity index 100% rename from vimcolor/solarized-master/tmux/tmuxcolors-256.conf rename to .config/vim/vimcolor/solarized-master/tmux/tmuxcolors-256.conf diff --git a/vimcolor/solarized-master/tmux/tmuxcolors-dark.conf b/.config/vim/vimcolor/solarized-master/tmux/tmuxcolors-dark.conf similarity index 100% rename from vimcolor/solarized-master/tmux/tmuxcolors-dark.conf rename to .config/vim/vimcolor/solarized-master/tmux/tmuxcolors-dark.conf diff --git a/vimcolor/solarized-master/tmux/tmuxcolors-light.conf b/.config/vim/vimcolor/solarized-master/tmux/tmuxcolors-light.conf similarity index 100% rename from vimcolor/solarized-master/tmux/tmuxcolors-light.conf rename to .config/vim/vimcolor/solarized-master/tmux/tmuxcolors-light.conf diff --git a/vimcolor/solarized-master/tmux/tmuxcolors.png b/.config/vim/vimcolor/solarized-master/tmux/tmuxcolors.png similarity index 100% rename from vimcolor/solarized-master/tmux/tmuxcolors.png rename to .config/vim/vimcolor/solarized-master/tmux/tmuxcolors.png diff --git a/vimcolor/solarized-master/utils/README.md b/.config/vim/vimcolor/solarized-master/utils/README.md similarity index 100% rename from vimcolor/solarized-master/utils/README.md rename to .config/vim/vimcolor/solarized-master/utils/README.md diff --git a/vimcolor/solarized-master/utils/package.sh b/.config/vim/vimcolor/solarized-master/utils/package.sh similarity index 100% rename from vimcolor/solarized-master/utils/package.sh rename to .config/vim/vimcolor/solarized-master/utils/package.sh diff --git a/vimcolor/solarized-master/utils/pandoc2readme b/.config/vim/vimcolor/solarized-master/utils/pandoc2readme similarity index 100% rename from vimcolor/solarized-master/utils/pandoc2readme rename to .config/vim/vimcolor/solarized-master/utils/pandoc2readme diff --git a/vimcolor/solarized-master/utils/subtrees.mkd b/.config/vim/vimcolor/solarized-master/utils/subtrees.mkd similarity index 100% rename from vimcolor/solarized-master/utils/subtrees.mkd rename to .config/vim/vimcolor/solarized-master/utils/subtrees.mkd diff --git a/vimcolor/solarized-master/utils/tests/c.c b/.config/vim/vimcolor/solarized-master/utils/tests/c.c similarity index 100% rename from vimcolor/solarized-master/utils/tests/c.c rename to .config/vim/vimcolor/solarized-master/utils/tests/c.c diff --git a/vimcolor/solarized-master/utils/tests/haskell.hs b/.config/vim/vimcolor/solarized-master/utils/tests/haskell.hs similarity index 100% rename from vimcolor/solarized-master/utils/tests/haskell.hs rename to .config/vim/vimcolor/solarized-master/utils/tests/haskell.hs diff --git a/vimcolor/solarized-master/utils/tests/html.html b/.config/vim/vimcolor/solarized-master/utils/tests/html.html similarity index 100% rename from vimcolor/solarized-master/utils/tests/html.html rename to .config/vim/vimcolor/solarized-master/utils/tests/html.html diff --git a/vimcolor/solarized-master/utils/tests/java.java b/.config/vim/vimcolor/solarized-master/utils/tests/java.java similarity index 100% rename from vimcolor/solarized-master/utils/tests/java.java rename to .config/vim/vimcolor/solarized-master/utils/tests/java.java diff --git a/vimcolor/solarized-master/utils/tests/javascript.js b/.config/vim/vimcolor/solarized-master/utils/tests/javascript.js similarity index 100% rename from vimcolor/solarized-master/utils/tests/javascript.js rename to .config/vim/vimcolor/solarized-master/utils/tests/javascript.js diff --git a/vimcolor/solarized-master/utils/tests/pandoc.md b/.config/vim/vimcolor/solarized-master/utils/tests/pandoc.md similarity index 100% rename from vimcolor/solarized-master/utils/tests/pandoc.md rename to .config/vim/vimcolor/solarized-master/utils/tests/pandoc.md diff --git a/vimcolor/solarized-master/utils/tests/perl.pl b/.config/vim/vimcolor/solarized-master/utils/tests/perl.pl similarity index 100% rename from vimcolor/solarized-master/utils/tests/perl.pl rename to .config/vim/vimcolor/solarized-master/utils/tests/perl.pl diff --git a/vimcolor/solarized-master/utils/tests/php.php b/.config/vim/vimcolor/solarized-master/utils/tests/php.php similarity index 100% rename from vimcolor/solarized-master/utils/tests/php.php rename to .config/vim/vimcolor/solarized-master/utils/tests/php.php diff --git a/vimcolor/solarized-master/utils/tests/python.py b/.config/vim/vimcolor/solarized-master/utils/tests/python.py similarity index 100% rename from vimcolor/solarized-master/utils/tests/python.py rename to .config/vim/vimcolor/solarized-master/utils/tests/python.py diff --git a/vimcolor/solarized-master/utils/tests/ruby.rb b/.config/vim/vimcolor/solarized-master/utils/tests/ruby.rb similarity index 100% rename from vimcolor/solarized-master/utils/tests/ruby.rb rename to .config/vim/vimcolor/solarized-master/utils/tests/ruby.rb diff --git a/vimcolor/solarized-master/utils/tests/shell.sh b/.config/vim/vimcolor/solarized-master/utils/tests/shell.sh similarity index 100% rename from vimcolor/solarized-master/utils/tests/shell.sh rename to .config/vim/vimcolor/solarized-master/utils/tests/shell.sh diff --git a/vimcolor/solarized-master/utils/tests/tex.tex b/.config/vim/vimcolor/solarized-master/utils/tests/tex.tex similarity index 100% rename from vimcolor/solarized-master/utils/tests/tex.tex rename to .config/vim/vimcolor/solarized-master/utils/tests/tex.tex diff --git a/vimcolor/solarized-master/utils/vimorg-text b/.config/vim/vimcolor/solarized-master/utils/vimorg-text similarity index 100% rename from vimcolor/solarized-master/utils/vimorg-text rename to .config/vim/vimcolor/solarized-master/utils/vimorg-text diff --git a/vimcolor/solarized-master/utils/vimscreenshots.applescript b/.config/vim/vimcolor/solarized-master/utils/vimscreenshots.applescript similarity index 100% rename from vimcolor/solarized-master/utils/vimscreenshots.applescript rename to .config/vim/vimcolor/solarized-master/utils/vimscreenshots.applescript diff --git a/vimcolor/solarized-master/vim-colors-solarized/README.mkd b/.config/vim/vimcolor/solarized-master/vim-colors-solarized/README.mkd similarity index 100% rename from vimcolor/solarized-master/vim-colors-solarized/README.mkd rename to .config/vim/vimcolor/solarized-master/vim-colors-solarized/README.mkd diff --git a/vimcolor/solarized-master/vim-colors-solarized/autoload/togglebg.vim b/.config/vim/vimcolor/solarized-master/vim-colors-solarized/autoload/togglebg.vim similarity index 100% rename from vimcolor/solarized-master/vim-colors-solarized/autoload/togglebg.vim rename to .config/vim/vimcolor/solarized-master/vim-colors-solarized/autoload/togglebg.vim diff --git a/vimcolor/solarized-master/vim-colors-solarized/bitmaps/togglebg.png b/.config/vim/vimcolor/solarized-master/vim-colors-solarized/bitmaps/togglebg.png similarity index 100% rename from vimcolor/solarized-master/vim-colors-solarized/bitmaps/togglebg.png rename to .config/vim/vimcolor/solarized-master/vim-colors-solarized/bitmaps/togglebg.png diff --git a/vimcolor/solarized-master/vim-colors-solarized/colors/solarized.vim b/.config/vim/vimcolor/solarized-master/vim-colors-solarized/colors/solarized.vim similarity index 100% rename from vimcolor/solarized-master/vim-colors-solarized/colors/solarized.vim rename to .config/vim/vimcolor/solarized-master/vim-colors-solarized/colors/solarized.vim diff --git a/vimcolor/solarized-master/vim-colors-solarized/doc/solarized.txt b/.config/vim/vimcolor/solarized-master/vim-colors-solarized/doc/solarized.txt similarity index 100% rename from vimcolor/solarized-master/vim-colors-solarized/doc/solarized.txt rename to .config/vim/vimcolor/solarized-master/vim-colors-solarized/doc/solarized.txt diff --git a/vimcolor/solarized-master/vim-colors-solarized/doc/tags b/.config/vim/vimcolor/solarized-master/vim-colors-solarized/doc/tags similarity index 100% rename from vimcolor/solarized-master/vim-colors-solarized/doc/tags rename to .config/vim/vimcolor/solarized-master/vim-colors-solarized/doc/tags diff --git a/vimcolor/solarized-master/visualstudio-colors-solarized/vs2005/solarized-dark.vssettings b/.config/vim/vimcolor/solarized-master/visualstudio-colors-solarized/vs2005/solarized-dark.vssettings similarity index 100% rename from vimcolor/solarized-master/visualstudio-colors-solarized/vs2005/solarized-dark.vssettings rename to .config/vim/vimcolor/solarized-master/visualstudio-colors-solarized/vs2005/solarized-dark.vssettings diff --git a/vimcolor/solarized-master/visualstudio-colors-solarized/vs2005/solarized-light.vssettings b/.config/vim/vimcolor/solarized-master/visualstudio-colors-solarized/vs2005/solarized-light.vssettings similarity index 100% rename from vimcolor/solarized-master/visualstudio-colors-solarized/vs2005/solarized-light.vssettings rename to .config/vim/vimcolor/solarized-master/visualstudio-colors-solarized/vs2005/solarized-light.vssettings diff --git a/vimcolor/solarized-master/visualstudio-colors-solarized/vs2008/solarized-dark.vssettings b/.config/vim/vimcolor/solarized-master/visualstudio-colors-solarized/vs2008/solarized-dark.vssettings similarity index 100% rename from vimcolor/solarized-master/visualstudio-colors-solarized/vs2008/solarized-dark.vssettings rename to .config/vim/vimcolor/solarized-master/visualstudio-colors-solarized/vs2008/solarized-dark.vssettings diff --git a/vimcolor/solarized-master/visualstudio-colors-solarized/vs2008/solarized-light.vssettings b/.config/vim/vimcolor/solarized-master/visualstudio-colors-solarized/vs2008/solarized-light.vssettings similarity index 100% rename from vimcolor/solarized-master/visualstudio-colors-solarized/vs2008/solarized-light.vssettings rename to .config/vim/vimcolor/solarized-master/visualstudio-colors-solarized/vs2008/solarized-light.vssettings diff --git a/vimcolor/solarized-master/visualstudio-colors-solarized/vs2010/solarized-dark.vssettings b/.config/vim/vimcolor/solarized-master/visualstudio-colors-solarized/vs2010/solarized-dark.vssettings similarity index 100% rename from vimcolor/solarized-master/visualstudio-colors-solarized/vs2010/solarized-dark.vssettings rename to .config/vim/vimcolor/solarized-master/visualstudio-colors-solarized/vs2010/solarized-dark.vssettings diff --git a/vimcolor/solarized-master/visualstudio-colors-solarized/vs2010/solarized-light.vssettings b/.config/vim/vimcolor/solarized-master/visualstudio-colors-solarized/vs2010/solarized-light.vssettings similarity index 100% rename from vimcolor/solarized-master/visualstudio-colors-solarized/vs2010/solarized-light.vssettings rename to .config/vim/vimcolor/solarized-master/visualstudio-colors-solarized/vs2010/solarized-light.vssettings diff --git a/vimcolor/solarized-master/xchat/README.md b/.config/vim/vimcolor/solarized-master/xchat/README.md similarity index 100% rename from vimcolor/solarized-master/xchat/README.md rename to .config/vim/vimcolor/solarized-master/xchat/README.md diff --git a/vimcolor/solarized-master/xchat/pevents.conf b/.config/vim/vimcolor/solarized-master/xchat/pevents.conf similarity index 100% rename from vimcolor/solarized-master/xchat/pevents.conf rename to .config/vim/vimcolor/solarized-master/xchat/pevents.conf diff --git a/vimcolor/solarized-master/xchat/solarized-dark-colors.conf b/.config/vim/vimcolor/solarized-master/xchat/solarized-dark-colors.conf similarity index 100% rename from vimcolor/solarized-master/xchat/solarized-dark-colors.conf rename to .config/vim/vimcolor/solarized-master/xchat/solarized-dark-colors.conf diff --git a/vimcolor/solarized-master/xchat/solarized-light-colors.conf b/.config/vim/vimcolor/solarized-master/xchat/solarized-light-colors.conf similarity index 100% rename from vimcolor/solarized-master/xchat/solarized-light-colors.conf rename to .config/vim/vimcolor/solarized-master/xchat/solarized-light-colors.conf diff --git a/vimcolor/solarized-master/xfce4-terminal/LICENSE b/.config/vim/vimcolor/solarized-master/xfce4-terminal/LICENSE similarity index 100% rename from vimcolor/solarized-master/xfce4-terminal/LICENSE rename to .config/vim/vimcolor/solarized-master/xfce4-terminal/LICENSE diff --git a/vimcolor/solarized-master/xfce4-terminal/README.md b/.config/vim/vimcolor/solarized-master/xfce4-terminal/README.md similarity index 100% rename from vimcolor/solarized-master/xfce4-terminal/README.md rename to .config/vim/vimcolor/solarized-master/xfce4-terminal/README.md diff --git a/vimcolor/solarized-master/xfce4-terminal/dark/terminalrc b/.config/vim/vimcolor/solarized-master/xfce4-terminal/dark/terminalrc similarity index 100% rename from vimcolor/solarized-master/xfce4-terminal/dark/terminalrc rename to .config/vim/vimcolor/solarized-master/xfce4-terminal/dark/terminalrc diff --git a/vimcolor/solarized-master/xfce4-terminal/img/solarized-xfce4-terminal.png b/.config/vim/vimcolor/solarized-master/xfce4-terminal/img/solarized-xfce4-terminal.png similarity index 100% rename from vimcolor/solarized-master/xfce4-terminal/img/solarized-xfce4-terminal.png rename to .config/vim/vimcolor/solarized-master/xfce4-terminal/img/solarized-xfce4-terminal.png diff --git a/vimcolor/solarized-master/xfce4-terminal/light/terminalrc b/.config/vim/vimcolor/solarized-master/xfce4-terminal/light/terminalrc similarity index 100% rename from vimcolor/solarized-master/xfce4-terminal/light/terminalrc rename to .config/vim/vimcolor/solarized-master/xfce4-terminal/light/terminalrc diff --git a/vimcolor/solarized-master/xresources/LICENSE b/.config/vim/vimcolor/solarized-master/xresources/LICENSE similarity index 100% rename from vimcolor/solarized-master/xresources/LICENSE rename to .config/vim/vimcolor/solarized-master/xresources/LICENSE diff --git a/vimcolor/solarized-master/xresources/README.md b/.config/vim/vimcolor/solarized-master/xresources/README.md similarity index 100% rename from vimcolor/solarized-master/xresources/README.md rename to .config/vim/vimcolor/solarized-master/xresources/README.md diff --git a/vimcolor/solarized-master/xresources/solarized b/.config/vim/vimcolor/solarized-master/xresources/solarized similarity index 100% rename from vimcolor/solarized-master/xresources/solarized rename to .config/vim/vimcolor/solarized-master/xresources/solarized diff --git a/vimconfig/.vimrc_ljpj b/.config/vim/vimconfig/.vimrc_ljpj similarity index 100% rename from vimconfig/.vimrc_ljpj rename to .config/vim/vimconfig/.vimrc_ljpj diff --git a/vimconfig/CopyRight.vim b/.config/vim/vimconfig/CopyRight.vim similarity index 100% rename from vimconfig/CopyRight.vim rename to .config/vim/vimconfig/CopyRight.vim diff --git a/vimconfig/Count.vim b/.config/vim/vimconfig/Count.vim similarity index 100% rename from vimconfig/Count.vim rename to .config/vim/vimconfig/Count.vim diff --git a/vimconfig/InsertCopyRight.vim b/.config/vim/vimconfig/InsertCopyRight.vim similarity index 100% rename from vimconfig/InsertCopyRight.vim rename to .config/vim/vimconfig/InsertCopyRight.vim diff --git a/vimconfig/ToggleComment.vim b/.config/vim/vimconfig/ToggleComment.vim similarity index 100% rename from vimconfig/ToggleComment.vim rename to .config/vim/vimconfig/ToggleComment.vim diff --git a/vimconfig/autoReformat.vim b/.config/vim/vimconfig/autoReformat.vim similarity index 100% rename from vimconfig/autoReformat.vim rename to .config/vim/vimconfig/autoReformat.vim diff --git a/vimconfig/nerdtree.vim b/.config/vim/vimconfig/nerdtree.vim similarity index 100% rename from vimconfig/nerdtree.vim rename to .config/vim/vimconfig/nerdtree.vim diff --git a/vimconfig/setting.vim b/.config/vim/vimconfig/setting.vim similarity index 100% rename from vimconfig/setting.vim rename to .config/vim/vimconfig/setting.vim diff --git a/vimplugin/nerdtree-master/.github/ISSUE_TEMPLATE/bug.md b/.config/vim/vimplugin/nerdtree-master/.github/ISSUE_TEMPLATE/bug.md similarity index 100% rename from vimplugin/nerdtree-master/.github/ISSUE_TEMPLATE/bug.md rename to .config/vim/vimplugin/nerdtree-master/.github/ISSUE_TEMPLATE/bug.md diff --git a/vimplugin/nerdtree-master/.github/ISSUE_TEMPLATE/feature_request.md b/.config/vim/vimplugin/nerdtree-master/.github/ISSUE_TEMPLATE/feature_request.md similarity index 100% rename from vimplugin/nerdtree-master/.github/ISSUE_TEMPLATE/feature_request.md rename to .config/vim/vimplugin/nerdtree-master/.github/ISSUE_TEMPLATE/feature_request.md diff --git a/vimplugin/nerdtree-master/.github/ISSUE_TEMPLATE/question.md b/.config/vim/vimplugin/nerdtree-master/.github/ISSUE_TEMPLATE/question.md similarity index 100% rename from vimplugin/nerdtree-master/.github/ISSUE_TEMPLATE/question.md rename to .config/vim/vimplugin/nerdtree-master/.github/ISSUE_TEMPLATE/question.md diff --git a/vimplugin/nerdtree-master/.github/PULL_REQUEST_TEMPLATE.md b/.config/vim/vimplugin/nerdtree-master/.github/PULL_REQUEST_TEMPLATE.md similarity index 100% rename from vimplugin/nerdtree-master/.github/PULL_REQUEST_TEMPLATE.md rename to .config/vim/vimplugin/nerdtree-master/.github/PULL_REQUEST_TEMPLATE.md diff --git a/vimplugin/nerdtree-master/.github/workflows/vint.yml b/.config/vim/vimplugin/nerdtree-master/.github/workflows/vint.yml similarity index 100% rename from vimplugin/nerdtree-master/.github/workflows/vint.yml rename to .config/vim/vimplugin/nerdtree-master/.github/workflows/vint.yml diff --git a/vimplugin/nerdtree-master/.gitignore b/.config/vim/vimplugin/nerdtree-master/.gitignore similarity index 100% rename from vimplugin/nerdtree-master/.gitignore rename to .config/vim/vimplugin/nerdtree-master/.gitignore diff --git a/vimplugin/nerdtree-master/.vintrc.yaml b/.config/vim/vimplugin/nerdtree-master/.vintrc.yaml similarity index 100% rename from vimplugin/nerdtree-master/.vintrc.yaml rename to .config/vim/vimplugin/nerdtree-master/.vintrc.yaml diff --git a/vimplugin/nerdtree-master/CHANGELOG.md b/.config/vim/vimplugin/nerdtree-master/CHANGELOG.md similarity index 100% rename from vimplugin/nerdtree-master/CHANGELOG.md rename to .config/vim/vimplugin/nerdtree-master/CHANGELOG.md diff --git a/vimplugin/nerdtree-master/LICENCE b/.config/vim/vimplugin/nerdtree-master/LICENCE similarity index 100% rename from vimplugin/nerdtree-master/LICENCE rename to .config/vim/vimplugin/nerdtree-master/LICENCE diff --git a/vimplugin/nerdtree-master/README.markdown b/.config/vim/vimplugin/nerdtree-master/README.markdown similarity index 100% rename from vimplugin/nerdtree-master/README.markdown rename to .config/vim/vimplugin/nerdtree-master/README.markdown diff --git a/vimplugin/nerdtree-master/_config.yml b/.config/vim/vimplugin/nerdtree-master/_config.yml similarity index 100% rename from vimplugin/nerdtree-master/_config.yml rename to .config/vim/vimplugin/nerdtree-master/_config.yml diff --git a/vimplugin/nerdtree-master/autoload/nerdtree.vim b/.config/vim/vimplugin/nerdtree-master/autoload/nerdtree.vim similarity index 100% rename from vimplugin/nerdtree-master/autoload/nerdtree.vim rename to .config/vim/vimplugin/nerdtree-master/autoload/nerdtree.vim diff --git a/vimplugin/nerdtree-master/autoload/nerdtree/ui_glue.vim b/.config/vim/vimplugin/nerdtree-master/autoload/nerdtree/ui_glue.vim similarity index 100% rename from vimplugin/nerdtree-master/autoload/nerdtree/ui_glue.vim rename to .config/vim/vimplugin/nerdtree-master/autoload/nerdtree/ui_glue.vim diff --git a/vimplugin/nerdtree-master/doc/NERDTree.txt b/.config/vim/vimplugin/nerdtree-master/doc/NERDTree.txt similarity index 100% rename from vimplugin/nerdtree-master/doc/NERDTree.txt rename to .config/vim/vimplugin/nerdtree-master/doc/NERDTree.txt diff --git a/vimplugin/nerdtree-master/lib/nerdtree/bookmark.vim b/.config/vim/vimplugin/nerdtree-master/lib/nerdtree/bookmark.vim similarity index 100% rename from vimplugin/nerdtree-master/lib/nerdtree/bookmark.vim rename to .config/vim/vimplugin/nerdtree-master/lib/nerdtree/bookmark.vim diff --git a/vimplugin/nerdtree-master/lib/nerdtree/creator.vim b/.config/vim/vimplugin/nerdtree-master/lib/nerdtree/creator.vim similarity index 100% rename from vimplugin/nerdtree-master/lib/nerdtree/creator.vim rename to .config/vim/vimplugin/nerdtree-master/lib/nerdtree/creator.vim diff --git a/vimplugin/nerdtree-master/lib/nerdtree/event.vim b/.config/vim/vimplugin/nerdtree-master/lib/nerdtree/event.vim similarity index 100% rename from vimplugin/nerdtree-master/lib/nerdtree/event.vim rename to .config/vim/vimplugin/nerdtree-master/lib/nerdtree/event.vim diff --git a/vimplugin/nerdtree-master/lib/nerdtree/flag_set.vim b/.config/vim/vimplugin/nerdtree-master/lib/nerdtree/flag_set.vim similarity index 100% rename from vimplugin/nerdtree-master/lib/nerdtree/flag_set.vim rename to .config/vim/vimplugin/nerdtree-master/lib/nerdtree/flag_set.vim diff --git a/vimplugin/nerdtree-master/lib/nerdtree/key_map.vim b/.config/vim/vimplugin/nerdtree-master/lib/nerdtree/key_map.vim similarity index 100% rename from vimplugin/nerdtree-master/lib/nerdtree/key_map.vim rename to .config/vim/vimplugin/nerdtree-master/lib/nerdtree/key_map.vim diff --git a/vimplugin/nerdtree-master/lib/nerdtree/menu_controller.vim b/.config/vim/vimplugin/nerdtree-master/lib/nerdtree/menu_controller.vim similarity index 100% rename from vimplugin/nerdtree-master/lib/nerdtree/menu_controller.vim rename to .config/vim/vimplugin/nerdtree-master/lib/nerdtree/menu_controller.vim diff --git a/vimplugin/nerdtree-master/lib/nerdtree/menu_item.vim b/.config/vim/vimplugin/nerdtree-master/lib/nerdtree/menu_item.vim similarity index 100% rename from vimplugin/nerdtree-master/lib/nerdtree/menu_item.vim rename to .config/vim/vimplugin/nerdtree-master/lib/nerdtree/menu_item.vim diff --git a/vimplugin/nerdtree-master/lib/nerdtree/nerdtree.vim b/.config/vim/vimplugin/nerdtree-master/lib/nerdtree/nerdtree.vim similarity index 100% rename from vimplugin/nerdtree-master/lib/nerdtree/nerdtree.vim rename to .config/vim/vimplugin/nerdtree-master/lib/nerdtree/nerdtree.vim diff --git a/vimplugin/nerdtree-master/lib/nerdtree/notifier.vim b/.config/vim/vimplugin/nerdtree-master/lib/nerdtree/notifier.vim similarity index 100% rename from vimplugin/nerdtree-master/lib/nerdtree/notifier.vim rename to .config/vim/vimplugin/nerdtree-master/lib/nerdtree/notifier.vim diff --git a/vimplugin/nerdtree-master/lib/nerdtree/opener.vim b/.config/vim/vimplugin/nerdtree-master/lib/nerdtree/opener.vim similarity index 100% rename from vimplugin/nerdtree-master/lib/nerdtree/opener.vim rename to .config/vim/vimplugin/nerdtree-master/lib/nerdtree/opener.vim diff --git a/vimplugin/nerdtree-master/lib/nerdtree/path.vim b/.config/vim/vimplugin/nerdtree-master/lib/nerdtree/path.vim similarity index 100% rename from vimplugin/nerdtree-master/lib/nerdtree/path.vim rename to .config/vim/vimplugin/nerdtree-master/lib/nerdtree/path.vim diff --git a/vimplugin/nerdtree-master/lib/nerdtree/tree_dir_node.vim b/.config/vim/vimplugin/nerdtree-master/lib/nerdtree/tree_dir_node.vim similarity index 100% rename from vimplugin/nerdtree-master/lib/nerdtree/tree_dir_node.vim rename to .config/vim/vimplugin/nerdtree-master/lib/nerdtree/tree_dir_node.vim diff --git a/vimplugin/nerdtree-master/lib/nerdtree/tree_file_node.vim b/.config/vim/vimplugin/nerdtree-master/lib/nerdtree/tree_file_node.vim similarity index 100% rename from vimplugin/nerdtree-master/lib/nerdtree/tree_file_node.vim rename to .config/vim/vimplugin/nerdtree-master/lib/nerdtree/tree_file_node.vim diff --git a/vimplugin/nerdtree-master/lib/nerdtree/ui.vim b/.config/vim/vimplugin/nerdtree-master/lib/nerdtree/ui.vim similarity index 100% rename from vimplugin/nerdtree-master/lib/nerdtree/ui.vim rename to .config/vim/vimplugin/nerdtree-master/lib/nerdtree/ui.vim diff --git a/vimplugin/nerdtree-master/nerdtree_plugin/exec_menuitem.vim b/.config/vim/vimplugin/nerdtree-master/nerdtree_plugin/exec_menuitem.vim similarity index 100% rename from vimplugin/nerdtree-master/nerdtree_plugin/exec_menuitem.vim rename to .config/vim/vimplugin/nerdtree-master/nerdtree_plugin/exec_menuitem.vim diff --git a/vimplugin/nerdtree-master/nerdtree_plugin/fs_menu.vim b/.config/vim/vimplugin/nerdtree-master/nerdtree_plugin/fs_menu.vim similarity index 100% rename from vimplugin/nerdtree-master/nerdtree_plugin/fs_menu.vim rename to .config/vim/vimplugin/nerdtree-master/nerdtree_plugin/fs_menu.vim diff --git a/vimplugin/nerdtree-master/nerdtree_plugin/vcs.vim b/.config/vim/vimplugin/nerdtree-master/nerdtree_plugin/vcs.vim similarity index 100% rename from vimplugin/nerdtree-master/nerdtree_plugin/vcs.vim rename to .config/vim/vimplugin/nerdtree-master/nerdtree_plugin/vcs.vim diff --git a/vimplugin/nerdtree-master/plugin/NERD_tree.vim b/.config/vim/vimplugin/nerdtree-master/plugin/NERD_tree.vim similarity index 100% rename from vimplugin/nerdtree-master/plugin/NERD_tree.vim rename to .config/vim/vimplugin/nerdtree-master/plugin/NERD_tree.vim diff --git a/vimplugin/nerdtree-master/screenshot.png b/.config/vim/vimplugin/nerdtree-master/screenshot.png similarity index 100% rename from vimplugin/nerdtree-master/screenshot.png rename to .config/vim/vimplugin/nerdtree-master/screenshot.png diff --git a/vimplugin/nerdtree-master/syntax/nerdtree.vim b/.config/vim/vimplugin/nerdtree-master/syntax/nerdtree.vim similarity index 100% rename from vimplugin/nerdtree-master/syntax/nerdtree.vim rename to .config/vim/vimplugin/nerdtree-master/syntax/nerdtree.vim diff --git a/vimplugin/onedark.vim-main/.eslintrc.json b/.config/vim/vimplugin/onedark.vim-main/.eslintrc.json similarity index 100% rename from vimplugin/onedark.vim-main/.eslintrc.json rename to .config/vim/vimplugin/onedark.vim-main/.eslintrc.json diff --git a/vimplugin/onedark.vim-main/.github/ISSUE_TEMPLATE.md b/.config/vim/vimplugin/onedark.vim-main/.github/ISSUE_TEMPLATE.md similarity index 100% rename from vimplugin/onedark.vim-main/.github/ISSUE_TEMPLATE.md rename to .config/vim/vimplugin/onedark.vim-main/.github/ISSUE_TEMPLATE.md diff --git a/vimplugin/onedark.vim-main/.github/workflows/nodejs.yml b/.config/vim/vimplugin/onedark.vim-main/.github/workflows/nodejs.yml similarity index 100% rename from vimplugin/onedark.vim-main/.github/workflows/nodejs.yml rename to .config/vim/vimplugin/onedark.vim-main/.github/workflows/nodejs.yml diff --git a/vimplugin/onedark.vim-main/.gitignore b/.config/vim/vimplugin/onedark.vim-main/.gitignore similarity index 100% rename from vimplugin/onedark.vim-main/.gitignore rename to .config/vim/vimplugin/onedark.vim-main/.gitignore diff --git a/vimplugin/onedark.vim-main/.husky/.gitignore b/.config/vim/vimplugin/onedark.vim-main/.husky/.gitignore similarity index 100% rename from vimplugin/onedark.vim-main/.husky/.gitignore rename to .config/vim/vimplugin/onedark.vim-main/.husky/.gitignore diff --git a/vimplugin/onedark.vim-main/.husky/pre-commit b/.config/vim/vimplugin/onedark.vim-main/.husky/pre-commit similarity index 100% rename from vimplugin/onedark.vim-main/.husky/pre-commit rename to .config/vim/vimplugin/onedark.vim-main/.husky/pre-commit diff --git a/vimplugin/onedark.vim-main/.npmrc b/.config/vim/vimplugin/onedark.vim-main/.npmrc similarity index 100% rename from vimplugin/onedark.vim-main/.npmrc rename to .config/vim/vimplugin/onedark.vim-main/.npmrc diff --git a/vimplugin/onedark.vim-main/.prettierrc b/.config/vim/vimplugin/onedark.vim-main/.prettierrc similarity index 100% rename from vimplugin/onedark.vim-main/.prettierrc rename to .config/vim/vimplugin/onedark.vim-main/.prettierrc diff --git a/vimplugin/onedark.vim-main/CONTRIBUTING.md b/.config/vim/vimplugin/onedark.vim-main/CONTRIBUTING.md similarity index 100% rename from vimplugin/onedark.vim-main/CONTRIBUTING.md rename to .config/vim/vimplugin/onedark.vim-main/CONTRIBUTING.md diff --git a/vimplugin/onedark.vim-main/LICENSE b/.config/vim/vimplugin/onedark.vim-main/LICENSE similarity index 100% rename from vimplugin/onedark.vim-main/LICENSE rename to .config/vim/vimplugin/onedark.vim-main/LICENSE diff --git a/vimplugin/onedark.vim-main/README.md b/.config/vim/vimplugin/onedark.vim-main/README.md similarity index 100% rename from vimplugin/onedark.vim-main/README.md rename to .config/vim/vimplugin/onedark.vim-main/README.md diff --git a/vimplugin/onedark.vim-main/autoload/airline/themes/onedark.vim b/.config/vim/vimplugin/onedark.vim-main/autoload/airline/themes/onedark.vim similarity index 100% rename from vimplugin/onedark.vim-main/autoload/airline/themes/onedark.vim rename to .config/vim/vimplugin/onedark.vim-main/autoload/airline/themes/onedark.vim diff --git a/vimplugin/onedark.vim-main/autoload/lightline/colorscheme/onedark.vim b/.config/vim/vimplugin/onedark.vim-main/autoload/lightline/colorscheme/onedark.vim similarity index 100% rename from vimplugin/onedark.vim-main/autoload/lightline/colorscheme/onedark.vim rename to .config/vim/vimplugin/onedark.vim-main/autoload/lightline/colorscheme/onedark.vim diff --git a/vimplugin/onedark.vim-main/autoload/onedark.vim b/.config/vim/vimplugin/onedark.vim-main/autoload/onedark.vim similarity index 100% rename from vimplugin/onedark.vim-main/autoload/onedark.vim rename to .config/vim/vimplugin/onedark.vim-main/autoload/onedark.vim diff --git a/vimplugin/onedark.vim-main/build/build.js b/.config/vim/vimplugin/onedark.vim-main/build/build.js similarity index 100% rename from vimplugin/onedark.vim-main/build/build.js rename to .config/vim/vimplugin/onedark.vim-main/build/build.js diff --git a/vimplugin/onedark.vim-main/build/templates/One Dark.Xresources b/.config/vim/vimplugin/onedark.vim-main/build/templates/One Dark.Xresources similarity index 100% rename from vimplugin/onedark.vim-main/build/templates/One Dark.Xresources rename to .config/vim/vimplugin/onedark.vim-main/build/templates/One Dark.Xresources diff --git a/vimplugin/onedark.vim-main/build/templates/One Dark.alacritty b/.config/vim/vimplugin/onedark.vim-main/build/templates/One Dark.alacritty similarity index 100% rename from vimplugin/onedark.vim-main/build/templates/One Dark.alacritty rename to .config/vim/vimplugin/onedark.vim-main/build/templates/One Dark.alacritty diff --git a/vimplugin/onedark.vim-main/build/templates/One Dark.colorscheme b/.config/vim/vimplugin/onedark.vim-main/build/templates/One Dark.colorscheme similarity index 100% rename from vimplugin/onedark.vim-main/build/templates/One Dark.colorscheme rename to .config/vim/vimplugin/onedark.vim-main/build/templates/One Dark.colorscheme diff --git a/vimplugin/onedark.vim-main/build/templates/One Dark.itermcolors b/.config/vim/vimplugin/onedark.vim-main/build/templates/One Dark.itermcolors similarity index 100% rename from vimplugin/onedark.vim-main/build/templates/One Dark.itermcolors rename to .config/vim/vimplugin/onedark.vim-main/build/templates/One Dark.itermcolors diff --git a/vimplugin/onedark.vim-main/build/templates/One Dark.kitty b/.config/vim/vimplugin/onedark.vim-main/build/templates/One Dark.kitty similarity index 100% rename from vimplugin/onedark.vim-main/build/templates/One Dark.kitty rename to .config/vim/vimplugin/onedark.vim-main/build/templates/One Dark.kitty diff --git a/vimplugin/onedark.vim-main/build/templates/One Dark.terminal b/.config/vim/vimplugin/onedark.vim-main/build/templates/One Dark.terminal similarity index 100% rename from vimplugin/onedark.vim-main/build/templates/One Dark.terminal rename to .config/vim/vimplugin/onedark.vim-main/build/templates/One Dark.terminal diff --git a/vimplugin/onedark.vim-main/build/templates/autoload.template.vim b/.config/vim/vimplugin/onedark.vim-main/build/templates/autoload.template.vim similarity index 100% rename from vimplugin/onedark.vim-main/build/templates/autoload.template.vim rename to .config/vim/vimplugin/onedark.vim-main/build/templates/autoload.template.vim diff --git a/vimplugin/onedark.vim-main/colors/onedark.vim b/.config/vim/vimplugin/onedark.vim-main/colors/onedark.vim similarity index 100% rename from vimplugin/onedark.vim-main/colors/onedark.vim rename to .config/vim/vimplugin/onedark.vim-main/colors/onedark.vim diff --git a/vimplugin/onedark.vim-main/img/broken_colors.png b/.config/vim/vimplugin/onedark.vim-main/img/broken_colors.png similarity index 100% rename from vimplugin/onedark.vim-main/img/broken_colors.png rename to .config/vim/vimplugin/onedark.vim-main/img/broken_colors.png diff --git a/vimplugin/onedark.vim-main/img/broken_italics.png b/.config/vim/vimplugin/onedark.vim-main/img/broken_italics.png similarity index 100% rename from vimplugin/onedark.vim-main/img/broken_italics.png rename to .config/vim/vimplugin/onedark.vim-main/img/broken_italics.png diff --git a/vimplugin/onedark.vim-main/img/color_reference.png b/.config/vim/vimplugin/onedark.vim-main/img/color_reference.png similarity index 100% rename from vimplugin/onedark.vim-main/img/color_reference.png rename to .config/vim/vimplugin/onedark.vim-main/img/color_reference.png diff --git a/vimplugin/onedark.vim-main/img/preview_airline.png b/.config/vim/vimplugin/onedark.vim-main/img/preview_airline.png similarity index 100% rename from vimplugin/onedark.vim-main/img/preview_airline.png rename to .config/vim/vimplugin/onedark.vim-main/img/preview_airline.png diff --git a/vimplugin/onedark.vim-main/img/preview_lightline.png b/.config/vim/vimplugin/onedark.vim-main/img/preview_lightline.png similarity index 100% rename from vimplugin/onedark.vim-main/img/preview_lightline.png rename to .config/vim/vimplugin/onedark.vim-main/img/preview_lightline.png diff --git a/vimplugin/onedark.vim-main/img/readme_header.png b/.config/vim/vimplugin/onedark.vim-main/img/readme_header.png similarity index 100% rename from vimplugin/onedark.vim-main/img/readme_header.png rename to .config/vim/vimplugin/onedark.vim-main/img/readme_header.png diff --git a/vimplugin/onedark.vim-main/package-lock.json b/.config/vim/vimplugin/onedark.vim-main/package-lock.json similarity index 100% rename from vimplugin/onedark.vim-main/package-lock.json rename to .config/vim/vimplugin/onedark.vim-main/package-lock.json diff --git a/vimplugin/onedark.vim-main/package.json b/.config/vim/vimplugin/onedark.vim-main/package.json similarity index 100% rename from vimplugin/onedark.vim-main/package.json rename to .config/vim/vimplugin/onedark.vim-main/package.json diff --git a/vimplugin/onedark.vim-main/term/One Dark.Xresources b/.config/vim/vimplugin/onedark.vim-main/term/One Dark.Xresources similarity index 100% rename from vimplugin/onedark.vim-main/term/One Dark.Xresources rename to .config/vim/vimplugin/onedark.vim-main/term/One Dark.Xresources diff --git a/vimplugin/onedark.vim-main/term/One Dark.alacritty b/.config/vim/vimplugin/onedark.vim-main/term/One Dark.alacritty similarity index 100% rename from vimplugin/onedark.vim-main/term/One Dark.alacritty rename to .config/vim/vimplugin/onedark.vim-main/term/One Dark.alacritty diff --git a/vimplugin/onedark.vim-main/term/One Dark.colorscheme b/.config/vim/vimplugin/onedark.vim-main/term/One Dark.colorscheme similarity index 100% rename from vimplugin/onedark.vim-main/term/One Dark.colorscheme rename to .config/vim/vimplugin/onedark.vim-main/term/One Dark.colorscheme diff --git a/vimplugin/onedark.vim-main/term/One Dark.itermcolors b/.config/vim/vimplugin/onedark.vim-main/term/One Dark.itermcolors similarity index 100% rename from vimplugin/onedark.vim-main/term/One Dark.itermcolors rename to .config/vim/vimplugin/onedark.vim-main/term/One Dark.itermcolors diff --git a/vimplugin/onedark.vim-main/term/One Dark.kitty b/.config/vim/vimplugin/onedark.vim-main/term/One Dark.kitty similarity index 100% rename from vimplugin/onedark.vim-main/term/One Dark.kitty rename to .config/vim/vimplugin/onedark.vim-main/term/One Dark.kitty diff --git a/vimplugin/onedark.vim-main/term/One Dark.terminal b/.config/vim/vimplugin/onedark.vim-main/term/One Dark.terminal similarity index 100% rename from vimplugin/onedark.vim-main/term/One Dark.terminal rename to .config/vim/vimplugin/onedark.vim-main/term/One Dark.terminal diff --git a/vimplugin/rainbow-master/.github/ISSUE_TEMPLATE/bug_report.md b/.config/vim/vimplugin/rainbow-master/.github/ISSUE_TEMPLATE/bug_report.md similarity index 100% rename from vimplugin/rainbow-master/.github/ISSUE_TEMPLATE/bug_report.md rename to .config/vim/vimplugin/rainbow-master/.github/ISSUE_TEMPLATE/bug_report.md diff --git a/vimplugin/rainbow-master/.github/ISSUE_TEMPLATE/feature_request.md b/.config/vim/vimplugin/rainbow-master/.github/ISSUE_TEMPLATE/feature_request.md similarity index 100% rename from vimplugin/rainbow-master/.github/ISSUE_TEMPLATE/feature_request.md rename to .config/vim/vimplugin/rainbow-master/.github/ISSUE_TEMPLATE/feature_request.md diff --git a/vimplugin/rainbow-master/.github/ISSUE_TEMPLATE/not-issue.md b/.config/vim/vimplugin/rainbow-master/.github/ISSUE_TEMPLATE/not-issue.md similarity index 100% rename from vimplugin/rainbow-master/.github/ISSUE_TEMPLATE/not-issue.md rename to .config/vim/vimplugin/rainbow-master/.github/ISSUE_TEMPLATE/not-issue.md diff --git a/vimplugin/rainbow-master/.gitignore b/.config/vim/vimplugin/rainbow-master/.gitignore similarity index 100% rename from vimplugin/rainbow-master/.gitignore rename to .config/vim/vimplugin/rainbow-master/.gitignore diff --git a/vimplugin/rainbow-master/LICENSE b/.config/vim/vimplugin/rainbow-master/LICENSE similarity index 100% rename from vimplugin/rainbow-master/LICENSE rename to .config/vim/vimplugin/rainbow-master/LICENSE diff --git a/vimplugin/rainbow-master/NOTICE b/.config/vim/vimplugin/rainbow-master/NOTICE similarity index 100% rename from vimplugin/rainbow-master/NOTICE rename to .config/vim/vimplugin/rainbow-master/NOTICE diff --git a/vimplugin/rainbow-master/README.md b/.config/vim/vimplugin/rainbow-master/README.md similarity index 100% rename from vimplugin/rainbow-master/README.md rename to .config/vim/vimplugin/rainbow-master/README.md diff --git a/vimplugin/rainbow-master/README_zh.md b/.config/vim/vimplugin/rainbow-master/README_zh.md similarity index 100% rename from vimplugin/rainbow-master/README_zh.md rename to .config/vim/vimplugin/rainbow-master/README_zh.md diff --git a/vimplugin/rainbow-master/autoload/rainbow.vim b/.config/vim/vimplugin/rainbow-master/autoload/rainbow.vim similarity index 100% rename from vimplugin/rainbow-master/autoload/rainbow.vim rename to .config/vim/vimplugin/rainbow-master/autoload/rainbow.vim diff --git a/vimplugin/rainbow-master/autoload/rainbow_main.vim b/.config/vim/vimplugin/rainbow-master/autoload/rainbow_main.vim similarity index 100% rename from vimplugin/rainbow-master/autoload/rainbow_main.vim rename to .config/vim/vimplugin/rainbow-master/autoload/rainbow_main.vim diff --git a/vimplugin/rainbow-master/doc/rainbow.txt b/.config/vim/vimplugin/rainbow-master/doc/rainbow.txt similarity index 100% rename from vimplugin/rainbow-master/doc/rainbow.txt rename to .config/vim/vimplugin/rainbow-master/doc/rainbow.txt diff --git a/vimplugin/rainbow-master/plugin/rainbow_main.vim b/.config/vim/vimplugin/rainbow-master/plugin/rainbow_main.vim similarity index 100% rename from vimplugin/rainbow-master/plugin/rainbow_main.vim rename to .config/vim/vimplugin/rainbow-master/plugin/rainbow_main.vim diff --git a/vimplugin/rainbow-master/tests/test.c b/.config/vim/vimplugin/rainbow-master/tests/test.c similarity index 100% rename from vimplugin/rainbow-master/tests/test.c rename to .config/vim/vimplugin/rainbow-master/tests/test.c diff --git a/vimplugin/rainbow-master/tests/test.css b/.config/vim/vimplugin/rainbow-master/tests/test.css similarity index 100% rename from vimplugin/rainbow-master/tests/test.css rename to .config/vim/vimplugin/rainbow-master/tests/test.css diff --git a/vimplugin/rainbow-master/tests/test.csv b/.config/vim/vimplugin/rainbow-master/tests/test.csv similarity index 100% rename from vimplugin/rainbow-master/tests/test.csv rename to .config/vim/vimplugin/rainbow-master/tests/test.csv diff --git a/vimplugin/rainbow-master/tests/test.go b/.config/vim/vimplugin/rainbow-master/tests/test.go similarity index 100% rename from vimplugin/rainbow-master/tests/test.go rename to .config/vim/vimplugin/rainbow-master/tests/test.go diff --git a/vimplugin/rainbow-master/tests/test.hs b/.config/vim/vimplugin/rainbow-master/tests/test.hs similarity index 100% rename from vimplugin/rainbow-master/tests/test.hs rename to .config/vim/vimplugin/rainbow-master/tests/test.hs diff --git a/vimplugin/rainbow-master/tests/test.html b/.config/vim/vimplugin/rainbow-master/tests/test.html similarity index 100% rename from vimplugin/rainbow-master/tests/test.html rename to .config/vim/vimplugin/rainbow-master/tests/test.html diff --git a/vimplugin/rainbow-master/tests/test.html.txt b/.config/vim/vimplugin/rainbow-master/tests/test.html.txt similarity index 100% rename from vimplugin/rainbow-master/tests/test.html.txt rename to .config/vim/vimplugin/rainbow-master/tests/test.html.txt diff --git a/vimplugin/rainbow-master/tests/test.js b/.config/vim/vimplugin/rainbow-master/tests/test.js similarity index 100% rename from vimplugin/rainbow-master/tests/test.js rename to .config/vim/vimplugin/rainbow-master/tests/test.js diff --git a/vimplugin/rainbow-master/tests/test.lua b/.config/vim/vimplugin/rainbow-master/tests/test.lua similarity index 100% rename from vimplugin/rainbow-master/tests/test.lua rename to .config/vim/vimplugin/rainbow-master/tests/test.lua diff --git a/vimplugin/rainbow-master/tests/test.php b/.config/vim/vimplugin/rainbow-master/tests/test.php similarity index 100% rename from vimplugin/rainbow-master/tests/test.php rename to .config/vim/vimplugin/rainbow-master/tests/test.php diff --git a/vimplugin/rainbow-master/tests/test.pl b/.config/vim/vimplugin/rainbow-master/tests/test.pl similarity index 100% rename from vimplugin/rainbow-master/tests/test.pl rename to .config/vim/vimplugin/rainbow-master/tests/test.pl diff --git a/vimplugin/rainbow-master/tests/test.rb b/.config/vim/vimplugin/rainbow-master/tests/test.rb similarity index 100% rename from vimplugin/rainbow-master/tests/test.rb rename to .config/vim/vimplugin/rainbow-master/tests/test.rb diff --git a/vimplugin/rainbow-master/tests/test.sh b/.config/vim/vimplugin/rainbow-master/tests/test.sh similarity index 100% rename from vimplugin/rainbow-master/tests/test.sh rename to .config/vim/vimplugin/rainbow-master/tests/test.sh diff --git a/vimplugin/rainbow-master/tests/test.special-ft b/.config/vim/vimplugin/rainbow-master/tests/test.special-ft similarity index 100% rename from vimplugin/rainbow-master/tests/test.special-ft rename to .config/vim/vimplugin/rainbow-master/tests/test.special-ft diff --git a/vimplugin/rainbow-master/tests/test.styl b/.config/vim/vimplugin/rainbow-master/tests/test.styl similarity index 100% rename from vimplugin/rainbow-master/tests/test.styl rename to .config/vim/vimplugin/rainbow-master/tests/test.styl diff --git a/vimplugin/rainbow-master/tests/test.tex b/.config/vim/vimplugin/rainbow-master/tests/test.tex similarity index 100% rename from vimplugin/rainbow-master/tests/test.tex rename to .config/vim/vimplugin/rainbow-master/tests/test.tex diff --git a/vimplugin/rainbow-master/tests/test.xml b/.config/vim/vimplugin/rainbow-master/tests/test.xml similarity index 100% rename from vimplugin/rainbow-master/tests/test.xml rename to .config/vim/vimplugin/rainbow-master/tests/test.xml diff --git a/vimplugin/vim-airline-master/CHANGELOG.md b/.config/vim/vimplugin/vim-airline-master/CHANGELOG.md similarity index 100% rename from vimplugin/vim-airline-master/CHANGELOG.md rename to .config/vim/vimplugin/vim-airline-master/CHANGELOG.md diff --git a/vimplugin/vim-airline-master/CONTRIBUTING.md b/.config/vim/vimplugin/vim-airline-master/CONTRIBUTING.md similarity index 100% rename from vimplugin/vim-airline-master/CONTRIBUTING.md rename to .config/vim/vimplugin/vim-airline-master/CONTRIBUTING.md diff --git a/vimplugin/vim-airline-master/LICENSE b/.config/vim/vimplugin/vim-airline-master/LICENSE similarity index 100% rename from vimplugin/vim-airline-master/LICENSE rename to .config/vim/vimplugin/vim-airline-master/LICENSE diff --git a/vimplugin/vim-airline-master/README.md b/.config/vim/vimplugin/vim-airline-master/README.md similarity index 100% rename from vimplugin/vim-airline-master/README.md rename to .config/vim/vimplugin/vim-airline-master/README.md diff --git a/vimplugin/vim-airline-master/autoload/airline.vim b/.config/vim/vimplugin/vim-airline-master/autoload/airline.vim similarity index 100% rename from vimplugin/vim-airline-master/autoload/airline.vim rename to .config/vim/vimplugin/vim-airline-master/autoload/airline.vim diff --git a/vimplugin/vim-airline-master/autoload/airline/async.vim b/.config/vim/vimplugin/vim-airline-master/autoload/airline/async.vim similarity index 100% rename from vimplugin/vim-airline-master/autoload/airline/async.vim rename to .config/vim/vimplugin/vim-airline-master/autoload/airline/async.vim diff --git a/vimplugin/vim-airline-master/autoload/airline/builder.vim b/.config/vim/vimplugin/vim-airline-master/autoload/airline/builder.vim similarity index 100% rename from vimplugin/vim-airline-master/autoload/airline/builder.vim rename to .config/vim/vimplugin/vim-airline-master/autoload/airline/builder.vim diff --git a/vimplugin/vim-airline-master/autoload/airline/debug.vim b/.config/vim/vimplugin/vim-airline-master/autoload/airline/debug.vim similarity index 100% rename from vimplugin/vim-airline-master/autoload/airline/debug.vim rename to .config/vim/vimplugin/vim-airline-master/autoload/airline/debug.vim diff --git a/vimplugin/vim-airline-master/autoload/airline/extensions.vim b/.config/vim/vimplugin/vim-airline-master/autoload/airline/extensions.vim similarity index 100% rename from vimplugin/vim-airline-master/autoload/airline/extensions.vim rename to .config/vim/vimplugin/vim-airline-master/autoload/airline/extensions.vim diff --git a/vimplugin/vim-airline-master/autoload/airline/extensions/ale.vim b/.config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/ale.vim similarity index 100% rename from vimplugin/vim-airline-master/autoload/airline/extensions/ale.vim rename to .config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/ale.vim diff --git a/vimplugin/vim-airline-master/autoload/airline/extensions/battery.vim b/.config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/battery.vim similarity index 100% rename from vimplugin/vim-airline-master/autoload/airline/extensions/battery.vim rename to .config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/battery.vim diff --git a/vimplugin/vim-airline-master/autoload/airline/extensions/bookmark.vim b/.config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/bookmark.vim similarity index 100% rename from vimplugin/vim-airline-master/autoload/airline/extensions/bookmark.vim rename to .config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/bookmark.vim diff --git a/vimplugin/vim-airline-master/autoload/airline/extensions/branch.vim b/.config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/branch.vim similarity index 100% rename from vimplugin/vim-airline-master/autoload/airline/extensions/branch.vim rename to .config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/branch.vim diff --git a/vimplugin/vim-airline-master/autoload/airline/extensions/bufferline.vim b/.config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/bufferline.vim similarity index 100% rename from vimplugin/vim-airline-master/autoload/airline/extensions/bufferline.vim rename to .config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/bufferline.vim diff --git a/vimplugin/vim-airline-master/autoload/airline/extensions/capslock.vim b/.config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/capslock.vim similarity index 100% rename from vimplugin/vim-airline-master/autoload/airline/extensions/capslock.vim rename to .config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/capslock.vim diff --git a/vimplugin/vim-airline-master/autoload/airline/extensions/coc.vim b/.config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/coc.vim similarity index 100% rename from vimplugin/vim-airline-master/autoload/airline/extensions/coc.vim rename to .config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/coc.vim diff --git a/vimplugin/vim-airline-master/autoload/airline/extensions/commandt.vim b/.config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/commandt.vim similarity index 100% rename from vimplugin/vim-airline-master/autoload/airline/extensions/commandt.vim rename to .config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/commandt.vim diff --git a/vimplugin/vim-airline-master/autoload/airline/extensions/csv.vim b/.config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/csv.vim similarity index 100% rename from vimplugin/vim-airline-master/autoload/airline/extensions/csv.vim rename to .config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/csv.vim diff --git a/vimplugin/vim-airline-master/autoload/airline/extensions/ctrlp.vim b/.config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/ctrlp.vim similarity index 100% rename from vimplugin/vim-airline-master/autoload/airline/extensions/ctrlp.vim rename to .config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/ctrlp.vim diff --git a/vimplugin/vim-airline-master/autoload/airline/extensions/ctrlspace.vim b/.config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/ctrlspace.vim similarity index 100% rename from vimplugin/vim-airline-master/autoload/airline/extensions/ctrlspace.vim rename to .config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/ctrlspace.vim diff --git a/vimplugin/vim-airline-master/autoload/airline/extensions/cursormode.vim b/.config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/cursormode.vim similarity index 100% rename from vimplugin/vim-airline-master/autoload/airline/extensions/cursormode.vim rename to .config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/cursormode.vim diff --git a/vimplugin/vim-airline-master/autoload/airline/extensions/default.vim b/.config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/default.vim similarity index 100% rename from vimplugin/vim-airline-master/autoload/airline/extensions/default.vim rename to .config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/default.vim diff --git a/vimplugin/vim-airline-master/autoload/airline/extensions/denite.vim b/.config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/denite.vim similarity index 100% rename from vimplugin/vim-airline-master/autoload/airline/extensions/denite.vim rename to .config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/denite.vim diff --git a/vimplugin/vim-airline-master/autoload/airline/extensions/dirvish.vim b/.config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/dirvish.vim similarity index 100% rename from vimplugin/vim-airline-master/autoload/airline/extensions/dirvish.vim rename to .config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/dirvish.vim diff --git a/vimplugin/vim-airline-master/autoload/airline/extensions/eclim.vim b/.config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/eclim.vim similarity index 100% rename from vimplugin/vim-airline-master/autoload/airline/extensions/eclim.vim rename to .config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/eclim.vim diff --git a/vimplugin/vim-airline-master/autoload/airline/extensions/example.vim b/.config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/example.vim similarity index 100% rename from vimplugin/vim-airline-master/autoload/airline/extensions/example.vim rename to .config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/example.vim diff --git a/vimplugin/vim-airline-master/autoload/airline/extensions/fern.vim b/.config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/fern.vim similarity index 100% rename from vimplugin/vim-airline-master/autoload/airline/extensions/fern.vim rename to .config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/fern.vim diff --git a/vimplugin/vim-airline-master/autoload/airline/extensions/fugitiveline.vim b/.config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/fugitiveline.vim similarity index 100% rename from vimplugin/vim-airline-master/autoload/airline/extensions/fugitiveline.vim rename to .config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/fugitiveline.vim diff --git a/vimplugin/vim-airline-master/autoload/airline/extensions/fzf.vim b/.config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/fzf.vim similarity index 100% rename from vimplugin/vim-airline-master/autoload/airline/extensions/fzf.vim rename to .config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/fzf.vim diff --git a/vimplugin/vim-airline-master/autoload/airline/extensions/gen_tags.vim b/.config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/gen_tags.vim similarity index 100% rename from vimplugin/vim-airline-master/autoload/airline/extensions/gen_tags.vim rename to .config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/gen_tags.vim diff --git a/vimplugin/vim-airline-master/autoload/airline/extensions/gina.vim b/.config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/gina.vim similarity index 100% rename from vimplugin/vim-airline-master/autoload/airline/extensions/gina.vim rename to .config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/gina.vim diff --git a/vimplugin/vim-airline-master/autoload/airline/extensions/grepper.vim b/.config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/grepper.vim similarity index 100% rename from vimplugin/vim-airline-master/autoload/airline/extensions/grepper.vim rename to .config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/grepper.vim diff --git a/vimplugin/vim-airline-master/autoload/airline/extensions/gutentags.vim b/.config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/gutentags.vim similarity index 100% rename from vimplugin/vim-airline-master/autoload/airline/extensions/gutentags.vim rename to .config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/gutentags.vim diff --git a/vimplugin/vim-airline-master/autoload/airline/extensions/hunks.vim b/.config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/hunks.vim similarity index 100% rename from vimplugin/vim-airline-master/autoload/airline/extensions/hunks.vim rename to .config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/hunks.vim diff --git a/vimplugin/vim-airline-master/autoload/airline/extensions/keymap.vim b/.config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/keymap.vim similarity index 100% rename from vimplugin/vim-airline-master/autoload/airline/extensions/keymap.vim rename to .config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/keymap.vim diff --git a/vimplugin/vim-airline-master/autoload/airline/extensions/languageclient.vim b/.config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/languageclient.vim similarity index 100% rename from vimplugin/vim-airline-master/autoload/airline/extensions/languageclient.vim rename to .config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/languageclient.vim diff --git a/vimplugin/vim-airline-master/autoload/airline/extensions/localsearch.vim b/.config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/localsearch.vim similarity index 100% rename from vimplugin/vim-airline-master/autoload/airline/extensions/localsearch.vim rename to .config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/localsearch.vim diff --git a/vimplugin/vim-airline-master/autoload/airline/extensions/lsp.vim b/.config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/lsp.vim similarity index 100% rename from vimplugin/vim-airline-master/autoload/airline/extensions/lsp.vim rename to .config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/lsp.vim diff --git a/vimplugin/vim-airline-master/autoload/airline/extensions/neomake.vim b/.config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/neomake.vim similarity index 100% rename from vimplugin/vim-airline-master/autoload/airline/extensions/neomake.vim rename to .config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/neomake.vim diff --git a/vimplugin/vim-airline-master/autoload/airline/extensions/netrw.vim b/.config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/netrw.vim similarity index 100% rename from vimplugin/vim-airline-master/autoload/airline/extensions/netrw.vim rename to .config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/netrw.vim diff --git a/vimplugin/vim-airline-master/autoload/airline/extensions/nrrwrgn.vim b/.config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/nrrwrgn.vim similarity index 100% rename from vimplugin/vim-airline-master/autoload/airline/extensions/nrrwrgn.vim rename to .config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/nrrwrgn.vim diff --git a/vimplugin/vim-airline-master/autoload/airline/extensions/nvimlsp.vim b/.config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/nvimlsp.vim similarity index 100% rename from vimplugin/vim-airline-master/autoload/airline/extensions/nvimlsp.vim rename to .config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/nvimlsp.vim diff --git a/vimplugin/vim-airline-master/autoload/airline/extensions/obsession.vim b/.config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/obsession.vim similarity index 100% rename from vimplugin/vim-airline-master/autoload/airline/extensions/obsession.vim rename to .config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/obsession.vim diff --git a/vimplugin/vim-airline-master/autoload/airline/extensions/omnisharp.vim b/.config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/omnisharp.vim similarity index 100% rename from vimplugin/vim-airline-master/autoload/airline/extensions/omnisharp.vim rename to .config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/omnisharp.vim diff --git a/vimplugin/vim-airline-master/autoload/airline/extensions/po.vim b/.config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/po.vim similarity index 100% rename from vimplugin/vim-airline-master/autoload/airline/extensions/po.vim rename to .config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/po.vim diff --git a/vimplugin/vim-airline-master/autoload/airline/extensions/poetv.vim b/.config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/poetv.vim similarity index 100% rename from vimplugin/vim-airline-master/autoload/airline/extensions/poetv.vim rename to .config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/poetv.vim diff --git a/vimplugin/vim-airline-master/autoload/airline/extensions/promptline.vim b/.config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/promptline.vim similarity index 100% rename from vimplugin/vim-airline-master/autoload/airline/extensions/promptline.vim rename to .config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/promptline.vim diff --git a/vimplugin/vim-airline-master/autoload/airline/extensions/quickfix.vim b/.config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/quickfix.vim similarity index 100% rename from vimplugin/vim-airline-master/autoload/airline/extensions/quickfix.vim rename to .config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/quickfix.vim diff --git a/vimplugin/vim-airline-master/autoload/airline/extensions/rufo.vim b/.config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/rufo.vim similarity index 100% rename from vimplugin/vim-airline-master/autoload/airline/extensions/rufo.vim rename to .config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/rufo.vim diff --git a/vimplugin/vim-airline-master/autoload/airline/extensions/scrollbar.vim b/.config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/scrollbar.vim similarity index 100% rename from vimplugin/vim-airline-master/autoload/airline/extensions/scrollbar.vim rename to .config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/scrollbar.vim diff --git a/vimplugin/vim-airline-master/autoload/airline/extensions/searchcount.vim b/.config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/searchcount.vim similarity index 100% rename from vimplugin/vim-airline-master/autoload/airline/extensions/searchcount.vim rename to .config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/searchcount.vim diff --git a/vimplugin/vim-airline-master/autoload/airline/extensions/syntastic.vim b/.config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/syntastic.vim similarity index 100% rename from vimplugin/vim-airline-master/autoload/airline/extensions/syntastic.vim rename to .config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/syntastic.vim diff --git a/vimplugin/vim-airline-master/autoload/airline/extensions/tabline.vim b/.config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/tabline.vim similarity index 100% rename from vimplugin/vim-airline-master/autoload/airline/extensions/tabline.vim rename to .config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/tabline.vim diff --git a/vimplugin/vim-airline-master/autoload/airline/extensions/tabline/autoshow.vim b/.config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/tabline/autoshow.vim similarity index 100% rename from vimplugin/vim-airline-master/autoload/airline/extensions/tabline/autoshow.vim rename to .config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/tabline/autoshow.vim diff --git a/vimplugin/vim-airline-master/autoload/airline/extensions/tabline/buffers.vim b/.config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/tabline/buffers.vim similarity index 100% rename from vimplugin/vim-airline-master/autoload/airline/extensions/tabline/buffers.vim rename to .config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/tabline/buffers.vim diff --git a/vimplugin/vim-airline-master/autoload/airline/extensions/tabline/buflist.vim b/.config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/tabline/buflist.vim similarity index 100% rename from vimplugin/vim-airline-master/autoload/airline/extensions/tabline/buflist.vim rename to .config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/tabline/buflist.vim diff --git a/vimplugin/vim-airline-master/autoload/airline/extensions/tabline/builder.vim b/.config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/tabline/builder.vim similarity index 100% rename from vimplugin/vim-airline-master/autoload/airline/extensions/tabline/builder.vim rename to .config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/tabline/builder.vim diff --git a/vimplugin/vim-airline-master/autoload/airline/extensions/tabline/ctrlspace.vim b/.config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/tabline/ctrlspace.vim similarity index 100% rename from vimplugin/vim-airline-master/autoload/airline/extensions/tabline/ctrlspace.vim rename to .config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/tabline/ctrlspace.vim diff --git a/vimplugin/vim-airline-master/autoload/airline/extensions/tabline/formatters/default.vim b/.config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/tabline/formatters/default.vim similarity index 100% rename from vimplugin/vim-airline-master/autoload/airline/extensions/tabline/formatters/default.vim rename to .config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/tabline/formatters/default.vim diff --git a/vimplugin/vim-airline-master/autoload/airline/extensions/tabline/formatters/jsformatter.vim b/.config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/tabline/formatters/jsformatter.vim similarity index 100% rename from vimplugin/vim-airline-master/autoload/airline/extensions/tabline/formatters/jsformatter.vim rename to .config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/tabline/formatters/jsformatter.vim diff --git a/vimplugin/vim-airline-master/autoload/airline/extensions/tabline/formatters/short_path.vim b/.config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/tabline/formatters/short_path.vim similarity index 100% rename from vimplugin/vim-airline-master/autoload/airline/extensions/tabline/formatters/short_path.vim rename to .config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/tabline/formatters/short_path.vim diff --git a/vimplugin/vim-airline-master/autoload/airline/extensions/tabline/formatters/short_path_improved.vim b/.config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/tabline/formatters/short_path_improved.vim similarity index 100% rename from vimplugin/vim-airline-master/autoload/airline/extensions/tabline/formatters/short_path_improved.vim rename to .config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/tabline/formatters/short_path_improved.vim diff --git a/vimplugin/vim-airline-master/autoload/airline/extensions/tabline/formatters/tabnr.vim b/.config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/tabline/formatters/tabnr.vim similarity index 100% rename from vimplugin/vim-airline-master/autoload/airline/extensions/tabline/formatters/tabnr.vim rename to .config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/tabline/formatters/tabnr.vim diff --git a/vimplugin/vim-airline-master/autoload/airline/extensions/tabline/formatters/unique_tail.vim b/.config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/tabline/formatters/unique_tail.vim similarity index 100% rename from vimplugin/vim-airline-master/autoload/airline/extensions/tabline/formatters/unique_tail.vim rename to .config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/tabline/formatters/unique_tail.vim diff --git a/vimplugin/vim-airline-master/autoload/airline/extensions/tabline/formatters/unique_tail_improved.vim b/.config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/tabline/formatters/unique_tail_improved.vim similarity index 100% rename from vimplugin/vim-airline-master/autoload/airline/extensions/tabline/formatters/unique_tail_improved.vim rename to .config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/tabline/formatters/unique_tail_improved.vim diff --git a/vimplugin/vim-airline-master/autoload/airline/extensions/tabline/tabs.vim b/.config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/tabline/tabs.vim similarity index 100% rename from vimplugin/vim-airline-master/autoload/airline/extensions/tabline/tabs.vim rename to .config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/tabline/tabs.vim diff --git a/vimplugin/vim-airline-master/autoload/airline/extensions/tabline/tabws.vim b/.config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/tabline/tabws.vim similarity index 100% rename from vimplugin/vim-airline-master/autoload/airline/extensions/tabline/tabws.vim rename to .config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/tabline/tabws.vim diff --git a/vimplugin/vim-airline-master/autoload/airline/extensions/tabline/xtabline.vim b/.config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/tabline/xtabline.vim similarity index 100% rename from vimplugin/vim-airline-master/autoload/airline/extensions/tabline/xtabline.vim rename to .config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/tabline/xtabline.vim diff --git a/vimplugin/vim-airline-master/autoload/airline/extensions/tagbar.vim b/.config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/tagbar.vim similarity index 100% rename from vimplugin/vim-airline-master/autoload/airline/extensions/tagbar.vim rename to .config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/tagbar.vim diff --git a/vimplugin/vim-airline-master/autoload/airline/extensions/taglist.vim b/.config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/taglist.vim similarity index 100% rename from vimplugin/vim-airline-master/autoload/airline/extensions/taglist.vim rename to .config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/taglist.vim diff --git a/vimplugin/vim-airline-master/autoload/airline/extensions/term.vim b/.config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/term.vim similarity index 100% rename from vimplugin/vim-airline-master/autoload/airline/extensions/term.vim rename to .config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/term.vim diff --git a/vimplugin/vim-airline-master/autoload/airline/extensions/tmuxline.vim b/.config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/tmuxline.vim similarity index 100% rename from vimplugin/vim-airline-master/autoload/airline/extensions/tmuxline.vim rename to .config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/tmuxline.vim diff --git a/vimplugin/vim-airline-master/autoload/airline/extensions/undotree.vim b/.config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/undotree.vim similarity index 100% rename from vimplugin/vim-airline-master/autoload/airline/extensions/undotree.vim rename to .config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/undotree.vim diff --git a/vimplugin/vim-airline-master/autoload/airline/extensions/unicode.vim b/.config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/unicode.vim similarity index 100% rename from vimplugin/vim-airline-master/autoload/airline/extensions/unicode.vim rename to .config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/unicode.vim diff --git a/vimplugin/vim-airline-master/autoload/airline/extensions/unite.vim b/.config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/unite.vim similarity index 100% rename from vimplugin/vim-airline-master/autoload/airline/extensions/unite.vim rename to .config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/unite.vim diff --git a/vimplugin/vim-airline-master/autoload/airline/extensions/vim9lsp.vim b/.config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/vim9lsp.vim similarity index 100% rename from vimplugin/vim-airline-master/autoload/airline/extensions/vim9lsp.vim rename to .config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/vim9lsp.vim diff --git a/vimplugin/vim-airline-master/autoload/airline/extensions/vimagit.vim b/.config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/vimagit.vim similarity index 100% rename from vimplugin/vim-airline-master/autoload/airline/extensions/vimagit.vim rename to .config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/vimagit.vim diff --git a/vimplugin/vim-airline-master/autoload/airline/extensions/vimcmake.vim b/.config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/vimcmake.vim similarity index 100% rename from vimplugin/vim-airline-master/autoload/airline/extensions/vimcmake.vim rename to .config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/vimcmake.vim diff --git a/vimplugin/vim-airline-master/autoload/airline/extensions/vimtex.vim b/.config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/vimtex.vim similarity index 100% rename from vimplugin/vim-airline-master/autoload/airline/extensions/vimtex.vim rename to .config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/vimtex.vim diff --git a/vimplugin/vim-airline-master/autoload/airline/extensions/virtualenv.vim b/.config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/virtualenv.vim similarity index 100% rename from vimplugin/vim-airline-master/autoload/airline/extensions/virtualenv.vim rename to .config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/virtualenv.vim diff --git a/vimplugin/vim-airline-master/autoload/airline/extensions/vista.vim b/.config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/vista.vim similarity index 100% rename from vimplugin/vim-airline-master/autoload/airline/extensions/vista.vim rename to .config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/vista.vim diff --git a/vimplugin/vim-airline-master/autoload/airline/extensions/whitespace.vim b/.config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/whitespace.vim similarity index 100% rename from vimplugin/vim-airline-master/autoload/airline/extensions/whitespace.vim rename to .config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/whitespace.vim diff --git a/vimplugin/vim-airline-master/autoload/airline/extensions/windowswap.vim b/.config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/windowswap.vim similarity index 100% rename from vimplugin/vim-airline-master/autoload/airline/extensions/windowswap.vim rename to .config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/windowswap.vim diff --git a/vimplugin/vim-airline-master/autoload/airline/extensions/wordcount.vim b/.config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/wordcount.vim similarity index 100% rename from vimplugin/vim-airline-master/autoload/airline/extensions/wordcount.vim rename to .config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/wordcount.vim diff --git a/vimplugin/vim-airline-master/autoload/airline/extensions/wordcount/formatters/default.vim b/.config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/wordcount/formatters/default.vim similarity index 100% rename from vimplugin/vim-airline-master/autoload/airline/extensions/wordcount/formatters/default.vim rename to .config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/wordcount/formatters/default.vim diff --git a/vimplugin/vim-airline-master/autoload/airline/extensions/wordcount/formatters/readingtime.vim b/.config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/wordcount/formatters/readingtime.vim similarity index 100% rename from vimplugin/vim-airline-master/autoload/airline/extensions/wordcount/formatters/readingtime.vim rename to .config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/wordcount/formatters/readingtime.vim diff --git a/vimplugin/vim-airline-master/autoload/airline/extensions/xkblayout.vim b/.config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/xkblayout.vim similarity index 100% rename from vimplugin/vim-airline-master/autoload/airline/extensions/xkblayout.vim rename to .config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/xkblayout.vim diff --git a/vimplugin/vim-airline-master/autoload/airline/extensions/ycm.vim b/.config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/ycm.vim similarity index 100% rename from vimplugin/vim-airline-master/autoload/airline/extensions/ycm.vim rename to .config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/ycm.vim diff --git a/vimplugin/vim-airline-master/autoload/airline/extensions/zoomwintab.vim b/.config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/zoomwintab.vim similarity index 100% rename from vimplugin/vim-airline-master/autoload/airline/extensions/zoomwintab.vim rename to .config/vim/vimplugin/vim-airline-master/autoload/airline/extensions/zoomwintab.vim diff --git a/vimplugin/vim-airline-master/autoload/airline/formatter/short_path.vim b/.config/vim/vimplugin/vim-airline-master/autoload/airline/formatter/short_path.vim similarity index 100% rename from vimplugin/vim-airline-master/autoload/airline/formatter/short_path.vim rename to .config/vim/vimplugin/vim-airline-master/autoload/airline/formatter/short_path.vim diff --git a/vimplugin/vim-airline-master/autoload/airline/highlighter.vim b/.config/vim/vimplugin/vim-airline-master/autoload/airline/highlighter.vim similarity index 100% rename from vimplugin/vim-airline-master/autoload/airline/highlighter.vim rename to .config/vim/vimplugin/vim-airline-master/autoload/airline/highlighter.vim diff --git a/vimplugin/vim-airline-master/autoload/airline/init.vim b/.config/vim/vimplugin/vim-airline-master/autoload/airline/init.vim similarity index 100% rename from vimplugin/vim-airline-master/autoload/airline/init.vim rename to .config/vim/vimplugin/vim-airline-master/autoload/airline/init.vim diff --git a/vimplugin/vim-airline-master/autoload/airline/msdos.vim b/.config/vim/vimplugin/vim-airline-master/autoload/airline/msdos.vim similarity index 100% rename from vimplugin/vim-airline-master/autoload/airline/msdos.vim rename to .config/vim/vimplugin/vim-airline-master/autoload/airline/msdos.vim diff --git a/vimplugin/vim-airline-master/autoload/airline/parts.vim b/.config/vim/vimplugin/vim-airline-master/autoload/airline/parts.vim similarity index 100% rename from vimplugin/vim-airline-master/autoload/airline/parts.vim rename to .config/vim/vimplugin/vim-airline-master/autoload/airline/parts.vim diff --git a/vimplugin/vim-airline-master/autoload/airline/section.vim b/.config/vim/vimplugin/vim-airline-master/autoload/airline/section.vim similarity index 100% rename from vimplugin/vim-airline-master/autoload/airline/section.vim rename to .config/vim/vimplugin/vim-airline-master/autoload/airline/section.vim diff --git a/vimplugin/vim-airline-master/autoload/airline/themes.vim b/.config/vim/vimplugin/vim-airline-master/autoload/airline/themes.vim similarity index 100% rename from vimplugin/vim-airline-master/autoload/airline/themes.vim rename to .config/vim/vimplugin/vim-airline-master/autoload/airline/themes.vim diff --git a/vimplugin/vim-airline-master/autoload/airline/themes/dark.vim b/.config/vim/vimplugin/vim-airline-master/autoload/airline/themes/dark.vim similarity index 100% rename from vimplugin/vim-airline-master/autoload/airline/themes/dark.vim rename to .config/vim/vimplugin/vim-airline-master/autoload/airline/themes/dark.vim diff --git a/vimplugin/vim-airline-master/autoload/airline/util.vim b/.config/vim/vimplugin/vim-airline-master/autoload/airline/util.vim similarity index 100% rename from vimplugin/vim-airline-master/autoload/airline/util.vim rename to .config/vim/vimplugin/vim-airline-master/autoload/airline/util.vim diff --git a/vimplugin/vim-airline-master/doc/airline.txt b/.config/vim/vimplugin/vim-airline-master/doc/airline.txt similarity index 100% rename from vimplugin/vim-airline-master/doc/airline.txt rename to .config/vim/vimplugin/vim-airline-master/doc/airline.txt diff --git a/vimplugin/vim-airline-master/doc/tags b/.config/vim/vimplugin/vim-airline-master/doc/tags similarity index 100% rename from vimplugin/vim-airline-master/doc/tags rename to .config/vim/vimplugin/vim-airline-master/doc/tags diff --git a/vimplugin/vim-airline-master/plugin/airline.vim b/.config/vim/vimplugin/vim-airline-master/plugin/airline.vim similarity index 100% rename from vimplugin/vim-airline-master/plugin/airline.vim rename to .config/vim/vimplugin/vim-airline-master/plugin/airline.vim diff --git a/vimplugin/vim-airline-master/test/.themisrc b/.config/vim/vimplugin/vim-airline-master/test/.themisrc similarity index 100% rename from vimplugin/vim-airline-master/test/.themisrc rename to .config/vim/vimplugin/vim-airline-master/test/.themisrc diff --git a/vimplugin/vim-airline-master/test/airline.vimspec b/.config/vim/vimplugin/vim-airline-master/test/airline.vimspec similarity index 100% rename from vimplugin/vim-airline-master/test/airline.vimspec rename to .config/vim/vimplugin/vim-airline-master/test/airline.vimspec diff --git a/vimplugin/vim-airline-master/test/builder.vimspec b/.config/vim/vimplugin/vim-airline-master/test/builder.vimspec similarity index 100% rename from vimplugin/vim-airline-master/test/builder.vimspec rename to .config/vim/vimplugin/vim-airline-master/test/builder.vimspec diff --git a/vimplugin/vim-airline-master/test/commands.vimspec b/.config/vim/vimplugin/vim-airline-master/test/commands.vimspec similarity index 100% rename from vimplugin/vim-airline-master/test/commands.vimspec rename to .config/vim/vimplugin/vim-airline-master/test/commands.vimspec diff --git a/vimplugin/vim-airline-master/test/extensions_default.vimspec b/.config/vim/vimplugin/vim-airline-master/test/extensions_default.vimspec similarity index 100% rename from vimplugin/vim-airline-master/test/extensions_default.vimspec rename to .config/vim/vimplugin/vim-airline-master/test/extensions_default.vimspec diff --git a/vimplugin/vim-airline-master/test/extensions_tabline.vimspec b/.config/vim/vimplugin/vim-airline-master/test/extensions_tabline.vimspec similarity index 100% rename from vimplugin/vim-airline-master/test/extensions_tabline.vimspec rename to .config/vim/vimplugin/vim-airline-master/test/extensions_tabline.vimspec diff --git a/vimplugin/vim-airline-master/test/highlighter.vimspec b/.config/vim/vimplugin/vim-airline-master/test/highlighter.vimspec similarity index 100% rename from vimplugin/vim-airline-master/test/highlighter.vimspec rename to .config/vim/vimplugin/vim-airline-master/test/highlighter.vimspec diff --git a/vimplugin/vim-airline-master/test/init.vimspec b/.config/vim/vimplugin/vim-airline-master/test/init.vimspec similarity index 100% rename from vimplugin/vim-airline-master/test/init.vimspec rename to .config/vim/vimplugin/vim-airline-master/test/init.vimspec diff --git a/vimplugin/vim-airline-master/test/parts.vimspec b/.config/vim/vimplugin/vim-airline-master/test/parts.vimspec similarity index 100% rename from vimplugin/vim-airline-master/test/parts.vimspec rename to .config/vim/vimplugin/vim-airline-master/test/parts.vimspec diff --git a/vimplugin/vim-airline-master/test/section.vimspec b/.config/vim/vimplugin/vim-airline-master/test/section.vimspec similarity index 100% rename from vimplugin/vim-airline-master/test/section.vimspec rename to .config/vim/vimplugin/vim-airline-master/test/section.vimspec diff --git a/vimplugin/vim-airline-master/test/themes.vimspec b/.config/vim/vimplugin/vim-airline-master/test/themes.vimspec similarity index 100% rename from vimplugin/vim-airline-master/test/themes.vimspec rename to .config/vim/vimplugin/vim-airline-master/test/themes.vimspec diff --git a/vimplugin/vim-airline-master/test/util.vimspec b/.config/vim/vimplugin/vim-airline-master/test/util.vimspec similarity index 100% rename from vimplugin/vim-airline-master/test/util.vimspec rename to .config/vim/vimplugin/vim-airline-master/test/util.vimspec diff --git a/.gitconfig b/.gitconfig new file mode 100644 index 0000000..51ffb4e --- /dev/null +++ b/.gitconfig @@ -0,0 +1,14 @@ +# This is Git's per-user configuration file. +[user] +# Please adapt and uncomment the following lines: + name = Marsway + email = liwei@marsway.red +[alias] + p = push + b = branch + s = status + l = log + d = diff + m = commit -m + f = pull + aa = add . diff --git a/.mackup.cfg b/.mackup.cfg new file mode 100644 index 0000000..b79b1fa --- /dev/null +++ b/.mackup.cfg @@ -0,0 +1,10 @@ +[storage] +engine = file_system +path = .vvconfig +directory = mackup + +[applications_to_sync] +#git +#neovim +#fish +clash_verge diff --git a/.mackup/clash_verge.cfg b/.mackup/clash_verge.cfg new file mode 100644 index 0000000..109daf2 --- /dev/null +++ b/.mackup/clash_verge.cfg @@ -0,0 +1,23 @@ +[application] +name = clash_verge + +[configuration_files] +Library/Application Support/io.github.clash-verge-rev.clash-verge-rev/cache.db +Library/Application Support/io.github.clash-verge-rev.clash-verge-rev/clash-verge-check.yaml +Library/Application Support/io.github.clash-verge-rev.clash-verge-rev/clash-verge.yaml +Library/Application Support/io.github.clash-verge-rev.clash-verge-rev/config.yaml +Library/Application Support/io.github.clash-verge-rev.clash-verge-rev/Country.mmdb +Library/Application Support/io.github.clash-verge-rev.clash-verge-rev/dns_config.yaml +Library/Application Support/io.github.clash-verge-rev.clash-verge-rev/geoip.dat +Library/Application Support/io.github.clash-verge-rev.clash-verge-rev/geosite.dat +Library/Application Support/io.github.clash-verge-rev.clash-verge-rev/profiles.yaml +Library/Application Support/io.github.clash-verge-rev.clash-verge-rev/profiles/g9n81JmX5NEV.yaml +Library/Application Support/io.github.clash-verge-rev.clash-verge-rev/profiles/m2jcm8sRQPvm.yaml +Library/Application Support/io.github.clash-verge-rev.clash-verge-rev/profiles/Merge.yaml +Library/Application Support/io.github.clash-verge-rev.clash-verge-rev/profiles/psk9x7ukgnfn.yaml +Library/Application Support/io.github.clash-verge-rev.clash-verge-rev/profiles/rD6SmDizAwB7.yaml +Library/Application Support/io.github.clash-verge-rev.clash-verge-rev/profiles/RoYtUvrMCxF7.yaml +Library/Application Support/io.github.clash-verge-rev.clash-verge-rev/profiles/s1cP0zOEBkP5.js +Library/Application Support/io.github.clash-verge-rev.clash-verge-rev/profiles/Script.js +Library/Application Support/io.github.clash-verge-rev.clash-verge-rev/test +Library/Application Support/io.github.clash-verge-rev.clash-verge-rev/verge.yaml diff --git a/.mackup/neovim.cfg b/.mackup/neovim.cfg new file mode 100644 index 0000000..78bba61 --- /dev/null +++ b/.mackup/neovim.cfg @@ -0,0 +1,15 @@ +[application] +name = neovim + +[xdg_configuration_files] +nvim/lazy-lock.json +nvim/init.lua +nvim/lua +nvim/colors +nvim/compiler +nvim/ftplugin +nvim/ftdetect +nvim/indent +nvim/plugin +nvim/syntax +nvim/after diff --git a/.stow-local-ignore b/.stow-local-ignore new file mode 100644 index 0000000..961c7a2 --- /dev/null +++ b/.stow-local-ignore @@ -0,0 +1,9 @@ +.git +mackup +.DS_Store +aliases +init.sh +scripts +README.md +Brewfile +install diff --git a/.vimrc b/.vimrc new file mode 100755 index 0000000..68a050b --- /dev/null +++ b/.vimrc @@ -0,0 +1,31 @@ +" function +" count +source ~/.vvconfig/.config/vim/vimconfig/Count.vim +" toggle comment +source ~/.vvconfig/.config/vim/vimconfig/ToggleComment.vim +" auto insert copyright when create .h .cc file +source ~/.vvconfig/.config/vim/vimconfig/CopyRight.vim +" macro definition __copyRight__ +source ~/.vvconfig/.config/vim/vimconfig/InsertCopyRight.vim +" normal config +source ~/.vvconfig/.config/vim/vimconfig/setting.vim +" NERDTree +set runtimepath+=~/.vvconfig/.config/vim/vimplugin/nerdtree-master +source ~/.vvconfig/.config/vim/vimconfig/nerdtree.vim +" auto reformat when save .h .cc file +source ~/.vvconfig/.config/vim/vimconfig/autoReformat.vim + +" theme +" vim color +source ~/.vvconfig/.config/vim/vimcolor/solarized-master/vim-colors-solarized/colors/solarized.vim +" cpp highLight +source ~/.vvconfig/.config/vim/vimcolor/setCpp.vim +" airline +set runtimepath+=~/.vvconfig/.config/vim/vimplugin/vim-airline-master +source ~/.vvconfig/.config/vim/vimcolor/airline.vim +" one dark +set runtimepath+=~/.vvconfig/.config/vim/vimplugin/onedark.vim-main +source ~/.vvconfig/.config/vim/vimcolor/onedark.vim +" rainbow +set runtimepath+=~/.vvconfig/.config/vim/vimplugin/rainbow-master +source ~/.vvconfig/.config/vim/vimcolor/rainbow.vim diff --git a/zshrc b/.zshrc similarity index 86% rename from zshrc rename to .zshrc index 1baac44..4dfafe1 100755 --- a/zshrc +++ b/.zshrc @@ -1,9 +1,5 @@ -source ~/.vvconfig/setting -export TARGET_BUILD_TYPE=1 -if [ "$AUTO_CD" = yes ]; then - setopt autocd # change directory just by typing its name -fi -setopt correct # auto correct mistakes +setopt autocd # change directory just by typing its name +setopt correct # auto correct mistakes setopt interactivecomments # allow comments in interactive mode setopt magicequalsubst # enable filename expansion for arguments of the form ‘anything=expression’ setopt nonomatch # hide error message if there is no match for the pattern @@ -61,31 +57,11 @@ alias history="history 0" #TIMEFMT=$'\nreal\t%E\nuser\t%U\nsys\t%S\ncpu\t%P' -configure_prompt() { - prompt_symbol_0=💀 - prompt_symbol_1="☠️ " - prompt_symbol_2="👾" - prompt_symbol_3="🤖" - prompt_symbol_4="🎃" - prompt_symbol_5="🍃" - prompt_symbol_6="❄️ " - prompt_symbol_7="🌸" - prompt_symbol=$prompt_symbol_6 - if [ "$PROMPT_ALTERNATIVE" = oneline ]; then - # PROMPT=$'%{%F{042}%}'$USER_NAME$''$prompt_symbol$'%{%F{042}%}%D{%T} %D{%m/%f}: %b%F{reset}%F{042}%(6~.%-1~/…/%4~.%5~)%F{042}%B$%b%F{reset} ' - PROMPT=$'%{%F{041}%}'$USER_NAME$''$prompt_symbol$'%{%F{041}%}%D{%T}: %b%F{reset}%F{041}%(6~.%-1~/…/%4~.%5~)%F{041}%B$%b%F{reset} ' - else - PROMPT=$'%{%F{042}%}┌-~'$USER_NAME$' (on '$HOST$') '$prompt_symbol$'%{%F{042}%}%D{%T} | %b%F{reset}%F{042}%(6~.%-1~/…/%4~.%5~)\n%F{042}└-~%B$%b%F{reset} ' - fi -} - color_prompt=yes if [ "$color_prompt" = yes ]; then # override default virtualenv indicator in prompt VIRTUAL_ENV_DISABLE_PROMPT=1 - configure_prompt - # enable syntax-highlighting if [ -f ~/.vvconfig/zshplugin/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh ]; then . ~/.vvconfig/zshplugin/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh @@ -196,13 +172,12 @@ alias ll='ls -l' alias l='ls' alias la='ls -al' alias vi='vim' +alias lg='ll -a | grep' +alias du='du -h --max-depth=1' alias p='python3' -alias q="ps|grep bash|grep -o '[0-9]*'|head -1|xargs kill -9" alias tree='tree -C' # PATH -export PATH=/Users/lee2vv/Coding/Tools/git-repo:$PATH - -source ~/.vvconfig/commands/count.sh -source ~/.vvconfig/commands/formality.sh -source ~/.vvconfig/commands/crack.sh +export PATH=/Users/$USER/Coding/Tools/git-repo:$PATH +eval "$(lua ~/.vvconfig/scripts/z.lua/z.lua --init zsh)" +source ~/.vvconfig/.aliases/aliases.sh diff --git a/BG.jpg b/BG.jpg deleted file mode 100644 index 30d3bf6..0000000 Binary files a/BG.jpg and /dev/null differ diff --git a/README b/README deleted file mode 100755 index 8f000f7..0000000 --- a/README +++ /dev/null @@ -1,72 +0,0 @@ -# Author : summer -# -# Description : configs readme -# -# Revision : -# Rev. Date Designer Description -# 1.0 2022 summer Initial version. -# 1.1 2023-03-17 summer rm unused vimconf file; -# 1.2 2023-03-20 summer auto insert copyright when -# create .h or .cc file; -# rm 'q to quit' in vim -# -# 2.0 2023-03-21 summer you can change setting in -# 'setting' -# 2.1 2023-03-27 summer vim :Count [string] to -# count string number; -# vim theme change -# 2.2 2023-03-28 summer vim [CTRL]n to toggle -# comment; -# vim [SHIFT][TAB] to -# switch buffer -# 3.0 2023-03-28 summer use applySetting.sh to -# auto apply; -# make this folder hidden; -# -# - -HOW TO USE [auto setup] - [sh applySetting.sh] - you can edit username and others in setting - -HOW TO USE [manual setup] - move ".summerConfig" to ~/ - source file, if you wanna use zshrc, edit your ~/.zshrc and cover it with "source ~/.summerConfig/zshrc" - so do 'vimrc', 'bashrc', 'tcshrc' ... - you can edit username and others in setting - ------------------ shell ----------------------- -1[zsh]. edit line101 to change symbol(such as bone, flower balabala) -2[zsh]. CTRL-P to switch shell style(single-line or double-line) -3[zsh]. CTRL-E to complete command(based on history), CTRL-U/ESC to delete command -4[zsh]. you can omit 'cd' when wanna enter dir - eg: /usr/bin - instead of - cd /usr/bin -5. alias : - l ls - ll ls -l - la ls -al - q exit shell - count echo file number(folders not included), count -h to help - node bsub -Is -n 4 -M 6000 - rm find in summerConfig/command/rm - vi start vim - python start python3 - p start python3 - atom start atom - vivado start vivado - precision start precision - formality start formality, -h for help - - ---------------- vimrc ----------------------- -1. \+s save (normal mode) -2. \+q quit (normal mode) -3. [space]+e open/close dir-tree -4. :Count [string] count string number -5. [CTRL]n toggle comment - ---------------- crontab ---------------------- -find in ones.eagle.local, EDA Team, crontab Doc - diff --git a/aliases/git.sh b/aliases/git.sh deleted file mode 100644 index ba24669..0000000 --- a/aliases/git.sh +++ /dev/null @@ -1 +0,0 @@ -alias g='git' diff --git a/aliases/sourceme.sh b/aliases/sourceme.sh deleted file mode 100644 index e4cb0d1..0000000 --- a/aliases/sourceme.sh +++ /dev/null @@ -1 +0,0 @@ -source ~/.vvconfig/aliases/git.sh diff --git a/bashrc b/bashrc deleted file mode 100755 index 1b9cd0e..0000000 --- a/bashrc +++ /dev/null @@ -1,132 +0,0 @@ -source ~/.vvconfig/setting - -zsh - -source /opt/rh/devtoolset-9/enable -module load vivado/2022.1 - -# If not running interactively, don't do anything -case $- in - *i*) ;; - *) return;; -esac - -# don't put duplicate lines or lines starting with space in the history. -# See bash(1) for more options -HISTCONTROL=ignoreboth - -# append to the history file, don't overwrite it -shopt -s histappend - -# for setting history length see HISTSIZE and HISTFILESIZE in bash(1) -HISTSIZE=1000 -HISTFILESIZE=2000 - -# check the window size after each command and, if necessary, -# update the values of LINES and COLUMNS. -shopt -s checkwinsize - -# If set, the pattern "**" used in a pathname expansion context will -# match all files and zero or more directories and subdirectories. -#shopt -s globstar - -# make less more friendly for non-text input files, see lesspipe(1) -[ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)" - -# set variable identifying the chroot you work in (used in the prompt below) -if [ -z "${debian_chroot:-}" ] && [ -r /etc/debian_chroot ]; then - debian_chroot=$(cat /etc/debian_chroot) -fi - -# set a fancy prompt (non-color, unless we know we "want" color) -case "$TERM" in - xterm-color|*-256color) color_prompt=yes;; -esac - -# uncomment for a colored prompt, if the terminal has the capability; turned -# off by default to not distract the user: the focus in a terminal window -# should be on the output of commands, not on the prompt -#force_color_prompt=yes - -if [ -n "$force_color_prompt" ]; then - if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then - # We have color support; assume it's compliant with Ecma-48 - # (ISO/IEC-6429). (Lack of such support is extremely rare, and such - # a case would tend to support setf rather than setaf.) - color_prompt=yes - else - color_prompt= - fi -fi - -prompt_symbol_0=💀 -prompt_symbol_1="☠️ " -prompt_symbol_2="👾" -prompt_symbol_3="🤖" -prompt_symbol_4="🎃" -prompt_symbol_5="🍃" -prompt_symbol_6="❄️ " -prompt_symbol_7="🌸" -prompt_symbol=$prompt_symbol_6 -if [ "$color_prompt" = yes ]; then - PS1='${debian_chroot:+($debian_chroot)}\[\033[01;36m\]$USER_NAME$prompt_symbol@\t:\[\033[01;33m\]\[\033[01;33m\]\w \[\033[00m' -else - PS1='${debian_chroot:+($debian_chroot)}$USER_NAME$prompt_symbol\d\t\h:\w\$ ' -fi -unset color_prompt force_color_prompt - -# If this is an xterm set the title to user@host:dir -case "$TERM" in - xterm*|rxvt*) - PS1="\[\e]0;${debian_chroot:+($debian_chroot)}\d\t@\h: \w\a\]$PS1" - ;; - *) - ;; -esac - -# enable color support of ls and also add handy aliases -if [ -x /usr/bin/dircolors ]; then - test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)" - alias ls='ls --color=auto' - #alias dir='dir --color=auto' - #alias vdir='vdir --color=auto' - - alias grep='grep --color=auto' - alias fgrep='fgrep --color=auto' - alias egrep='egrep --color=auto' -fi - - -# Add an "alert" alias for long running commands. Use like so: -# sleep 10; alert -alias alert='notify-send --urgency=low -i "$([ $? = 0 ] && echo terminal || echo error)" "$(history|tail -n1|sed -e '\''s/^\s*[0-9]\+\s*//;s/[;&|]\s*alert$//'\'')"' - -# enable programmable completion features (you don't need to enable -# this, if it's already enabled in /etc/bash.bashrc and /etc/profile -# sources /etc/bash.bashrc). -if ! shopt -oq posix; then - if [ -f /usr/share/bash-completion/bash_completion ]; then - . /usr/share/bash-completion/bash_completion - elif [ -f /etc/bash_completion ]; then - . /etc/bash_completion - fi -fi -___MY_VMOPTIONS_SHELL_FILE="${HOME}/.jetbrains.vmoptions.sh"; if [ -f "${___MY_VMOPTIONS_SHELL_FILE}" ]; then . "${___MY_VMOPTIONS_SHELL_FILE}"; fi - - - -alias l='ls -CF' -alias ll='ls -l' -alias la='ls -al' -alias vi='vim' -#alias rename='rename.ul' -alias python='python3' -alias p='python3' -alias q='ps|grep bash|grep -o [0-9]*|head -1|xargs kill -9' - -if [ "$REDEFINE_RM" = yes ]; then - source ~/MyConfig/commands/rm.sh -fi -source ~/MyConfig/commands/count.sh -source ~/MyConfig/commands/formality.sh -source ~/MyConfig/commands/self_alias.sh diff --git a/commands/count.sh b/commands/count.sh deleted file mode 100755 index 575c475..0000000 --- a/commands/count.sh +++ /dev/null @@ -1,21 +0,0 @@ -count(){ - case $1 in - '' ) - count=$(ls -l | grep "^" | wc -l) - let count-- - echo $count - ;; - '-f' ) - ls -l | grep ^- | wc -l - ;; - '-help' | '-h' ) - echo 'default: count number of all-type' - echo '-f : count number of files' - echo '-help : help' - echo '-h : help' - ;; - '*' ) - echo 'args error' - ;; - esac -} diff --git a/commands/formality.sh b/commands/formality.sh deleted file mode 100755 index 0f15cea..0000000 --- a/commands/formality.sh +++ /dev/null @@ -1,23 +0,0 @@ -formality(){ - case $1 in - '' | '-g' | '-gui' ) - cd ~/workspace/fm_accu_24/run - module load localeda - bsub -Is -n 4 -M 6000 ./main_run - ;; - '-shell' | '-s') - cd ~/workspace/fm_accu_24 - module load localeda - bsub -Is -n 4 -M 6000 ./main_run - ;; - '-help' | '-h' | '.*' ) - echo 'default: formality gui' - echo '-gui : formality gui' - echo '-g : formality gui' - echo '-shell : formality shell' - echo '-s : formality shell' - echo '-help : help' - echo '-h : help' - ;; - esac -} diff --git a/commands/self_alias.sh b/commands/self_alias.sh deleted file mode 100644 index ed01557..0000000 --- a/commands/self_alias.sh +++ /dev/null @@ -1,47 +0,0 @@ -alias lg='ll -a | grep' -mc() { - mkdir $1 - cd $1 -} - -alias ecc='cd $CI_ECCAD_HOME && source env.sh' -alias ecr='cd $CI_RELEASE_ECHOME && source env.sh' -alias v='vim' -alias ll='ls -lha' -alias ds='du -h --max-depth=1' -alias mr='cd ~/workspace/mirror/eccad && source env.sh' -alias ci='cd ~/workspace/master/eccad/scripts/ci' -alias pcci='pc ~/workspace/master/eccad/scripts/ci' -# Git -alias gb='git branch' -alias gs='git status' -alias gl='git log' -alias gd='git diff' -alias gp='git pull' -alias gm='git commit -m' -# ECCAD -setversion() { - export MAJOR=0 - export MINOR=1 - export COPYRIGHT="2023-2024" - export BUILD=$(curl -sS eccadapi/build/next-build | sed 's/"//g')_alpha - export PATCH=1 - echo "MAJOR=$MAJOR MINOR=$MINOR PATCH=$PATCH COPYRIGHT=$COPYRIGHT BUILD=$BUILD" -} -# Bash aliases -alias du='du -h --max-depth=1' -# Quick ssh -alias ops='ssh root@suzopsany01' -alias api='ssh root@api.eagle.local' -alias autops='ssh root@autops.eagle.local' -alias toolchain='ssh root@autops.eagle.local' -alias esq='ssh root@101.35.8.154' -alias cpid='ssh-copy-id' -alias apidb='ssh root@apidb.eagle.local' -alias oness='ssh root@suzones.eagle.local' -alias proxy='ssh root@suzproxy01.eagle.local' -alias apimonitor='ssh root@apimonitor.eagle.local' -alias portal='ssh root@portal.eagle.local' -alias datac='ssh root@datacenter.eagle.local' -alias apip='ssh root@47.116.120.231' -alias gtss="ssh 'ubuntu@git.marsway.red'" diff --git a/crb/dailyTask.crb b/crb/dailyTask.crb deleted file mode 100755 index 5104480..0000000 --- a/crb/dailyTask.crb +++ /dev/null @@ -1,6 +0,0 @@ -SHELL=/bin/bash -PATH=/sbin:/bin:/usr/sbin:/usr/bin -MAILTO=xhli - -0 0 * * * sh /home/xhli/.summerConfig/sh/dailyTask.sh - diff --git a/crb/test.crb b/crb/test.crb deleted file mode 100755 index 9af9db0..0000000 --- a/crb/test.crb +++ /dev/null @@ -1,5 +0,0 @@ -SHELL=/bin/bash -PATH=/sbin:/bin:/usr/sbin:/usr/bin -MAILTO=xhli - -* * * * * sh ~/.summerConfig/crb/test.sh diff --git a/crb/test.log b/crb/test.log deleted file mode 100755 index 54f21f6..0000000 --- a/crb/test.log +++ /dev/null @@ -1,2 +0,0 @@ -Fri Mar 3 09:57:01 CST 2023 -Fri Mar 3 09:58:01 CST 2023 diff --git a/crb/test.sh b/crb/test.sh deleted file mode 100755 index 44d2ba9..0000000 --- a/crb/test.sh +++ /dev/null @@ -1 +0,0 @@ -date >> ~/.summerConfig/crb/test.log diff --git a/install/crontab/crb b/install/crontab/crb deleted file mode 100755 index d09e7a4..0000000 --- a/install/crontab/crb +++ /dev/null @@ -1,4 +0,0 @@ -SHELL=/bin/bash -PATH=/sbin:/bin:/usr/sbin:/usr/bin - -0 1 * * * bash /Users/$USER/.vvconfig/scripts/backup_forgejo.sh diff --git a/install/crontab/cronitor b/install/crontab/cronitor deleted file mode 100755 index 621acb7..0000000 Binary files a/install/crontab/cronitor and /dev/null differ diff --git a/install/crontab/mackup b/install/crontab/mackup deleted file mode 100644 index f0b2b13..0000000 --- a/install/crontab/mackup +++ /dev/null @@ -1 +0,0 @@ -40 15 * * * "mackup backup" diff --git a/setting b/setting deleted file mode 100755 index d872449..0000000 --- a/setting +++ /dev/null @@ -1,23 +0,0 @@ -# choose shell, bash or zsh -USER_SHELL='zsh' - -# user name -USER_NAME='Marsway' - -# -# auto cd, switch directory just by typing its name -# [dirName] instead of [cd dirName] -AUTO_CD='yes' - -# -# chose prompt 'oneline' or 'twoline' -PROMPT_ALTERNATIVE='twoline' - -# -# auto open directory-tree or not -# you can use [SPACE]+e to open directory-tree -AUTO_OPEN_DIRECTORY_TREE='yes' - -# -# auto format using google style when .h/.cc saved -AUTO_FORMAT='yes' diff --git a/sh/dailyTask.sh b/sh/dailyTask.sh deleted file mode 100755 index 5a65c6b..0000000 --- a/sh/dailyTask.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/zsh - -exec >> /home/xhli/.summerLog/dailyTask.log 2>&1 - -echo "===================================================================" -date -echo "= =" -echo "===================================================================" -echo "======== processing eccad =========================================" -cd /home/xhli/workspace/eccad -eccad_update -ctags -R -echo "======== processing decompose =====================================" -cd /home/xhli/workspace/decompose -git pull -ctags -R -echo "======== processing eccad_map ====================================" -cd /home/xhli/workspace/eccad/src/comps/map -git pull -echo "======== processing detail_swb ====================================" -cd /home/xhli/workspace/detail_swb -git pull -ctags -R -echo "======== processing abc_integrated ================================" -cd /home/xhli/workspace/abc_integrated -git pull -ctags -R -echo "======= processing shares =========================================" -chmod 755 /home/xhli/Summer/* -R -echo "===================================================================" -echo "= =" -echo "===================================================================" -echo "" diff --git a/tags b/tags deleted file mode 100755 index 9bb474c..0000000 --- a/tags +++ /dev/null @@ -1,1906 +0,0 @@ -!_TAG_FILE_FORMAT 2 /extended format; --format=1 will not append ;" to lines/ -!_TAG_FILE_SORTED 1 /0=unsorted, 1=sorted, 2=foldcase/ -!_TAG_PROGRAM_AUTHOR Darren Hiebert /dhiebert@users.sourceforge.net/ -!_TAG_PROGRAM_NAME Exuberant Ctags // -!_TAG_PROGRAM_URL http://ctags.sourceforge.net /official site/ -!_TAG_PROGRAM_VERSION 5.8 // -(function() return 0 end)()] vimplugin/rainbow-master/tests/test.lua /^ (function() return 0 end)()] = 1$/;" f -(section, vimplugin/vim-airline-master/autoload/airline/themes.vim /^ map(section, (_, v) => type(v) != type('') ? string(v) : v)$/;" m - vimconfig/setting.vim /^noremap :call ToggleComment()$/;" m - vimconfig/setting.vim /^noremap :call SummerSplit()$/;" m -[ vimconfig/setting.vim /^noremap [ :tabprevious$/;" m -] vimconfig/setting.vim /^noremap ] :tabnext$/;" m -q vimconfig/setting.vim /^noremap q :qa$/;" m -s vimconfig/setting.vim /^noremap s :wa$/;" m -ToggleBackground vimcolor/solarized-master/vim-colors-solarized/autoload/togglebg.vim /^inoremap