From 1f9a0bfbd5949bfc88f164918320de281995b903 Mon Sep 17 00:00:00 2001
From: Kevin Mok <kevin.mok@live.ca>
Date: Mon, 28 Jan 2019 23:06:42 -0500
Subject: [PATCH] Combined sync-shortcuts with sync-aliases

Also combined with Luke's sync-shortcuts.
---
 .gitignore                  |  2 +-
 aliases/key_aliases         |  3 +-
 aliases/zsh_aliases         |  2 +-
 configs/ranger/rc.conf      |  3 +-
 dotfiles/.Xresources        | 12 ++++++
 dotfiles/.bashrc            |  2 +-
 dotfiles/.vimrc             |  2 +-
 dotfiles/.xinitrc           |  2 +-
 dotfiles/.zshrc             |  2 +-
 scripts/sync-aliases        | 24 ++----------
 scripts/sync-shortcuts      | 75 +++++++++++++++++++++++++++----------
 txt/exclude-dirs-backup.txt |  2 +
 txt/key_dirs.txt            |  1 +
 txt/key_files.txt           |  1 +
 txt/nzxt-pkgs.txt           |  3 ++
 15 files changed, 85 insertions(+), 51 deletions(-)

diff --git a/.gitignore b/.gitignore
index ccb2a5c..c8051a1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,4 +10,4 @@ temp.sh
 bookmarks
 history
 tagged
-shortcuts.conf
+key_mappings.conf
diff --git a/aliases/key_aliases b/aliases/key_aliases
index 6ee068a..99f78cb 100644
--- a/aliases/key_aliases
+++ b/aliases/key_aliases
@@ -52,7 +52,7 @@ rsy "rsync -Pr"
 # list all (un)mounted drives
 lhd "sudo fdisk -l"
 # get disc space for mounted drives
-ds "df -h | grep sd"
+ds "df -h | tee >(head -n 1) >(grep sd) >/dev/null"
 chownw "sudo chown -R kevin:wheel"
 chwnm "sudo chown -R kevin:wheel /run/media/kevin"
 # cd into backup folder and show backup sizes
@@ -70,7 +70,6 @@ x "xmodmap ~/.Xmodmap && xset r rate 200 60"
 
 #  }}} power options # 
 
-
 # sound
 vlm "alsamixer -c 0"
 vlh "alsamixer -c 2"
diff --git a/aliases/zsh_aliases b/aliases/zsh_aliases
index 0cc5ea3..c6d19a5 100644
--- a/aliases/zsh_aliases
+++ b/aliases/zsh_aliases
@@ -91,7 +91,7 @@ alias "f.."="f ..."
 
 function mvd() { mv $1 ~/Downloads ; }
 alias lhd="sudo fdisk -l"
-alias ds="df -h | grep sd"
+alias ds="df -h | tee >(head -n 1) >(grep sd) >/dev/null"
 alias chownw="sudo chown -R kevin:wheel"
 alias chwnm="sudo chown -R kevin:wheel /run/media/kevin"
 alias nbu="f /run/media/kevin/pc-backup/backups/nzxt && ll | grep gz"
diff --git a/configs/ranger/rc.conf b/configs/ranger/rc.conf
index 27607f0..4476ddb 100644
--- a/configs/ranger/rc.conf
+++ b/configs/ranger/rc.conf
@@ -632,8 +632,6 @@ tmap <ESC> taskview_close
 copytmap <ESC> q Q w <C-c>
 #  }}}  # 
 
-source /home/kevin/.config/ranger/shortcuts.conf
-
 #  image preview {{{ # 
 
 # Use one of the supported image preview protocols
@@ -690,3 +688,4 @@ map zr shell unzip %f && rm %f
 map v. shell $EDITOR %f
 
 # map gr fzf_select
+source /home/kevin/.config/ranger/key_mappings.conf
diff --git a/dotfiles/.Xresources b/dotfiles/.Xresources
index 1272837..aa933fc 100644
--- a/dotfiles/.Xresources
+++ b/dotfiles/.Xresources
@@ -25,3 +25,15 @@ URxvt.perl-ext-common: default,matcher
 URxvt.url-launcher: /usr/bin/xdg-open
 URxvt.matcher.button: 1
 ! }}} Clickable URLs */
+
+/* HiDPI {{{ */
+
+Xft.dpi: 101
+Xft.autohint: 0
+Xft.lcdfilter:  lcddefault
+Xft.hintstyle:  hintfull
+Xft.hinting: 1
+Xft.antialias: 1
+Xft.rgba: rgb
+
+/* }}} HiDPI */
diff --git a/dotfiles/.bashrc b/dotfiles/.bashrc
index 51f1b22..8ed6c5b 100644
--- a/dotfiles/.bashrc
+++ b/dotfiles/.bashrc
@@ -206,4 +206,4 @@ fi
 # Both PC/Laptop }}}
 
 [ -f ~/.fzf.bash ] && source ~/.fzf.bash
-source /home/kevin/.aliases
+source /home/kevin/.key_aliases
diff --git a/dotfiles/.vimrc b/dotfiles/.vimrc
index 885ba26..f90b352 100644
--- a/dotfiles/.vimrc
+++ b/dotfiles/.vimrc
@@ -43,7 +43,7 @@ autocmd BufRead commit-msg.txt set filetype=gitcommit tw=72
 autocmd BufNewFile,BufRead *.md set filetype=markdown
 autocmd Filetype markdown set textwidth=0
 
-autocmd BufWritePost key_*.txt !sync-shortcuts
+autocmd BufWritePost key_* !sync-shortcuts
 autocmd VimLeave *.tex !tex-clean %
 
 " " auto-reload vimrc {{{ "
diff --git a/dotfiles/.xinitrc b/dotfiles/.xinitrc
index 0856852..0d8c6b4 100644
--- a/dotfiles/.xinitrc
+++ b/dotfiles/.xinitrc
@@ -1,5 +1,5 @@
 numlockx
 xrandr --setprovideroutputsource modesetting NVIDIA-0
 [[ -f ~/.Xresources ]] && xrdb -merge ~/.Xresources
-xrandr --auto
+# xrandr --auto
 exec i3
diff --git a/dotfiles/.zshrc b/dotfiles/.zshrc
index 60898e7..cf52fd0 100644
--- a/dotfiles/.zshrc
+++ b/dotfiles/.zshrc
@@ -172,4 +172,4 @@ source /home/kevin/coding/spotify-lib-vis/src/api-keys.sh
 
 export GPG_TTY=$(tty)
 export PASSWORD_STORE_CLIP_TIME=120
-source /home/kevin/.aliases
+source /home/kevin/.key_aliases
diff --git a/scripts/sync-aliases b/scripts/sync-aliases
index 136b58f..c451da7 100755
--- a/scripts/sync-aliases
+++ b/scripts/sync-aliases
@@ -1,30 +1,23 @@
 #!/bin/bash
 
-# key_aliases="$HOME/Downloads/sync-aliases/key_aliases"
 key_aliases="$HOME/linux-config/aliases/key_aliases"
-# tmp_aliases="/tmp/sync-aliases.tmp"
-
-# create temp file with no comments/blank lines
-# sed -e '/^$/d' -e '/^[ \t#].*/d' "$key_aliases" | sort > "$tmp_aliases"
 
 # Ensure text of argument 1 exists in the file argument 2
-ensure() {
+ensure() {{{
 	if [[ ! -e "$2" ]]; then
 		touch "$2"
 	fi
 	(grep "$1" "$2")>/dev/null 2>&1 || echo "$1" >> "$2"
-}
+}}}
 
 # fish
 fish_config="$HOME/.config/fish/config.fish"
-# fish_abbr="$HOME/Downloads/sync-aliases/key_aliases.fish"
 fish_abbr="$HOME/.config/fish/key_aliases.fish"
 ensure "source $fish_abbr" "$fish_config"
 
-# bash
+# bash/zsh
 bashrc="$HOME/.bashrc"
 zshrc="$HOME/.zshrc"
-# fish_abbr="$HOME/Downloads/sync-aliases/key_aliases.fish"
 aliases="$HOME/.aliases"
 ensure "source $aliases" "$bashrc"
 ensure "source $aliases" "$zshrc"
@@ -33,9 +26,6 @@ ensure "source $aliases" "$zshrc"
 printf "# vim: filetype=sh\\n" > "$fish_abbr"
 printf "# vim: filetype=sh\\n" > "$aliases"
 
-# # sed -e 's/\([a-z0-9]\+\) \(".\+"\)$/abbr \1 \2/g' "$tmp_aliases"
-# # awk '{printf "abbr " $1; $1 = ""; print $0; }' "$tmp_aliases"
-# awk '{printf "abbr " $1; $1 = ""; print $0; }' "$tmp_aliases" > "$fish_abbr"
 sed -e '/^$/d' -e '/^[ \t#].*/d' "$key_aliases" | sort | tee \
 	>(awk '{printf "abbr " $1; $1 = ""; print $0; }' >> "$fish_abbr") \
 	| awk '{
@@ -44,11 +34,3 @@ sed -e '/^$/d' -e '/^[ \t#].*/d' "$key_aliases" | sort | tee \
 		printf "=";
 		print gensub(" ", "", 1, $0);
 	}' >> "$aliases"
-
-# # sed -e 's/^\([a-z]\+\) \(".\+"\)$/alias \1=\2/g' "$tmp_aliases"
-# awk '{
-	# printf "alias " $1;
-	# $1 = "";
-	# printf "=";
-	# print gensub(" ", "", 1, $0);
-# }' "$tmp_aliases" > "$bash_aliases"
diff --git a/scripts/sync-shortcuts b/scripts/sync-shortcuts
index e3d9771..6304889 100755
--- a/scripts/sync-shortcuts
+++ b/scripts/sync-shortcuts
@@ -1,30 +1,65 @@
 #!/bin/bash
 
-# Shell rc file (i.e. bash vs. zsh, etc.)
-shellrc="$HOME/.zshrc"
+# ensure {{{ #
 
-# Config locations
-folders="$HOME/linux-config/txt/key_dirs.txt"
-configs="$HOME/linux-config/txt/key_files.txt"
+# Ensure text of argument 1 exists in the file argument 2
+ensure() {
+	if [[ ! -e "$2" ]]; then
+		touch "$2"
+	fi
+	(grep "$1" "$2")>/dev/null 2>&1 || echo "$1" >> "$2"
+}
+
+# }}} ensure #
+
+# config files
+bashrc="$HOME/.bashrc"
+zshrc="$HOME/.zshrc"
+fish_config="$HOME/.config/fish/config.fish"
+ranger_config="$HOME/.config/ranger/rc.conf"
 
 # Output locations
-shell_shortcuts="$HOME/.shortcuts"
-ranger_shortcuts="$HOME/.config/ranger/shortcuts.conf"
+aliases="$HOME/.key_aliases"
+fish_abbr="$HOME/.config/fish/key_abbr.fish"
+ranger_mappings="$HOME/.config/ranger/key_mappings.conf"
 
-# Remove
-rm -f "$ranger_shortcuts" 2>/dev/null
-echo "alias \\" > "$shell_shortcuts"
+# ensure sourcing new file in orig. config file
+ensure "source $aliases" "$bashrc"
+ensure "source $aliases" "$zshrc"
+ensure "source $fish_abbr" "$fish_config"
+ensure "source $ranger_mappings" "$ranger_config"
 
-# Ensure text of argument 1 exists in the file argument 2
-ensure() { (grep "$1" "$2")>/dev/null 2>&1 || echo "$1" >> "$2" ;}
+# key files
+key_dirs="$HOME/linux-config/txt/key_dirs.txt"
+key_files="$HOME/linux-config/txt/key_files.txt"
+key_aliases="$HOME/linux-config/aliases/key_aliases"
+
+# Remove, prepare files
+rm -f "$ranger_mappings" 2>/dev/null
+printf "# vim: filetype=sh\\n" > "$fish_abbr"
+printf "# vim: filetype=sh\\nalias " > "$aliases"
 
-ensure "source $shell_shortcuts" "$shellrc"
-ensure "source $HOME/.config/ranger/shortcuts.conf" "$HOME/.config/ranger/rc.conf"
+# Format the key file in the correct syntax and sent it to all configs.
+sed "s/\s*#.*$//;/^\s*$/d" "$key_dirs" | tee \
+	>(awk '{print $1"=\"cd "$2" && ls -a\" \\"}' >> "$aliases") \
+	>(awk '{print "abbr", $1, "\"cd " $2 "; and ls -a\""}' >> "$fish_abbr") \
+	| awk '{print "map f"$1, "cd", $2;
+		print "map t"$1, "tab_new", $2;
+		print "map m"$1, "shell mv -v", $2;
+		print "map Y"$1, "shell cp -rv", $2;
+	}' >> "$ranger_mappings"
 
-# Format the `folders` file in the correct syntax and sent it to all three configs.
-sed "s/#.*$//;/^$/d" "$folders" | tee >(awk '{print $1"=\"f "$2"\" \\"}' >> "$shell_shortcuts") \
-	| awk '{print "map f"$1" cd "$2"\nmap t"$1" tab_new "$2"\nmap m"$1" shell mv -v %s "$2"\nmap Y"$1" shell cp -rv %s "$2}' >> "$ranger_shortcuts"
+sed "s/\s*#.*$//;/^\s*$/d"  "$key_files" | tee \
+	>(awk '{print v$1"=\"$EDITOR "$2"\" \\"}' >> "$aliases") \
+	>(awk '{print "abbr v"$1, "\"$EDITOR "$2"\""}' >> "$fish_abbr") \
+	| awk '{print "map v"$1" shell $EDITOR "$2}' >> "$ranger_mappings"
 
-# Format the `configs` file in the correct syntax and sent it to both configs.
-sed "s/#.*$//;/^$/d"  "$configs" | tee >(awk '{print "v"$1"=\"$EDITOR "$2"\" \\"}' >> "$shell_shortcuts") \
-	| awk '{print "map v"$1" shell $EDITOR "$2}' >> "$ranger_shortcuts"
+sed -e '/^$/d' -e '/^[ \t#].*/d' "$key_aliases" | sort | tee \
+	>(awk '{printf "abbr " $1; $1 = ""; print $0; }' >> "$fish_abbr") \
+	| awk '{
+		printf $1;
+		$1 = "";
+		printf "=";
+		printf gensub(" ", "", 1, $0);
+		print " \\";
+	}' >> "$aliases"
diff --git a/txt/exclude-dirs-backup.txt b/txt/exclude-dirs-backup.txt
index a864184..fe86d73 100644
--- a/txt/exclude-dirs-backup.txt
+++ b/txt/exclude-dirs-backup.txt
@@ -1,7 +1,9 @@
 /home/kevin/.cache
 /home/kevin/.local/share/Steam
+/home/kevin/VirtualBox VMs
 /lost+found
 /mnt
 /proc
 /run
 /sys
+/var/lib/systemd/coredump
diff --git a/txt/key_dirs.txt b/txt/key_dirs.txt
index c1d7924..811addd 100644
--- a/txt/key_dirs.txt
+++ b/txt/key_dirs.txt
@@ -5,6 +5,7 @@ cf /home/kevin/.config
 lc /home/kevin/linux-config/
 d  /home/kevin/Downloads
 D  /home/kevin/Documents
+fi /home/kevin/.config/fish
 k /home/kevin/
 lc /home/kevin/linux-config/
 me /run/media/kevin
diff --git a/txt/key_files.txt b/txt/key_files.txt
index a0c229c..e49acec 100644
--- a/txt/key_files.txt
+++ b/txt/key_files.txt
@@ -1,6 +1,7 @@
 # sys {{{ *
 
 3 /home/kevin/.config/i3/config
+a /home/kevin/linux-config/aliases/key_aliases
 d /home/kevin/linux-config/txt/key_dirs.txt
 f /home/kevin/linux-config/txt/key_files.txt
 i /home/kevin/.config/i3blocks/i3blocks.conf
diff --git a/txt/nzxt-pkgs.txt b/txt/nzxt-pkgs.txt
index 9a9b95d..9c8eeaa 100644
--- a/txt/nzxt-pkgs.txt
+++ b/txt/nzxt-pkgs.txt
@@ -71,6 +71,7 @@ linux-headers
 logrotate
 lolcat
 lsof
+lua-cjson
 lutris
 lvm2
 lxappearance
@@ -167,6 +168,8 @@ vi
 virtualbox
 vlc
 w3m
+watson
+weechat-vimode-git
 wego
 which
 wine