From a1b3fd43f995d812ad412c434d6fde12b4a9f4ca Mon Sep 17 00:00:00 2001
From: Kevin Mok <kevin.mok@live.ca>
Date: Sun, 11 Aug 2019 02:05:51 -0400
Subject: [PATCH] Resize font (URxvt)

Apply changes without resetting pywal colors.

Other:
- open current bg in ranger
- update Watson fish completion
- update NZXT packages
---
 aliases/key_aliases.tmpl                      | 88 ++++++++++++++-----
 dot_Xresources.tmpl                           | 34 +++----
 dot_config/fish/completions/watson.fish       | 34 ++++++-
 dot_config/fish/config.fish.tmpl              |  2 +-
 dot_config/fish/functions/cd.fish.tmpl        |  2 +-
 dot_config/fish/functions/refresh-config.fish |  2 +-
 dot_config/i3/config.tmpl                     | 10 ++-
 dot_config/i3blocks/scripts/executable_volume |  3 +-
 dot_config/ranger/commands.py                 |  4 +-
 dot_config/ranger/rc.conf.tmpl                |  2 +-
 dot_gitconfig                                 |  1 +
 dot_vimrc.tmpl                                | 16 ++--
 txt/nzxt-aur.txt                              | 23 +++--
 txt/nzxt-pkgs.txt                             | 46 +++++++++-
 14 files changed, 200 insertions(+), 67 deletions(-)
 mode change 100755 => 100644 dot_config/fish/completions/watson.fish

diff --git a/aliases/key_aliases.tmpl b/aliases/key_aliases.tmpl
index 1123325..63c5e2b 100644
--- a/aliases/key_aliases.tmpl
+++ b/aliases/key_aliases.tmpl
@@ -1,21 +1,31 @@
 # vim: fdm=marker ft=go-template.sh syntax=sh
 
 #  system [[[
+
+# basic [[[ #
+
 # clear screen
 c "printf '\033c'"
+dc "cd ~/Downloads && printf '\033c'"
 hst "history"
 ## nf "printf '\033c' && neofetch | lolcat"
 nf "printf '\033c' && neofetch"
 fi "fish"
 # reload urxvt
-ru "xrdb ~/.Xresources"
+ru "xrdb ~/.Xresources && grep wallpaper ~/.cache/wal/colors.sh | cut -d\' -f2 | xargs wal -i > /dev/null"
+
+dua "sudo du -h --apparent-size | sort -h"
 # list file sizes in megabytes with depth 1
-duh "sudo du -d 1 -h --apparent-size | sort -hr"
-dum "sudo du -d 1 -m --apparent-size | sort -hr"
+duh "sudo du -d 1 -h --apparent-size | sort -h"
+dum "sudo du -d 1 -m --apparent-size | sort -h"
 m "man"
 tld "tldr"
 
-nvt "nvidia-settings --assign CurrentMetaMode='DVI-I-1: nvidia-auto-select +0+0 {ForceCompositionPipeline=On}, HDMI-0: nvidia-auto-select +3840+0 {ForceCompositionPipeline=On}'"
+# ]]] basic #
+
+# display [[[ #
+
+# nvt "nvidia-settings --assign CurrentMetaMode='DVI-I-1: nvidia-auto-select +0+0 {ForceCompositionPipeline=On}, HDMI-0: nvidia-auto-select +3840+0 {ForceCompositionPipeline=On}'"
 {{ if eq .chezmoi.fullHostname "x1-carbon" }}
 xr "xrandr"
 xro "xrandr --output HDMI2 --off" 
@@ -24,6 +34,8 @@ xrm "xrandr --output HDMI2 --auto --same-as eDP1 --scale 1.33x1.33"
 xrs "xrandr -s 0"
 {{ end }}
 
+# ]]] display #
+
 vgb "sudo nvim /etc/default/grub"
 mkgb "sudo grub-mkconfig -o /boot/grub/grub.cfg"
 
@@ -73,10 +85,9 @@ vdr "vidir --verbose"
 # directory-related [[[ #
 
 {{ if not (eq .linux_os "termux") }}
-# l "lsd --group-dirs first"
-l "lsd"
-la "lsd -A --group-dirs first"
-ll "lsd -Al --group-dirs first --size short"
+l "lsd -F --group-dirs first"
+la "lsd -AF --group-dirs first"
+ll "lsd -AlF --group-dirs first --size short"
 {{ else }}
 l "ls"
 la "ls -a"
@@ -125,7 +136,8 @@ bt "~/linux-config/dot_config/i3blocks/scripts/executable_battery"
 
 # ]]] power options  # 
 
-# sound
+# sound [[[ #
+
 {{ if eq .chezmoi.fullHostname "nzxt" }}
 vlm "alsamixer -c 0"
 vlh "alsamixer -c 2"
@@ -133,6 +145,8 @@ vlh "alsamixer -c 2"
 vlm "alsamixer -c 1"
 {{ end }}
 
+# ]]] sound #
+
 # pkg management [[[ #
 
 {{ if eq .linux_os "arch" }}#[[[
@@ -191,21 +205,28 @@ xpk "pkg list-installed | awk -F/ '{print \$1}' > ~/{{ .chezmoi.os }}-config/txt
 
 # ]]] pkg management #
 
+# python [[[ #
+
 py "python"
 # pyt "printf '\033c' && pytest -vvs"
 pyt "clear && tmux clear-history && pytest -vvs"
 pyts "clear && tmux clear-history && pytest -vv"
 pyu "python -m unittest"
-pipi "pip install"
+pipi "pip install --user"
 spipi "sudo pip install"
 
-# internet
+# ]]] python #
+
+# internet [[[ #
+
 pg "ping -c 2 -W 1 8.8.8.8"
 pgc "ping 8.8.8.8"
 dh "sudo dhcpcd"
 kdh "sudo killall dhcpcd"
 rdh "sudo killall dhcpcd && sudo dhcpcd"
 
+# ]]] internet #
+
 id "identify"
 # rz "source ~/{{ .chezmoi.os }}-config/aliases/zsh_aliases"
 
@@ -222,6 +243,7 @@ chr "google-chrome"
 clc "cloc ."
 cv "cava"
 dg "dragon-drag-and-drop -x"
+ffx "firefox"
 fh "feh"
 fi "fish"
 gpd "gpg --decrypt"
@@ -239,25 +261,30 @@ mp "mpv --volume=50"
 mra "man ranger"
 # mt "minetest"
 n "nvim"
+ndu "ncdu"
 p3 "python3"
 pdft "pdftotext"
 pipes "pipes.sh -t 3"
 py "python"
+qc "qalc ''"
+qcg "qalculate-gtk"
 r "ranger"
+rbg "ranger --selectfile (grep wallpaper ~/.cache/wal/colors.sh | cut -d\' -f2)"
 # rgc "printf '\033c' && rg"
 # rgc "printf '\033c' && rg"
 rgc "clear && tmux clear-history && rg"
 rx "redshift -x"
 sn "sudo nvim"
 # sw "swex"
-t "tmux"
+t "tmux"#[[[
 ta "tmux a -t"
 tal "tmux a"
+tk "tmux kill-server"
 tl "tmux ls"
 tn "tmux new -s"
+#]]]
 vmd "vimdiff"
 wg "wego"
-wp "grep wallpaper ~/.cache/wal/colors.sh"
 ytd "youtube-dl"
 z "zathura --fork"
 
@@ -283,24 +310,41 @@ yu "echo 'kevin.mok@mail.utoronto.ca' | xclip -selection clipboard"
 # watson [[[ #
 
 w "watson"
+
+# start [[[ #
+
 wa "watson start"
 wae "watson start && watson edit"
+wad "watson add -f '' -t ''"
+
 we "watson edit"
-wl "watson log --day"
-wla "watson log --all --tag="
-ww "watson log"
-# wlm "watson log --project coding --tag mfs"
-wr "watson report --day"
-wra "watson report --all --tag="
-wrw "watson report"
 wre "watson restart"
 wree "watson restart && watson edit"
+
+# ]]] start #
+
+# stop [[[ #
+
 ws "watson status && watson stop"
 wse "watson stop && watson edit"
 wsc "watson cancel"
 wsl "watson stop && watson log --day"
 wt "watson status"
 
+# ]]] stop #
+
+# log/report [[[ #
+
+wl "watson log --day"
+wla "watson log --all --tag="
+ww "watson log"
+# wlm "watson log --project coding --tag mfs"
+wr "watson report --day"
+wra "watson report --all --tag="
+wrw "watson report"
+
+# ]]] log/report #
+
 # ]]] watson #
 
 # ]]] applications  #
@@ -562,8 +606,8 @@ mst "minetestserver --gameid minimal --worldname Test --terminal"
 # basic
 # wlf "watson log --all --tag=final"
 # wrf "watson report --all --tag=final"
-ssc "ssh mokkar@teach.cs.utoronto.ca"
-ssp "ssh -p 8022 192.168.0.11"
+ssc "mosh mokkar@teach.cs.utoronto.ca"
+ssp "mosh --ssh='ssh -p 8022' 192.168.0.11"
 
 # alg course
 jc "javac -d out *.java"
diff --git a/dot_Xresources.tmpl b/dot_Xresources.tmpl
index 03d3a5e..362b5a3 100644
--- a/dot_Xresources.tmpl
+++ b/dot_Xresources.tmpl
@@ -4,11 +4,21 @@
 URxvt.font: xft:DejaVuSansMono Nerd Font Mono:size=11
 ! URxvt.font: xft:DejaVuSansMono Nerd Font Mono:size=12
 {{ else }}
-! URxvt.font: xft:DejaVuSansMono Nerd Font Mono:size=14
-URxvt.font: xft:DejaVuSansMono Nerd Font Mono:size=13.5
+URxvt.font: xft:DejaVuSansMono Nerd Font Mono:size=14
+! URxvt.font: xft:DejaVuSansMono Nerd Font Mono:size=13.5
 {{ end }}
 ! URxvt.font: xft:Hack:size=18
 
+/* resize [[[ */
+
+URxvt.resize-font.step: 4
+URxvt.keysym.C-Down:     resize-font:smaller
+URxvt.keysym.C-Up:      resize-font:bigger
+URxvt.keysym.C-equal:     resize-font:reset
+URxvt.keysym.C-question:  resize-font:show
+
+/* ]]] resize */
+
 /* ]]] font */
 
 /* transparency [[[ */
@@ -34,26 +44,10 @@ URxvt.scrollBar: false
 
 /* Clickable URLs [[[ */
 
-URxvt.perl-ext-common: default,matcher
+URxvt.perl-ext-common: default,matcher,resize-font
 URxvt.url-launcher: /usr/bin/xdg-open
 URxvt.matcher.button: 1
 
 /* ]]] Clickable URLs */
 
-/* HiDPI  [[[ */
-
-{{ if eq .chezmoi.fullHostname "x1-carbon" }}
-Xft.dpi: 210
-{{ else }}
-Xft.dpi: 101
-{{ end }}
-Xft.autohint: 0
-Xft.lcdfilter:  lcddefault
-Xft.hintstyle:  hintfull
-Xft.hinting: 1
-Xft.antialias: 1
-Xft.rgba: rgb
-
-/* ]]] HiDPI  */
-
-# vim: fdm=marker ft=xdefaults.go-template
+! vim: fdm=marker ft=xdefaults.go-template
diff --git a/dot_config/fish/completions/watson.fish b/dot_config/fish/completions/watson.fish
old mode 100755
new mode 100644
index 9dcf1ce..f9200f7
--- a/dot_config/fish/completions/watson.fish
+++ b/dot_config/fish/completions/watson.fish
@@ -129,12 +129,33 @@ end
 
 # ungrouped
 complete -f -c watson -n '__fish_watson_needs_sub' -a cancel -d "Cancel the last start command"
-complete -f -c watson -n '__fish_watson_needs_sub' -a stop -d " Stop monitoring time for the current project"
 complete -f -c watson -n '__fish_watson_needs_sub' -a frames -d "Display the list of all frame IDs"
 complete -f -c watson -n '__fish_watson_needs_sub' -a help -d "Display help information"
 complete -f -c watson -n '__fish_watson_needs_sub' -a projects -d "Display the list of projects"
-complete -f -c watson -n '__fish_watson_needs_sub' -a tags -d "Display the list of tags"
 complete -f -c watson -n '__fish_watson_needs_sub' -a sync -d "sync your work with $url"
+complete -f -c watson -n '__fish_watson_needs_sub' -a tags -d "Display the list of tags"
+
+# add
+complete -f -c watson -n '__fish_watson_needs_sub' -a add -d "Add time for project with tag(s) that was not tracked live"
+complete -f -c watson -n '__fish_watson_using_command add' -s f -l from -d "Start date for add"
+complete -f -c watson -n '__fish_watson_has_from add' -s t -l to -d "end date for add"
+complete -f -c watson -n '__fish_watson_using_command add' -s c -l confirm-new-project -d "Confirm addition of new project"
+complete -f -c watson -n '__fish_watson_using_command add' -s b -l confirm-new-tag -d "Confirm addition of new tag"
+complete -f -c watson -n '__fish_watson_needs_project add' -a "(__fish_watson_get_projects)"
+complete -f -c watson -n '__fish_watson_has_project add' -a "+(__fish_watson_get_tags)"
+
+# aggregate
+complete -f -c watson -n '__fish_watson_needs_sub' -a aggregate -d "Display a report of the time spent on each project aggregated by day"
+complete -f -c watson -n '__fish_watson_using_command aggregate' -s c -l current -d "include the running frame"
+complete -f -c watson -n '__fish_watson_using_command aggregate' -s C -l no-current -d "exclude the running frame (default)"
+complete -f -c watson -n '__fish_watson_using_command aggregate' -s f -l from -d "Start date for aggregate"
+complete -f -c watson -n '__fish_watson_has_from aggregate' -s t -l to -d "end date for aggregate"
+complete -f -c watson -n '__fish_watson_using_command aggregate' -s p -l project -d "restrict to project" -a "(__fish_watson_get_projects)"
+complete -f -c watson -n '__fish_watson_using_command aggregate' -s T -l tag -d "restrict to tag" -a "(__fish_watson_get_tags)"
+complete -f -c watson -n '__fish_watson_using_command aggregate' -s j -l json -d "output json"
+complete -f -c watson -n '__fish_watson_using_command aggregate' -s s -l csv -d "output csv"
+complete -f -c watson -n '__fish_watson_using_command aggregate' -s g -l pager -d "view through pager"
+complete -f -c watson -n '__fish_watson_using_command aggregate' -s G -l no-pager -d "don't vew through pager"
 
 # config
 complete -f -c watson -n '__fish_watson_needs_sub' -a config -d "Get and set configuration options"
@@ -152,12 +173,14 @@ complete -f -c watson -n '__fish_watson_using_command log' -s f -l from -d "Star
 complete -f -c watson -n '__fish_watson_has_from log' -s t -l to -d "end date for log"
 complete -f -c watson -n '__fish_watson_using_command log' -s y -l year -d "show the last year"
 complete -f -c watson -n '__fish_watson_using_command log' -s m -l month -d "show the last month"
+complete -f -c watson -n '__fish_watson_using_command log' -s l -l luna -d "show the last lunar cycle"
 complete -f -c watson -n '__fish_watson_using_command log' -s w -l week -d "show week-to-day"
 complete -f -c watson -n '__fish_watson_using_command log' -s d -l day -d "show today"
 complete -f -c watson -n '__fish_watson_using_command log' -s a -l all -d "show all"
 complete -f -c watson -n '__fish_watson_using_command log' -s p -l project -d "restrict to project" -a "(__fish_watson_get_projects)"
 complete -f -c watson -n '__fish_watson_using_command log' -s T -l tag -d "restrict to tag" -a "(__fish_watson_get_tags)"
 complete -f -c watson -n '__fish_watson_using_command log' -s j -l json -d "output json"
+complete -f -c watson -n '__fish_watson_using_command log' -s s -l csv -d "output csv"
 complete -f -c watson -n '__fish_watson_using_command log' -s g -l pager -d "view through pager"
 complete -f -c watson -n '__fish_watson_using_command log' -s G -l no-pager -d "don't vew through pager"
 
@@ -182,15 +205,18 @@ complete -f -c watson -n '__fish_watson_using_command report' -s f -l from -d "S
 complete -f -c watson -n '__fish_watson_has_from report' -s t -l to -d "end date for report"
 complete -f -c watson -n '__fish_watson_using_command report' -s y -l year -d "show the last year"
 complete -f -c watson -n '__fish_watson_using_command report' -s m -l month -d "show the last month"
+complete -f -c watson -n '__fish_watson_using_command report' -s l -l luna -d "show the last lunar cycle"
 complete -f -c watson -n '__fish_watson_using_command report' -s w -l week -d "show week-to-day"
 complete -f -c watson -n '__fish_watson_using_command report' -s d -l day -d "show today"
 complete -f -c watson -n '__fish_watson_using_command report' -s a -l all -d "show all"
 complete -f -c watson -n '__fish_watson_using_command report' -s p -l project -d "restrict to project" -a "(__fish_watson_get_projects)"
 complete -f -c watson -n '__fish_watson_using_command report' -s T -l tag -d "restrict to tag" -a "(__fish_watson_get_tags)"
 complete -f -c watson -n '__fish_watson_using_command report' -s j -l json -d "output json"
+complete -f -c watson -n '__fish_watson_using_command report' -s s -l csv -d "output csv"
 complete -f -c watson -n '__fish_watson_using_command report' -s g -l pager -d "view through pager"
 complete -f -c watson -n '__fish_watson_using_command report' -s G -l no-pager -d "don't vew through pager"
 
+# restart
 complete -f -c watson -n '__fish_watson_needs_sub' -a restart -d "Restart monitoring time for a stopped project"
 complete -f -c watson -n '__fish_watson_using_command restart' -s s -l stop -d "stop running project"
 complete -f -c watson -n '__fish_watson_using_command restart' -s S -l no-stop -d "do not stop running project"
@@ -206,3 +232,7 @@ complete -f -c watson -n '__fish_watson_needs_sub' -a status -d "Display when th
 complete -f -c watson -n '__fish_watson_using_command status' -s p -l project -d "only show project"
 complete -f -c watson -n '__fish_watson_using_command status' -s t -l tags -d "only show tags"
 complete -f -c watson -n '__fish_watson_using_command status' -s e -l elapsed -d "only show elapsed time"
+
+# stop
+complete -f -c watson -n '__fish_watson_needs_sub' -a stop -d "Stop monitoring time for the current project"
+complete -f -c watson -n '__fish_watson_using_command stop' -l at -d "Stop frame at this time (YYYY-MM-DDT)?HH:MM(:SS)?"
diff --git a/dot_config/fish/config.fish.tmpl b/dot_config/fish/config.fish.tmpl
index db5025c..c40d3ff 100755
--- a/dot_config/fish/config.fish.tmpl
+++ b/dot_config/fish/config.fish.tmpl
@@ -76,7 +76,7 @@ end
 
 abbr ab "abbr"
 abbr abe "abbr -e"
-abbr rfc "chezmoi apply && source ~/.config/fish/config.fish"
+# abbr rfc "chezmoi apply && source ~/.config/fish/config.fish"
 abbr xf "fish_config"
 abbr f. "cd .."
 abbr f.. "cd ../.."
diff --git a/dot_config/fish/functions/cd.fish.tmpl b/dot_config/fish/functions/cd.fish.tmpl
index 1e4d80c..387a7e9 100755
--- a/dot_config/fish/functions/cd.fish.tmpl
+++ b/dot_config/fish/functions/cd.fish.tmpl
@@ -48,7 +48,7 @@ function cd --description "Change directory"
 		set -U last_dir $PWD
         {{ if (not (eq .linux_os "termux")) }}
         # lsd -a
-        lsd
+        lsd -F --group-dirs first
         {{ else }}
         # ls -a
         ls
diff --git a/dot_config/fish/functions/refresh-config.fish b/dot_config/fish/functions/refresh-config.fish
index d590587..ca9865a 100644
--- a/dot_config/fish/functions/refresh-config.fish
+++ b/dot_config/fish/functions/refresh-config.fish
@@ -9,5 +9,5 @@ function refresh-config
     source ~/.config/fish/key_abbr.fish > /dev/null
     and echo 'Sourced shortcuts.'
     and echo 'Reloading fish.'
-    and fish
+    and exec fish
 end
diff --git a/dot_config/i3/config.tmpl b/dot_config/i3/config.tmpl
index b2971d8..4f189e0 100755
--- a/dot_config/i3/config.tmpl
+++ b/dot_config/i3/config.tmpl
@@ -13,7 +13,7 @@ exec xbacklight -set 10
 # exec wal -i "$(/home/kevin/scripts/shuffler \"/home/kevin/Pictures/Backgrounds/dim/non-editing\")"
 exec wal -i $(/home/kevin/scripts/shuffler "$HOME/Pictures/Backgrounds/dim/non-editing")
 {{ end }}
-# exec --no-startup-id i3-msg 'workspace $ws2; exec $term'
+exec --no-startup-id i3-msg 'workspace $ws2; exec $term'
 exec --no-startup-id i3-msg 'workspace $ws3; exec $browser'
 
 #  ]]] startup # 
@@ -42,6 +42,7 @@ bindsym Mod4+Return exec dmenu_run -nb "$fg" -nf "$bg" -sb "$bg" -sf "$fg"
 bindsym Mod4+b layout tabbed; exec zathura
 bindsym Mod4+c exec $browser
 # bindsym Mod4+e exec notify-send "HPS Word Count" "$(pdftotext /home/kevin/school/latex-notes/hps/essay.pdf - | wc -w)"
+bindsym Mod4+e exec emacs
 bindsym Mod4+f exec firefox
 bindsym Mod4+$mod+f exec echo 'Kevin@fosstodon.org' | xclip -selection clipboard
 bindsym Mod4+h exec echo 'kevin.mok@live.ca' | xclip -selection clipboard
@@ -112,6 +113,7 @@ bindsym $mod+q exec sudo systemctl stop netctl-auto@wlp3s0.service
 #  ]]] backlight # 
 
 for_window [class="Peek"] floating enable
+for_window [title="Qalculate!"] floating enable
 
 #  ]]] applications # 
 
@@ -253,8 +255,8 @@ set $make_st_script "/home/kevin/st/make-st.sh"
 
 bindsym Control+$mod+q exec wal -i $($scripts_path/shuffler "$HOME/Pictures/Backgrounds/bright/editing") && $make_st_script
 bindsym Control+$mod+w exec wal -i $($scripts_path/shuffler "$HOME/Pictures/Backgrounds/dim/non-editing") && $make_st_script
-bindsym $mod+r exec wal -i $($scripts_path/shuffler "$HOME/Pictures/Backgrounds/dim/editing") && $make_st_script
-bindsym $mod+y exec wal -i $($scripts_path/shuffler "$HOME/Pictures/Backgrounds/bright/non-editing") && $make_st_script
+bindsym Control+r exec wal -i $($scripts_path/shuffler "$HOME/Pictures/Backgrounds/dim/editing") && $make_st_script
+bindsym Control+$mod+y exec wal -i $($scripts_path/shuffler "$HOME/Pictures/Backgrounds/bright/non-editing") && $make_st_script
 {{ if eq .chezmoi.fullHostname "x1-carbon" }}
 bindsym Control+$mod+z exec feh --bg-fill ~/Pictures/Backgrounds/dim/black.jpg
 {{ end }}
@@ -402,7 +404,7 @@ bindsym $mod+Shift+5 move container to workspace $ws15; workspace $ws15
 
 #  reload config [[[ # 
 
-bindsym $mod+Control+r exec i3-msg restart
+bindsym Control+$mod+r exec i3-msg restart
 bindsym $mod+Shift+c reload
 # bindsym $mod+Control+r reload
 bindsym $mod+Control+u exec xrdb ~/.Xresources
diff --git a/dot_config/i3blocks/scripts/executable_volume b/dot_config/i3blocks/scripts/executable_volume
index 9631f39..2f8c00e 100755
--- a/dot_config/i3blocks/scripts/executable_volume
+++ b/dot_config/i3blocks/scripts/executable_volume
@@ -128,7 +128,8 @@ function set_default_playback_device_next {
 
 case "$BLOCK_BUTTON" in
     1) set_default_playback_device_next ;;
-    2) amixer -q -D $MIXER sset $SCONTROL $CAPABILITY toggle ;;
+    # 2) amixer -q -D $MIXER sset $SCONTROL $CAPABILITY toggle ;;
+    2) amixer -q -D $MIXER sset $SCONTROL $CAPABILITY 15% ;;
     3) set_default_playback_device_next -1 ;;
     4) amixer -q -D $MIXER sset $SCONTROL $CAPABILITY $AUDIO_DELTA%+ ;;
     5) amixer -q -D $MIXER sset $SCONTROL $CAPABILITY $AUDIO_DELTA%- ;;
diff --git a/dot_config/ranger/commands.py b/dot_config/ranger/commands.py
index 8c5e748..5edce07 100755
--- a/dot_config/ranger/commands.py
+++ b/dot_config/ranger/commands.py
@@ -75,11 +75,11 @@ class fzf_select(Command):
         if self.quantifier:
             # match only directories
             command="find -L . \( -path '*/\.*' -o -fstype 'dev' -o -fstype 'proc' \) -prune \
-            -o -type d -print 2> /dev/null | sed 1d | cut -b3- | fzf +m"
+            -o -type d -print 2> /dev/null | sed 1d | cut -b3- | fzf +m -e"
         else:
             # match files and directories
             command="find -L . \( -path '*/\.*' -o -fstype 'dev' -o -fstype 'proc' \) -prune \
-            -o -print 2> /dev/null | sed 1d | cut -b3- | fzf +m"
+            -o -print 2> /dev/null | sed 1d | cut -b3- | fzf +m -e"
         fzf = self.fm.execute_command(command, stdout=subprocess.PIPE)
         stdout, stderr = fzf.communicate()
         if fzf.returncode == 0:
diff --git a/dot_config/ranger/rc.conf.tmpl b/dot_config/ranger/rc.conf.tmpl
index 0806978..7c4281e 100755
--- a/dot_config/ranger/rc.conf.tmpl
+++ b/dot_config/ranger/rc.conf.tmpl
@@ -277,7 +277,7 @@ map ? help
 map W display_log
 # map w taskview_open
 # map S shell $SHELL
-map s shell fish -C "cd %d"
+map s shell exec fish -C "cd %d"
 
 map :  console
 map ;  console
diff --git a/dot_gitconfig b/dot_gitconfig
index 3710e31..2c1168d 100644
--- a/dot_gitconfig
+++ b/dot_gitconfig
@@ -6,6 +6,7 @@
 	ui = auto
 [core]
 	editor = nvim
+    autocrlf = input
 [push]
 	default = simple
 [merge]
diff --git a/dot_vimrc.tmpl b/dot_vimrc.tmpl
index e9dc784..b14a59a 100644
--- a/dot_vimrc.tmpl
+++ b/dot_vimrc.tmpl
@@ -6,6 +6,9 @@ set background=dark
 " set colorcolumn=80
 set clipboard+=unnamedplus
 set diffopt=filler,context:3
+if has('nvim-0.3.2') || has("patch-8.1.0360")
+  set diffopt=filler,internal,algorithm:histogram,indent-heuristic
+endif
 set encoding=utf-8
 set expandtab
 " set foldmethod=indent
@@ -53,7 +56,7 @@ autocmd CursorHold * if !bufexists("[Command Line]") | checktime | endif
 " commands for file types [[[ "
 
 autocmd BufNewFile,BufRead .* set syntax=sh
-autocmd FileType *css,htmldjango,html,javascript,json,markdown,tex,text,yaml set tabstop=2 shiftwidth=2
+autocmd FileType *css,htmldjango,html,javascript,json,lisp,markdown,tex,text,yaml set tabstop=2 shiftwidth=2
 " autocmd BufNewFile,BufRead *.md set filetype=markdown
 " autocmd Filetype markdown set textwidth=0
 " autocmd Filetype html set foldmarker=0
@@ -77,10 +80,10 @@ autocmd Filetype markdown inoremap >> >
 " t = wrap lines
 " v = break lines in insert 
 " w = whitespace continues paragraph
-
 " ]]] format options "
-" autocmd FileType markdown,tex,text set spell spelllang=en_us formatoptions=acjMqtvw
-autocmd FileType tex,text set spell spelllang=en_us formatoptions=acjMqtvw
+" autocmd FileType markdown,tex,text set spell spelllang=en_us formatoptions=cjMqtvw
+autocmd FileType markdown,tex,text set spell spelllang=en_us formatoptions=acjMqtvw
+" autocmd FileType tex,text set spell spelllang=en_us formatoptions=acjMqtvw
 autocmd FileType python,lua set fdm=indent
 autocmd Filetype json nnoremap <leader>j :%!python -m json.tool<CR>
 autocmd Filetype json set foldmethod=marker
@@ -315,6 +318,8 @@ nnoremap v <C-V>
 nnoremap Q @@
 " toggle fold "
 nnoremap , za
+" jump to horizontal position for mark "
+nnoremap ' `
 
 " indenting
 nnoremap > >>
@@ -371,6 +376,8 @@ nnoremap <leader>ht :set tabstop=2 shiftwidth=2 expandtab<CR>
 nnoremap <leader>vhe :vert help 
 " don't add space when joining lines "
 nnoremap <leader>j gJ
+" join all paragraphs into single line "
+nnoremap <leader>jl :set tw=9999999<CR>gggqG
 " format current line
 nnoremap <leader>l Vgq
 " format this and next line
@@ -524,7 +531,6 @@ autocmd Filetype fish inoremap <localleader>2 $argv[2]
 autocmd Filetype javascript inoremap <localleader>x process.exit()
 
 autocmd Filetype markdown inoremap <localleader>cb - [ ] 
-autocmd Filetype markdown nnoremap <localleader>j :set tw=9999999<CR>gggqG
 autocmd Filetype markdown nnoremap <localleader>x 0f[lrx
 " nnoremap <localleader>x 0f[lrx
 
diff --git a/txt/nzxt-aur.txt b/txt/nzxt-aur.txt
index b6c985c..6dc0798 100644
--- a/txt/nzxt-aur.txt
+++ b/txt/nzxt-aur.txt
@@ -1,6 +1,7 @@
 acestream-engine
 acestream-player
-android-studio
+antimicro
+arno-iptables-firewall
 aurvote
 bear
 chromium-widevine
@@ -14,8 +15,10 @@ flashplugin-focusfix
 godot-bin
 heroku-cli
 htop-vim-git
+i3-gaps-rounded
 i3blocks-git
 insomnia
+jmtpfs
 libavutil-52
 linux-kevin
 linux-kevin-headers
@@ -24,21 +27,22 @@ linux-nzxt-headers
 lua-cjson
 mongodb-bin
 mongodb-tools-bin
+mono-basic
 nerd-fonts-dejavu-complete
 nerd-fonts-hack
 nx3-all
 peaclock
 pipes.sh
 pycp
+python-tinydb
 qdirstat
-riot-desktop-git
 robo3t-bin
-rxvt-unicode-pixbuf
+rxvt-unicode-patched
 sc-im
+simple-mtpfs
 slack-desktop-dark
 spotify
 spotify-now-git
-st
 steamos-xpad-dkms
 systemd-numlockontty
 texlive-local-adjustbox
@@ -46,12 +50,16 @@ texlive-local-algorithmicx
 texlive-local-algorithms
 texlive-local-biblatex
 texlive-local-biblatex-apa
+texlive-local-capt-of
 texlive-local-collectbox
 texlive-local-csquotes
 texlive-local-elocalloc
 texlive-local-enumitem
 texlive-local-environ
+texlive-local-fontawesome
+texlive-local-footmisc
 texlive-local-forest
+texlive-local-gfsdidot
 texlive-local-ifmtarg
 texlive-local-inlinedef
 texlive-local-logreq
@@ -60,7 +68,10 @@ texlive-local-numprint
 texlive-local-pgfopts
 texlive-local-pgfplots
 texlive-local-siunitx
+texlive-local-sourcesanspro
+texlive-local-tcolorbox
 texlive-local-tikz-qtree
+texlive-local-titlesec
 texlive-local-tkz-base
 texlive-local-tkz-euclide
 texlive-local-trimspaces
@@ -68,11 +79,11 @@ texlive-local-was
 texlive-local-xifthen
 texlive-localmanager-git
 trizen
-ttf-emojione
+urxvt-resize-font-git
 vidir
-watson
 weechat-vimode-git
 wego
 wpa_actiond
+xvkbd
 yad
 yay
diff --git a/txt/nzxt-pkgs.txt b/txt/nzxt-pkgs.txt
index 23b9583..2891d97 100644
--- a/txt/nzxt-pkgs.txt
+++ b/txt/nzxt-pkgs.txt
@@ -16,6 +16,7 @@ browserpass
 bzip2
 calcurse
 certbot
+chezmoi
 chromium
 cloc
 cmake
@@ -25,14 +26,17 @@ coreutils
 cowsay
 cronie
 cryptsetup
+dateutils
 device-mapper
 dhcpcd
 dialog
 diffutils
 dmenu
+doxygen
 dunst
 e2fsprogs
 electrum
+emacs
 encfs
 evince
 fakeroot
@@ -63,20 +67,22 @@ hdf5
 hexyl
 highlight
 hugo
-i3-gaps
 i3status
 imv
 imwheel
 inetutils
 iniparser
+inotify-tools
 intellij-idea-community-edition
 iproute2
 iputils
+irrlicht
 jfsutils
 jp2a
 junit
 less
 lib32-nvidia-utils
+libreoffice-still
 licenses
 linux
 linux-firmware
@@ -92,6 +98,8 @@ man-db
 man-pages
 mdadm
 meld
+mono
+mosh
 mpv
 nano
 ncdu
@@ -109,6 +117,7 @@ nvidia-settings
 openshot
 openssh
 os-prober
+p7zip
 pacman
 pacman-contrib
 pandoc
@@ -126,13 +135,44 @@ postgresql
 procps-ng
 psmisc
 pulseaudio
+pyside2
 python-dbus
 python-numpy
 python-pip
 python-pywal
 python-setuptools
+qalculate-gtk
 qemu
 qrencode
+qt5-3d
+qt5-charts
+qt5-connectivity
+qt5-datavis3d
+qt5-doc
+qt5-examples
+qt5-gamepad
+qt5-graphicaleffects
+qt5-imageformats
+qt5-lottie
+qt5-networkauth
+qt5-purchasing
+qt5-quickcontrols
+qt5-quickcontrols2
+qt5-remoteobjects
+qt5-script
+qt5-scxml
+qt5-serialbus
+qt5-serialport
+qt5-speech
+qt5-tools
+qt5-translations
+qt5-virtualkeyboard
+qt5-wayland
+qt5-webengine
+qt5-webglplugin
+qt5-websockets
+qt5-webview
+qt5-xmlpatterns
 ranger
 redshift
 reiserfsprogs
@@ -146,7 +186,9 @@ shadow
 shellcheck
 sl
 smartmontools
+spatialindex
 sqlitebrowser
+sshfs
 sshpass
 steam
 steam-native-runtime
@@ -171,8 +213,10 @@ transmission-cli
 transmission-gtk
 ttf-dejavu
 ttf-font-awesome
+ttf-joypixels
 ttf-ubuntu-font-family
 udisks2
+unrar
 unzip
 usbutils
 util-linux