From f488c79b46a3304ebd37ca978d5ff9a8bdaac1e1 Mon Sep 17 00:00:00 2001
From: Kevin Mok <me@kevin-mok.com>
Date: Thu, 18 Jun 2020 13:48:16 -0400
Subject: [PATCH] Initial Red Hat config

---
 aliases/key_aliases.tmpl                      | 70 +++++++++++++------
 aliases/key_dirs.tmpl                         | 16 +++--
 aliases/key_files.tmpl                        |  5 ++
 dot_Xmodmap                                   |  6 +-
 dot_Xmodmap-old                               |  7 ++
 dot_Xresources.tmpl                           |  1 +
 dot_config/fish/config.fish.tmpl              | 25 +++++--
 dot_config/fish/functions/scan-history.fish   |  2 +-
 dot_config/fish/functions/task/task-anno.fish |  2 +-
 .../fish/functions/watson-add-fortnite.fish   |  8 ++-
 dot_config/i3/config.tmpl                     | 57 +++++++++------
 dot_config/kitty/kitty.conf                   |  5 ++
 dot_config/mpv/input.conf                     |  6 +-
 dot_config/ranger/rc.conf.tmpl                |  8 ++-
 dot_taskrc                                    |  7 +-
 dot_vimrc.tmpl                                | 16 ++++-
 txt/exclude-dirs-backup.txt.tmpl              |  2 +
 txt/nzxt-all.txt                              | 54 +++++++++++---
 txt/nzxt-aur.txt                              | 31 +++++---
 txt/nzxt-pkgs.txt                             | 33 +++++++--
 20 files changed, 262 insertions(+), 99 deletions(-)
 create mode 100644 dot_Xmodmap-old

diff --git a/aliases/key_aliases.tmpl b/aliases/key_aliases.tmpl
index 6016656..9d9d702 100644
--- a/aliases/key_aliases.tmpl
+++ b/aliases/key_aliases.tmpl
@@ -62,6 +62,7 @@ cld "colordiff -wy --suppress-common-lines"
 mkpk "makepkg -sri"
 ex "chmod +x"
 lns "ln -s"
+src "source"
 
 # systemctl  [[[ #
 ct "sudo systemctl"
@@ -91,8 +92,8 @@ ssd "mosh --ssh='ssh -p 399' kevin@165.22.239.234 tmux a"
 sdh "mosh --ssh='ssh -p 399' kevin@165.22.239.234 htop"
 sfd "sftp -rP 399 kevin@165.22.239.234"
 # phone
-ssp "mosh --ssh='ssh -p 8022' 192.168.0.14"
-sfp "sftp -rP 8022 192.168.0.14"
+ssp "mosh --ssh='ssh -p 8022' $PHONE_IP"
+sfp "sftp -rP 8022 $PHONE_IP"
 # test server sites
 # svp "firefox git.ataraxy.tk khkm.tk cal.khkm.tk pste.gq smol.gq twem.tk"
 # postgres ssh tunnel
@@ -115,7 +116,7 @@ udub "udisksctl unmount -b /dev/sdc2"
 # ]]] mounting # 
 
 tch "touch"
-vdr "vidir --verbose"
+vd "vidir --verbose"
 
 # directory-related [[[ #
 
@@ -140,7 +141,7 @@ fnd "find . -type f -name"
 p "pwd"
 
 rmr "rm -rf"
-rmd "rm ~/Downloads/*"
+# rmd "rm ~/Downloads/*"
 rmw "rm ~/.local/share/nvim/swap/"
 md "mkdir -p"
 rsy "rsync -Pr"
@@ -153,7 +154,7 @@ ds "df -h | head -n 1 && df -h | grep sd"
 chownw "sudo chown -R kevin:wheel"
 chwnm "sudo chown -R kevin:wheel /run/media/{{ .chezmoi.username }}"
 # cd into backup folder and show backup sizes
-nbu "cd /run/media/kevin/backup-hd/{{ .chezmoi.fullHostname }}/tar && lsd -l"
+lbu "cd /run/media/kevin/backup-hd/{{ .chezmoi.fullHostname }}/tar && lsd -l"
 
 # ]]] directory-related #
 
@@ -313,6 +314,7 @@ af "task proj:"
 afcm "task proj:codm"
 afcr "task proj:crim"
 afs "task proj:sch"
+afy "task proj:pey"
 apl "task completed"
 al "task limit:15"
 alg "task log"
@@ -367,13 +369,15 @@ it "sxiv -t *"
 ki "kill -9"
 ka "killall"
 kd "killall Discord && killall Discord"
+ke "killall electron"
 kf "killall firefox"
-kr "killall electron"
+kai "killall imwheel && imwheel"
 kt "killall thunderbird"
 lo "libreoffice"
 # mpv "mpv --volume=50"
 # mp "mpv"
 m "mpv"
+msf "mpv --sub-file="
 mra "man ranger"
 # mt "minetest"
 n "nvim"
@@ -403,6 +407,8 @@ tacm "tmux a -t codm || tmux new -s codm"
 tacr "tmux a -t crimson || tmux new -s crimson"
 taf "tmux a -t fortnite || tmux new -s fortnite"
 taj "tmux a -t journal || tmux new -s journal"
+tarh "tmux a -t red-hat || tmux new -s red-hat"
+tar2 "tmux a -t red-hat-2 || tmux new -s red-hat-2"
 tas "tmux a -t school || tmux new -s school"
 tas2 "tmux a -t school-2 || tmux new -s school-2"
 tal "tmux a"
@@ -415,6 +421,7 @@ tnb "tmux new -s backup"
 #]]]
 usn "usernames --num 20"
 vmd "vimdiff"
+wc "wc -l"
 # wg "wego"
 wg "curl -L wthr.ml"
 wgm "curl -L wthr.ml/m"
@@ -518,6 +525,7 @@ gmgt "git mergetool"
 
 gr "git remote -v"
 gra "git remote add origin"
+grao "git remote add orig"
 # grag "git remote add gitea git@ataraxy.tk:Kevin-Mok/.git"
 
 grr "git remote remove origin"
@@ -569,6 +577,7 @@ glm "git log master"
 gcl "git clone"
 gs "git status -u"
 gf "git fetch origin"
+gfo "git fetch orig"
 gfg "git fetch gitea"
 
 gch "git checkout"
@@ -595,6 +604,7 @@ gsts "git stash show stash@\{0\} -p"
 gclear "git stash clear"
 
 gpl "git pull --rebase"
+gplo "git fetch orig && git pull --rebase . orig/master"
 grb "git rebase -i"
 grba "git rebase --abort"
 grbc "git rebase --continue"
@@ -667,7 +677,7 @@ upip "pip list --outdated --format=freeze | grep -v '^\-e' | cut -d = -f 1  | xa
 ureq "pip freeze > requirements.txt"
 
 # show last history scan
-hlg "psql -d spotifyvis -a -f /home/kevin/coding/spotify-lib-vis/src/scripts/queries/history.sql | rg 2019 | tac"
+hlg "psql -U postgres -d spotifyvis -a -f /home/kevin/coding/spotify-lib-vis/src/scripts/queries/history.sql | rg 2020 | tac"
 slg "tail -n 5 $spv_dir/src/api/management/commands/update-history.log"
 # scan history
 # hs "$spv_dir/src/update-history.sh && cat $spv_dir/src/api/management/commands/update-history.log | tail -n 1"
@@ -726,8 +736,8 @@ pyh "python -m http.server"
 # j "jekyll"
 # js "jekyll serve"
 hu "hugo"
-hd "hugo server -D --disableFastRender --bind 192.168.0.10 --baseURL 'http://192.168.0.10:1313'"
 hg "hugo serve --disableFastRender"
+hgp "hugo server -D --disableFastRender --bind 192.168.0.10 --baseURL 'http://192.168.0.10:1313'"
 
 # ]]] mfs #
 
@@ -800,19 +810,33 @@ twf "watch -n300 'twitchy-game Fortnite'"
 gpa "column -ts',' ~/Documents/gpa.md"
 ssc "mosh mokkar@teach.cs.utoronto.ca"
 
-# 324
-# hk "clear && tmux clear-history && runhaskell TestChups.hs"
-hk "clear && tmux clear-history && runhaskell"
-rk "clear && tmux clear-history && raco test"
-rke "clear && tmux clear-history && raco test ex1.rkt"
-rkr "clear && tmux clear-history && racket"
-rki "racket -l racket/base -i"
-
-# 384
-rgp "clear && tmux clear-history && rg -S -t py"
-8aa "clear && tmux clear-history && python2 autograder.py"
-# 8ap "python2 plane_scheduling.py"
-8aq "clear && tmux clear-history && python2 autograder.py --no-graphics -q q6"
-8at "clear && tmux clear-history && python2 autograder.py --no-graphics -t test_cases/q6/1-JointParticleObserve"
-
 # ]]] school  #
+
+# red-hat [[[ #
+
+# laptop
+loe "libreoffice ~/Documents/expenses/2020.ods &"
+ssw "mosh $WORK_LAPTOP_IP tmux a"
+ssi "mosh $WORK_LAPTOP_IP -- tmux a -t weechat"
+sfw "sftp $WORK_LAPTOP_IP"
+
+fp "fpaste"
+ghr "github-release"
+
+# oc [[[ #
+
+o "oc"
+odc "oc describe pod"
+odl "oc delete project"
+og "oc get pods -w"
+ol "oc logs"
+on "oc new-project"
+op "oc project"
+opd "oc project default"
+ot "oc status"
+
+# ]]] oc #
+
+jk "java -jar ~/java/jenkins-cli.jar -s http://localhost:8090 -auth kevin:112ef7228e7a8cea5435473f9416cb56e1"
+
+# ]]] red-hat #
diff --git a/aliases/key_dirs.tmpl b/aliases/key_dirs.tmpl
index 063febb..5c7f416 100644
--- a/aliases/key_dirs.tmpl
+++ b/aliases/key_dirs.tmpl
@@ -9,7 +9,7 @@ cff ~/.config/fish
 dl  ~/Downloads
 # dw ~/dwm
 D  ~/Documents
-k ~/
+kh ~/
 lc ~/linux-config
 lf /mnt/linux-files
 Lfp /mnt/linux-files/Pictures
@@ -114,7 +114,15 @@ tcd /mnt/linux-files/Videos/yt/fortnite/clips/twitch-clip-downloader
 sc ~/school
 lt ~/school/latex-notes
 
-ph ~/school/phl
-phe ~/school/phl/w8-10-mind-machines/essay
-
 # ]]] sch #
+
+# pey [[[ #
+
+rh ~/Documents/red-hat
+k  ~/coding/kogito
+kg ~/coding/kogito/github-release-test
+kl ~/coding/kogito/shared-libraries
+ko ~/coding/kogito/kogito-cloud-operator
+kr ~/coding/kogito/runtimes
+
+# ]]] pey #
diff --git a/aliases/key_files.tmpl b/aliases/key_files.tmpl
index 4dce520..c42828b 100644
--- a/aliases/key_files.tmpl
+++ b/aliases/key_files.tmpl
@@ -45,6 +45,7 @@ id ~/Documents/journal/todo/ideas.md
 ig ./.gitignore
 jn ~/Documents/journal/todo/2.md
 jt ~/Documents/journal/todo/todo.md
+k ~/linux-config/dot_config/kitty/kitty.conf
 lh ~/Documents/listening-history/polarbier.csv
 mc ~/coding/mf-site/assets/sass/main.scss
 mi ~/coding/mf-site/ideas.md
@@ -89,9 +90,13 @@ cmr ~/Documents/codm/discord-recruitment.md
 cra ~/Documents/red-discord-bot/repos/gobcog-kevin/adventure/data/default/attribs.json
 crm ~/Documents/red-discord-bot/repos/gobcog-kevin/adventure/data/default/monsters.json
 fn ~/Documents/fortnite/notes/fortnite-notes.md
+fp ~/Documents/fortnite/notes/post.md
 fv ~/Documents/fortnite/notes/vods.md
 mta ~/.minetest/clientmods/custom_aliases/init.lua
 pk ~/Downloads/pokecord/pokecord2.md
 tc /mnt/linux-files/Videos/yt/fortnite/clips/twitch-clip-downloader/clips.txt
 
 # ]]] gaming #
+
+klg ~/coding/kogito/shared-libraries/vars/githubscm.groovy
+rht ~/Documents/red-hat/todo.md
diff --git a/dot_Xmodmap b/dot_Xmodmap
index 0eea2b2..fc2d78e 100644
--- a/dot_Xmodmap
+++ b/dot_Xmodmap
@@ -1,7 +1,7 @@
 clear Lock
 
-keycode 22 = Caps_Lock
-keycode 66 = BackSpace
-keycode 78 = End
+keycode 9 = Caps_Lock
+keycode 22 = BackSpace
+keycode 66 = Escape
 
 pointer = 1 10 3 6 7 4 5 2 11 12 8 9
diff --git a/dot_Xmodmap-old b/dot_Xmodmap-old
new file mode 100644
index 0000000..0eea2b2
--- /dev/null
+++ b/dot_Xmodmap-old
@@ -0,0 +1,7 @@
+clear Lock
+
+keycode 22 = Caps_Lock
+keycode 66 = BackSpace
+keycode 78 = End
+
+pointer = 1 10 3 6 7 4 5 2 11 12 8 9
diff --git a/dot_Xresources.tmpl b/dot_Xresources.tmpl
index d0dfee2..b36ac81 100644
--- a/dot_Xresources.tmpl
+++ b/dot_Xresources.tmpl
@@ -18,6 +18,7 @@ Xft.rgba: rgb
 
 /* font [[[ */
 
+URxvt*cursorBlink: 0
 {{ if eq .chezmoi.fullHostname "x1-carbon" }}
 ! URxvt.font: xft:DejaVuSansMono Nerd Font Mono:size=11
 URxvt.font: xft:DejaVuSansMono Nerd Font Mono:size=11.5
diff --git a/dot_config/fish/config.fish.tmpl b/dot_config/fish/config.fish.tmpl
index 0845e99..809a721 100755
--- a/dot_config/fish/config.fish.tmpl
+++ b/dot_config/fish/config.fish.tmpl
@@ -25,17 +25,27 @@ source /home/kevin/coding/spotify-lib-vis/src/scripts/api-keys-fish.sh
 abbr hum "cd $mfs_dir && hugo serve -D --disableFastRender"
 {{ end }}#]]]
 
-# system[[[
-set -x PATH $PATH ~/.local/bin ~/scripts ~/scripts/colors ~/go/bin ~/.minetest/minetest/bin ~/.gem/ruby/2.6.0/bin
-set -x CLASSPATH $CLASSPATH /home/kevin/java/*.jar
+# system [[[
+set -x HASTE_SERVER https://pste.gq
 set -x LD_LIBRARY_PATH $LD_LIBRARY_PATH /usr/local/lib /usr/local/lib64
+# set -x PATH $GRAALVM_BIN $PATH ~/.local/bin ~/scripts ~/scripts/colors ~/go/bin ~/.minetest/minetest/bin ~/.gem/ruby/2.6.0/bin
+set -x PATH $PATH ~/.local/bin ~/scripts ~/scripts/colors ~/go/bin ~/.minetest/minetest/bin ~/.gem/ruby/2.6.0/bin
 set -x PKG_CONFIG_PATH $PKG_CONFIG_PATH /usr/lib/pkgconfig
-set -x HASTE_SERVER https://pste.gq
 {{ if eq .chezmoi.fullHostname "nzxt" }}
 set -x CALCURSE_CALDAV_PASSWORD (pass show technology/linux/baikal | head -n1)
 status --is-interactive; and source (pyenv init -|psub)
 {{ end }}
-#]]]
+
+# Java [[[ #
+
+# set -x GRAALVM_HOME /usr/lib/jvm/graalvm-ce-java11-20.1.0
+# set -x GRAALVM_BIN $GRAALVM_HOME/bin
+# set -x JAVA_HOME /usr/lib/jvm/java-11-openjdk
+# set -x JAVA_HOME $GRAALVM_HOME
+
+# ]]] Java #
+
+# system ]]]
 
 # space prompt[[[
 # set SPACEFISH_PROMPT_ORDER time user dir host git package node docker ruby golang php rust haskell julia aws conda pyenv kubecontext exec_time line_sep battery jobs exit_code vi_mode char
@@ -62,6 +72,9 @@ set -xU BROWSER "firefox"
 
 set -xU FZF_DEFAULT_COMMAND "find ."
 
+set -xU PHONE_IP "192.168.0.10"
+set -xU WORK_LAPTOP_IP "kmok@192.168.0.15"
+
 # ]]] universal var's #
 
 # fish-specific [[[ #
@@ -106,7 +119,7 @@ abbr xf "fish_config"
 abbr ! "sudo !!"
 # task [[[ #
 
-abbr aan "task-anno"
+abbr aan "task-anno ''"
 abbr ae "task-edit"
 abbr adl "task-delete"
 abbr adn "task-done"
diff --git a/dot_config/fish/functions/scan-history.fish b/dot_config/fish/functions/scan-history.fish
index 36f3c5d..b39960e 100755
--- a/dot_config/fish/functions/scan-history.fish
+++ b/dot_config/fish/functions/scan-history.fish
@@ -2,6 +2,6 @@ function scan-history
 	sudo systemctl start postgresql.service
 	# and systemctl status postgresql.service
 	and source $spv_dir/src/scripts/api-keys.sh
-	and $spv_dir/src/scripts/update-history.sh 
+	and $spv_dir/src/scripts/update-history-2.sh 
 	and cat $spv_dir/src/api/management/commands/update-history.log | tail -n 1
 end
diff --git a/dot_config/fish/functions/task/task-anno.fish b/dot_config/fish/functions/task/task-anno.fish
index 23a77e8..d472aea 100644
--- a/dot_config/fish/functions/task/task-anno.fish
+++ b/dot_config/fish/functions/task/task-anno.fish
@@ -1,4 +1,4 @@
 function task-anno
-    task $argv[1] annotate $argv[2]
+    task $argv[2] annotate $argv[1]
     and task
 end
diff --git a/dot_config/fish/functions/watson-add-fortnite.fish b/dot_config/fish/functions/watson-add-fortnite.fish
index 5bc5cc7..cc6f42f 100644
--- a/dot_config/fish/functions/watson-add-fortnite.fish
+++ b/dot_config/fish/functions/watson-add-fortnite.fish
@@ -1,7 +1,11 @@
 function watson-add-fortnite
+  set year_month "2020-06"
+  set start_time "$year_month-$argv[1] $argv[2]"
+  set end_time "$year_month-$argv[3] $argv[4]"
+
   if test (count $argv) -eq 4
-    watson add -f "2020-04-$argv[1] $argv[2]" -t "2020-04-$argv[3] $argv[4]" fun +fortnite
+    watson add -f $start_time -t $end_time fun +fortnite
   else
-    watson add -f "2020-04-$argv[1] $argv[2]" -t "2020-04-$argv[3] $argv[4]" fun +fortnite +$argv[5]
+    watson add -f $start_time -t $end_time fun +fortnite +$argv[5]
   end
 end
diff --git a/dot_config/i3/config.tmpl b/dot_config/i3/config.tmpl
index 992c916..f5f51c8 100755
--- a/dot_config/i3/config.tmpl
+++ b/dot_config/i3/config.tmpl
@@ -1,11 +1,11 @@
 #  startup [[[ # 
 
+set $term kitty
+# set $term st
 # set $term urxvt
+# set $term_alt kitty
 # set $term_alt st
-set $term kitty
 set $term_alt urxvt
-# set $term st
-# set $term_alt urxvt
 {{ if eq .chezmoi.fullHostname "x1-carbon" }}
 exec dunst
 exec compton
@@ -16,10 +16,10 @@ exec xbacklight -set 10
 exec wal -i $(/home/kevin/scripts/shuffler "$HOME/Pictures/Backgrounds/dim/non-editing")
 {{ end }}
 # exec xrdb ~/.Xresources && grep wallpaper ~/.cache/wal/colors.sh | cut -d\' -f2 | xargs wal -i > /dev/null
-exec --no-startup-id i3-msg 'workspace $ws2; exec $term -e fish -c "tmux-attach fortnite"'
+# exec --no-startup-id i3-msg 'workspace $ws1; exec $term'
+# exec --no-startup-id i3-msg 'workspace $ws2; exec $term -e fish -c "tmux-attach fortnite"'
 exec --no-startup-id i3-msg 'workspace $ws3; exec $browser'
 # exec --no-startup-id i3-msg 'workspace $ws5; exec $term -e twitchy'
-# exec --no-startup-id i3-msg 'workspace $ws6; exec discord'
 
 #  ]]] startup # 
 
@@ -55,8 +55,10 @@ bindsym Mod4+e exec ~/scripts/twem
 # bindsym Mod4+f exec firefox
 bindsym Mod4+f exec firefox --private-window
 # bindsym Mod4+$mod+f exec printf 'Kevin@fosstodon.org' | xclip -selection clipboard
-bindsym Mod4+h exec sleep .2 && xdotool type '.hint'
-bindsym Mod4+$mod+h exec $type_delay_cmd && xdotool type 'kevin.mok@live.ca'
+# bindsym Mod4+h exec sleep .2 && xdotool type '.hint'
+# bindsym Mod4+$mod+h exec $type_delay_cmd && xdotool type 'kevin.mok@live.ca'
+bindsym Mod4+h exec $type_delay_cmd && xdotool type 'kevin.mok@live.ca'
+# bindsym Mod4+$mod+h exec sleep .2 && xdotool type '.hint'
 bindsym Mod4+$mod+i exec sleep .2 && xdotool type '.info latest'
 # bindsym Mod4+m exec $term -e ~/scripts/vim-man
 bindsym Mod4+m exec $type_delay_cmd && xdotool type 'me@kevin-mok.com'
@@ -67,13 +69,15 @@ bindsym Mod4+o exec xclip -selection clipboard ~/.password-store/social/gmail &&
 bindsym Mod4+$mod+o exec xset dpms force off
 # bindsym Mod4+p workspace $ws4; exec pgadmin3
 # bindsym Mod4+p exec pycharm
-bindsym Mod4+p exec sleep .2 && xdotool type '.catch '
-bindsym Mod4+$mod+p exec passmenu
+bindsym Mod4+p exec passmenu
+# bindsym Mod4+p exec sleep .2 && xdotool type '.catch '
+# bindsym Mod4+$mod+p exec passmenu
 # bindsym Mod4+$mod+p exec notify-send "ping" "$(ping -c 3 -W 1 8.8.8.8)"
 # bindsym Mod4+q exec qdirstat
 bindsym Mod4+q exec printf 'emad1 ' | xclip -selection clipboard && $type_delay_cmd && xdotool key 'Control_L+v'
-bindsym Mod4+r exec $term -e ranger
-bindsym Mod4+$mod+r exec notify-send "watson restart" "$(watson restart)"
+bindsym Mod4+r exec $type_delay_cmd && xdotool type 'kmok@redhat.com'
+bindsym Mod4+$mod+r exec $term -e ranger
+# bindsym Mod4+$mod+r exec notify-send "watson restart" "$(watson restart)"
 bindsym Mod4+$mod+s exec $type_delay_cmd && xdotool type 'https://smol.gq/'
 bindsym Mod4+t exec xclip -selection clipboard ~/.password-store/social/trapbot && $type_delay_cmd && xdotool key 'Control_L+v'
 bindsym Mod4+u exec $type_delay_cmd && xdotool type 'kevin.mok@mail.utoronto.ca'
@@ -86,7 +90,8 @@ bindsym Control+$mod+x exec $type_delay_cmd && xdotool type 'http://codm.ataraxy
 bindsym Mod4+z exec cliqz
 {{ if .ext_kb }}
 bindsym Mod4+x exec ~/scripts/xmodmap-custom
-bindsym Print --release exec "scrot -s ~/tmp/screenshot-$(date +%F_%T).png -e 'xclip -selection c -t image/png < $f'"
+# bindsym Print --release exec "scrot -s ~/tmp/screenshot-$(date +%F_%T).png -e 'xclip -selection c -t image/png < $f'"
+bindsym Print --release exec "maim -su | tee ~/tmp/screenshot-$(date +%F_%T).png | xclip -selection clipboard -t image/png"
 bindsym Control+Print --release exec "scrot -u ~/tmp/screenshot-$(date +%F_%T).png -e 'xclip -selection c -t image/png < $f'"
 {{ else }}
 bindsym Mod4+x exec xmodmap ~/.Xmodmap-laptop && xset r rate $XSET_DELAY $XSET_RATE
@@ -302,17 +307,17 @@ set $secondary "DVI-I-1"
 set $main "HDMI-0"
 {{ end }}
 
-workspace $ws1 output $main
+# workspace $ws1 output $main
+workspace $ws1 output $secondary
 bindsym $mod+F1 workspace $ws1; exec $term
+bindsym Control+Shift+F1 workspace $ws1; exec $term -e fish -c 'tmux-attach red-hat'
 
 set $ws2 "2 "
+set $wl_ip_nast_num "5"
 workspace $ws2 output $secondary
 bindsym $mod+F2 workspace $ws2; exec $term
-# bindsym Control+Shift+F2 workspace $ws2; exec $term -e fish -c 'tmux-attach codm'
-bindsym Control+Shift+F2 workspace $ws2; exec $term -e fish -c 'tmux-attach fortnite'
-bindsym Control+$mod+Shift+F2 workspace $ws2; exec $term -e fish -c 'tmux-attach crimson'
-# bindsym Control+Shift+F2 workspace $ws2; exec $term -e fish -c 'tmux-attach crimson'
-# bindsym Control+$mod+Shift+F2 workspace $ws2; exec $term -e fish -c 'tmux-attach codm'
+bindsym Control+Shift+F2 workspace $ws2; exec $term -e mosh kmok@192.168.0.1$wl_ip_nast_num -- tmux a -t nzxt
+# bindsym Control+Shift+F2 workspace $ws2; exec $term -e fish -c 'tmux-attach fortnite'
 
 set $ws3 "3 "
 # set $ws3 "3 "
@@ -329,20 +334,23 @@ bindsym Mod4+g workspace $ws3; layout tabbed; exec gimp
 set $ws4 "4 "
 workspace $ws4 output $secondary
 bindsym $mod+F4 workspace $ws4; exec $term
+bindsym Mod4+$mod+F4 workspace $ws4; exec urxvt
 
 set $ws5 "5 "
 # workspace $ws5 output $secondary
 assign [class="Steam"] $ws5
 bindsym $mod+F5 workspace $ws5; exec $browser
-bindsym $mod+Mod4+F5 workspace $ws5; exec firefox --private-window
+bindsym $mod+Mod4+F5 workspace $ws5; exec chromium
+# bindsym $mod+Mod4+F5 workspace $ws5; exec firefox --private-window
+bindsym $mod+Shift+F5 workspace $ws5; exec firefox --private-window
 # bindsym Mod4+g workspace $ws5; layout stacking; exec $term -e steam
 # bindsym Mod4+g workspace $ws5; layout tabbed; exec gimp
 # bindsym Mod4+g workspace $ws5; exec mgba-qt
-bindsym Mod4+i workspace $ws5; exec idea
+# bindsym Mod4+i workspace $ws5; exec idea
 # bindsym Mod4+m workspace $ws5; layout tabbed; exec $term -e ~/.minetest/minetest/bin/minetest
 bindsym Mod4+$mod+t workspace $ws5; exec thunderbird
 # bindsym Mod4+$mod+w workspace $ws5; exec $term -e twitchy
-bindsym Mod4+w workspace $ws5; exec $term -e twitchy
+# bindsym Mod4+w workspace $ws5; exec $term -e twitchy
 bindsym Mod4+5 workspace $ws5; exec godot
 bindsym Mod4+F5 workspace $ws5; exec cd ~/coding/ada-mario && godot -e
 # for_window [class="Move_mouse_with_head"] floating enable; move absolute position 0 0
@@ -356,8 +364,8 @@ set $ws6 "6 "
 workspace $ws6 output $secondary
 assign [class="Slack"] $ws6
 # bindsym Mod4+$mod+d workspace $ws6; exec discord
-# bindsym Mod4+d workspace $ws6; exec riot-desktop
-bindsym Mod4+d workspace $ws6; exec firefox -new-window https://riot.im/app
+bindsym Mod4+d workspace $ws6; exec riot-desktop
+# bindsym Mod4+d workspace $ws6; exec firefox -new-window https://riot.im/app
 bindsym Mod4+$mod+d workspace $ws6; exec discord
 # bindsym Mod4+d workspace $ws6; exec discord
 # bindsym Mod4+$mod+d workspace $ws6; exec riot-desktop
@@ -369,6 +377,8 @@ set $ws7 "7 "
 workspace $ws7 output $secondary
 # bindsym $mod+F7 workspace $ws7; exec $term
 bindsym $mod+F7 workspace $ws7; exec $term -e mosh --ssh='ssh -p 399' kevin@165.22.239.234 tmux a
+# bindsym Mod4+$mod+F7 workspace $ws7; exec $term -e fish -c 'mosh kmok@192.168.0.16 -- tmux a -t weechat'
+bindsym Mod4+i workspace $ws7; exec $term -e fish -c 'mosh kmok@192.168.0.1$wl_ip_nast_num -- tmux a -t weechat'
 bindsym Mod4+a workspace $ws7; exec android-file-transfer
 # bindsym Mod4+v workspace $ws7; exec VBoxManage startvm "369-a1"
 
@@ -378,6 +388,7 @@ workspace $ws8 output $secondary
 # bindsym $mod+F8 workspace $ws8; exec $term
 # bindsym $mod+F8 workspace $ws8; exec $term -e tmux a -t journal
 bindsym $mod+F8 workspace $ws8; exec $term -e fish -c 'tmux-attach journal'
+bindsym Mod4+$mod+F8 workspace $ws8; exec libreoffice ~/Documents/red-hat/workday.ods
 
 set $ws9 "9 "
 workspace $ws9 output $secondary
diff --git a/dot_config/kitty/kitty.conf b/dot_config/kitty/kitty.conf
index 167b056..9df52c1 100644
--- a/dot_config/kitty/kitty.conf
+++ b/dot_config/kitty/kitty.conf
@@ -1,7 +1,12 @@
 include ~/.cache/wal/colors-kitty.conf
+/* background_opacity .7 */
 background_opacity .8
+clipboard_control write-clipboard write-primary
+enable_audio_bell no
 
 # font
+cursor_blink_interval 0
+# font_size 12.5
 font_size 12
 map ctrl+alt+up change_font_size all +1.0
 map ctrl+alt+down change_font_size all -1.0
diff --git a/dot_config/mpv/input.conf b/dot_config/mpv/input.conf
index c98738e..c142deb 100755
--- a/dot_config/mpv/input.conf
+++ b/dot_config/mpv/input.conf
@@ -25,5 +25,7 @@ m revert-seek mark         # mark position for revert-seek
 Shift+m revert-seek
 
 # subtitle delay
-z add sub-delay +0.25
-Z add sub-delay -0.25
+# z add sub-delay +0.25
+# Z add sub-delay -0.25
+u add sub-delay -0.25
+i add sub-delay +0.25
diff --git a/dot_config/ranger/rc.conf.tmpl b/dot_config/ranger/rc.conf.tmpl
index ac26516..153e686 100755
--- a/dot_config/ranger/rc.conf.tmpl
+++ b/dot_config/ranger/rc.conf.tmpl
@@ -166,8 +166,9 @@ set autoupdate_cumulative_size false
 set show_cursor false
 
 # One of: size, natural, basename, atime, ctime, mtime, type, random
-set sort natural
+# set sort natural
 # set sort extension
+set sort ctime
 
 # Additional sorting options
 set sort_reverse false
@@ -665,9 +666,10 @@ set preview_images true
 # * urxvt-full:
 #   The same as urxvt but utilizing not only the preview pane but the
 #   whole terminal window.
-set preview_images_method w3m
+# set preview_images_method w3m
+# set preview_images_method kitty
 # set preview_images_method ueberzug
-# set preview_images_method urxvt
+set preview_images_method urxvt
 # set preview_images_method urxvt-full
 
 #  ]]] image preview # 
diff --git a/dot_taskrc b/dot_taskrc
index 34f813b..d4add9a 100644
--- a/dot_taskrc
+++ b/dot_taskrc
@@ -51,11 +51,12 @@ taskd.credentials=Hevin\/Kevin\/eb6225dc-80fb-4721-8b03-9114c6c4423d
 
 urgency.due.coefficient=18
 urgency.user.project.codm.coefficient=2
-urgency.user.project.crim.coefficient=5
+urgency.user.project.crim.coefficient=1
+urgency.user.project.fn.coefficient=5
 urgency.user.project.mny.coefficient=7
 urgency.user.project.ms.coefficient=3
-urgency.user.project.pey.coefficient=7
-urgency.user.project.sch.coefficient=10
+urgency.user.project.pey.coefficient=10
+urgency.user.project.sch.coefficient=7
 urgency.uda.priority.H.coefficient=10
 urgency.uda.priority.L.coefficient=-7
 urgency.uda.priority..coefficient=1
diff --git a/dot_vimrc.tmpl b/dot_vimrc.tmpl
index eed49b3..13b6ba2 100644
--- a/dot_vimrc.tmpl
+++ b/dot_vimrc.tmpl
@@ -65,7 +65,8 @@ autocmd FileType *css,gitcommit,haskell,htmldjango,html,javascript,json,lisp,mar
 " autocmd Filetype html set foldmarker=0
 autocmd BufNewFile,BufRead *.gd set expandtab!
 autocmd Filetype go set expandtab! sw=4
-autocmd FileType html,javascript,python,lua set fdm=indent
+" autocmd FileType go,groovy,html,java,javascript,Jenkinsfile,python,lua set fdm=indent
+autocmd FileType go,groovy,html,java,javascript,python,lua set fdm=indent
 autocmd Filetype markdown let g:AutoPairs = {'(':')', '[':']', '{':'}','"':'"', "`":"`", '```':'```', '"""':'"""', "'''":"'''", "*":"*"}
 " autocmd Filetype markdown map <F8> :LivedownToggle<CR>
 autocmd Filetype markdown map <F8> :InstantMarkdownPreview<CR>
@@ -271,8 +272,13 @@ Plug 'terryma/vim-multiple-cursors'
 Plug 'dag/vim-fish'
 " live preview Markdown"
 " Plug 'shime/vim-livedown'
-Plug 'suan/vim-instant-markdown', {'for': 'markdown'}
-  let g:instant_markdown_autostart = 0
+" Plug 'suan/vim-instant-markdown', {'for': 'markdown'}
+  " let g:instant_markdown_autostart = 0
+  " let g:instant_markdown_port = 8888
+" Plug 'iamcco/markdown-preview.nvim', { 'do': 'cd app & yarn install' }
+  " let g:mkdp_auto_start = 1
+  " let g:mkdp_browser = 'firefox'
+  " let g:mkdp_echo_preview_url = 1
 " git helper
 Plug 'tpope/vim-fugitive'
 " auto reload file
@@ -329,6 +335,9 @@ Plug 'masukomi/vim-markdown-folding'
   autocmd FileType markdown set foldexpr=NestedMarkdownFolds()
 Plug 'cespare/vim-toml'
 Plug 'dpelle/vim-LanguageTool'
+" increment dates with C-a
+Plug 'tpope/vim-speeddating'
+Plug 'martinda/Jenkinsfile-vim-syntax'
 " ]]] vim-plug "
 
 " Mappings [[[ "
@@ -398,6 +407,7 @@ nnoremap <leader>ft :se ft?<CR>
 " check todo's
 nnoremap <leader>ftd /TODO<CR>
 nnoremap <leader>g :YcmCompleter GoTo<CR>
+nnoremap <leader>gb <C-O>
 " vimdiff split
 nnoremap <leader>gd :Gvdiff 
 nnoremap <leader>gdh :Gvdiff HEAD^
diff --git a/txt/exclude-dirs-backup.txt.tmpl b/txt/exclude-dirs-backup.txt.tmpl
index 954342d..6018729 100644
--- a/txt/exclude-dirs-backup.txt.tmpl
+++ b/txt/exclude-dirs-backup.txt.tmpl
@@ -19,3 +19,5 @@
 /tmp
 /var/cache/pacman
 /var/lib/systemd/coredump
+/var/lib/dhcpcd/proc
+/var/log/journal
diff --git a/txt/nzxt-all.txt b/txt/nzxt-all.txt
index 289e1f7..bf4f6d5 100644
--- a/txt/nzxt-all.txt
+++ b/txt/nzxt-all.txt
@@ -2,14 +2,18 @@ acestream-engine
 acestream-player
 alsa-utils
 android-file-transfer
+angular-cli
 antimicro
 apache
 arch-install-scripts
 arno-iptables-firewall
+asciinema
 asp
+audacity
 aurvote
 autoconf
 automake
+baka-mplayer
 bash
 bat
 bc
@@ -19,7 +23,7 @@ bison
 bookworm
 broadcom-wl
 browserpass
-bukuserver
+buku-git
 bzip2
 calcurse
 certbot
@@ -30,6 +34,7 @@ cliqz-bin
 cloc
 cmake
 cmatrix
+code
 colordiff
 compton-tryone-git
 coreutils
@@ -37,6 +42,7 @@ cowsay
 cronie
 cryptsetup
 curseradio-git
+dash
 dateutils
 device-mapper
 dhcpcd
@@ -44,10 +50,12 @@ dialog
 diffutils
 discord
 dmenu
+docker
 doxygen
 dragon-drag-and-drop-git
 dunst
 e2fsprogs
+eclipse-java
 ecryptfs-simple
 ecryptfs-utils
 electrum
@@ -55,6 +63,7 @@ emacs
 encfs
 evince
 fakeroot
+fbreader
 fd
 feh
 ffcast
@@ -66,6 +75,7 @@ fish
 flashplugin
 flashplugin-focusfix
 flex
+flowblade
 fortune-mod
 fzf
 gawk
@@ -75,14 +85,13 @@ gdb
 gettext
 gimp
 git
+git-lfs
 glibc
-godot-bin
 gotop-bin
 gradle
 grep
 grub
 gzip
-habitctl-git
 handbrake
 hdf5
 heroku-cli
@@ -103,9 +112,12 @@ intellij-idea-community-edition
 iproute2
 iputils
 irrlicht
+itch
+jdk-openjdk
 jfsutils
 jmtpfs
 jp2a
+jre-openjdk-headless
 junit
 kitty
 less
@@ -116,10 +128,11 @@ licenses
 linux
 linux-firmware
 linux-headers
-linux-kevin
-linux-kevin-headers
+linux-lts
+linux-lts-headers
 linux-nzxt
 linux-nzxt-headers
+lmms
 logrotate
 lolcat
 lsd
@@ -127,6 +140,7 @@ lsof
 lua-cjson
 lvm2
 lxappearance
+maim
 make
 man-db
 man-pages
@@ -155,9 +169,12 @@ numlockx
 nvidia-dkms
 nvidia-settings
 nx3-all
+obs-studio
 openshot
 openssh
+openvpn
 os-prober
+otf-ipafont
 p7zip
 pacman
 pacman-contrib
@@ -170,19 +187,27 @@ pdfgrep
 peaclock
 peek
 perl
+perl-file-mimeinfo
 perl-image-exiftool
+pfetch-git
 pgadmin4
 pipes.sh
 pkgconf
+podman
 postgresql
 procps-ng
 psmisc
 pulseaudio
 pycp
+pyenv
 pyside2
 python-dbus
+python-discord
 python-numpy
 python-pip
+python-praw
+python-prettytable
+python-pynvim
 python-pywal
 python-setuptools
 python-tinydb
@@ -210,6 +235,7 @@ qt5-scxml
 qt5-serialbus
 qt5-serialport
 qt5-speech
+qt5-styleplugins
 qt5-tools
 qt5-translations
 qt5-virtualkeyboard
@@ -219,25 +245,31 @@ qt5-webglplugin
 qt5-websockets
 qt5-webview
 qt5-xmlpatterns
+racket
 ranger
 redshift
 reiserfsprogs
 riot-desktop
 ripgrep
 robo3t-bin
+rot13
 rsync
-rxvt-unicode-patched
+runelite
+rxvt-unicode-pixbuf-patched
 s-nail
 sc-im
+scrcpy
 scrot
 sdcv
 sed
 shadow
+shadowfox-updater
 shellcheck
 simple-mtpfs
 sl
 slack-desktop-dark
 smartmontools
+soundcloud-dl-git
 spatialindex
 spotify
 spotify-now-git
@@ -263,12 +295,11 @@ tasksh
 tcpdump
 termdown
 texinfo
+texlive-bibtexextra
 texlive-core
 texlive-local-adjustbox
 texlive-local-algorithmicx
 texlive-local-algorithms
-texlive-local-biblatex
-texlive-local-biblatex-apa
 texlive-local-capt-of
 texlive-local-collectbox
 texlive-local-csquotes
@@ -281,11 +312,11 @@ texlive-local-forest
 texlive-local-gfsdidot
 texlive-local-ifmtarg
 texlive-local-inlinedef
-texlive-local-logreq
 texlive-local-multirow
 texlive-local-numprint
 texlive-local-pgfopts
 texlive-local-pgfplots
+texlive-local-preprint
 texlive-local-siunitx
 texlive-local-sourcesanspro
 texlive-local-tcolorbox
@@ -296,11 +327,11 @@ texlive-local-tkz-euclide
 texlive-local-trimspaces
 texlive-local-was
 texlive-local-xifthen
-texlive-localmanager-git
 the_silver_searcher
 thunderbird
 tidy
 time
+tk
 tmux
 tor
 traceroute
@@ -309,6 +340,7 @@ transmission-gtk
 trizen
 ttf-dejavu
 ttf-font-awesome
+ttf-hack
 ttf-joypixels
 ttf-ubuntu-font-family
 udisks2
@@ -386,6 +418,7 @@ xorg-xvinfo
 xorg-xwd
 xorg-xwininfo
 xorg-xwud
+xsv
 xvkbd
 yad
 yay
@@ -396,3 +429,4 @@ zathura-pdf-mupdf
 zbar
 zip
 zsh
+zulip-desktop-git
diff --git a/txt/nzxt-aur.txt b/txt/nzxt-aur.txt
index 90983b5..af17554 100644
--- a/txt/nzxt-aur.txt
+++ b/txt/nzxt-aur.txt
@@ -1,30 +1,30 @@
 acestream-engine
 acestream-player
+angular-cli
 antimicro
 arno-iptables-firewall
 aurvote
 bear
-bukuserver
+buku-git
 chromium-widevine
 cliqz-bin
 compton-tryone-git
 curseradio-git
 dragon-drag-and-drop-git
+eclipse-java
 ecryptfs-simple
 ffcast
 flashplugin-focusfix
-godot-bin
+flowblade
 gotop-bin
-habitctl-git
 heroku-cli
 htop-vim-git
 i3-gaps-rounded
 i3blocks-git
 insomnia
+itch
 jmtpfs
 libavutil-52
-linux-kevin
-linux-kevin-headers
 linux-nzxt
 linux-nzxt-headers
 lua-cjson
@@ -35,26 +35,32 @@ nerd-fonts-dejavu-complete
 nerd-fonts-hack
 nx3-all
 peaclock
+pfetch-git
 pipes.sh
 pycp
+python-discord
 python-tinydb
 qdirstat
 robo3t-bin
-rxvt-unicode-patched
+rot13
+runelite
+rxvt-unicode-pixbuf-patched
 sc-im
+scrcpy
+shadowfox-updater
 simple-mtpfs
 slack-desktop-dark
+soundcloud-dl-git
 spotify
 spotify-now-git
 steamos-xpad-dkms
+surf
 systemd-numlockontty
 taskopen
 tasksh
 texlive-local-adjustbox
 texlive-local-algorithmicx
 texlive-local-algorithms
-texlive-local-biblatex
-texlive-local-biblatex-apa
 texlive-local-capt-of
 texlive-local-collectbox
 texlive-local-csquotes
@@ -67,11 +73,11 @@ texlive-local-forest
 texlive-local-gfsdidot
 texlive-local-ifmtarg
 texlive-local-inlinedef
-texlive-local-logreq
 texlive-local-multirow
 texlive-local-numprint
 texlive-local-pgfopts
 texlive-local-pgfplots
+texlive-local-preprint
 texlive-local-siunitx
 texlive-local-sourcesanspro
 texlive-local-tcolorbox
@@ -82,13 +88,16 @@ texlive-local-tkz-euclide
 texlive-local-trimspaces
 texlive-local-was
 texlive-local-xifthen
-texlive-localmanager-git
 trizen
 urxvt-resize-font-git
 vidir
 weechat-vimode-git
 wego
 wpa_actiond
+xbindkeys
+xf86-input-keyboard
+xf86-input-mouse
+xsv
 xvkbd
-yad
 yay
+zulip-desktop-git
diff --git a/txt/nzxt-pkgs.txt b/txt/nzxt-pkgs.txt
index a4d0240..160dec0 100644
--- a/txt/nzxt-pkgs.txt
+++ b/txt/nzxt-pkgs.txt
@@ -2,9 +2,12 @@ alsa-utils
 android-file-transfer
 apache
 arch-install-scripts
+asciinema
 asp
+audacity
 autoconf
 automake
+baka-mplayer
 bash
 bat
 bc
@@ -21,11 +24,13 @@ chromium
 cloc
 cmake
 cmatrix
+code
 colordiff
 coreutils
 cowsay
 cronie
 cryptsetup
+dash
 dateutils
 device-mapper
 dhcpcd
@@ -33,6 +38,7 @@ dialog
 diffutils
 discord
 dmenu
+docker
 doxygen
 dunst
 e2fsprogs
@@ -42,6 +48,7 @@ emacs
 encfs
 evince
 fakeroot
+fbreader
 fd
 feh
 file
@@ -60,6 +67,7 @@ gdb
 gettext
 gimp
 git
+git-lfs
 glibc
 gradle
 grep
@@ -80,8 +88,10 @@ intellij-idea-community-edition
 iproute2
 iputils
 irrlicht
+jdk-openjdk
 jfsutils
 jp2a
+jre-openjdk-headless
 junit
 kitty
 less
@@ -91,12 +101,16 @@ licenses
 linux
 linux-firmware
 linux-headers
+linux-lts
+linux-lts-headers
+lmms
 logrotate
 lolcat
 lsd
 lsof
 lvm2
 lxappearance
+maim
 make
 man-db
 man-pages
@@ -119,9 +133,12 @@ ntp
 numlockx
 nvidia-dkms
 nvidia-settings
+obs-studio
 openshot
 openssh
+openvpn
 os-prober
+otf-ipafont
 p7zip
 pacman
 pacman-contrib
@@ -133,17 +150,23 @@ pcmanfm
 pdfgrep
 peek
 perl
+perl-file-mimeinfo
 perl-image-exiftool
 pgadmin4
 pkgconf
+podman
 postgresql
 procps-ng
 psmisc
 pulseaudio
+pyenv
 pyside2
 python-dbus
 python-numpy
 python-pip
+python-praw
+python-prettytable
+python-pynvim
 python-pywal
 python-setuptools
 qalculate-gtk
@@ -169,6 +192,7 @@ qt5-scxml
 qt5-serialbus
 qt5-serialport
 qt5-speech
+qt5-styleplugins
 qt5-tools
 qt5-translations
 qt5-virtualkeyboard
@@ -178,6 +202,7 @@ qt5-webglplugin
 qt5-websockets
 qt5-webview
 qt5-xmlpatterns
+racket
 ranger
 redshift
 reiserfsprogs
@@ -201,7 +226,6 @@ steam-native-runtime
 stow
 subtitleeditor
 sudo
-surf
 sxiv
 sysfsutils
 sysstat
@@ -211,11 +235,13 @@ task
 tcpdump
 termdown
 texinfo
+texlive-bibtexextra
 texlive-core
 the_silver_searcher
 thunderbird
 tidy
 time
+tk
 tmux
 tor
 traceroute
@@ -223,6 +249,7 @@ transmission-cli
 transmission-gtk
 ttf-dejavu
 ttf-font-awesome
+ttf-hack
 ttf-joypixels
 ttf-ubuntu-font-family
 udisks2
@@ -242,12 +269,9 @@ wireless_tools
 wkhtmltopdf
 wpa_supplicant
 xautomation
-xbindkeys
 xclip
 xdotool
 xf86-input-evdev
-xf86-input-keyboard
-xf86-input-mouse
 xf86-input-synaptics
 xf86-input-vmmouse
 xf86-input-void
@@ -295,6 +319,7 @@ xorg-xvinfo
 xorg-xwd
 xorg-xwininfo
 xorg-xwud
+yad
 youtube-dl
 youtube-viewer
 zathura