Update

2019-12-29 19:01:31 -05:00
parent dd5b0c8179
commit 2a60472dcb
23 changed files with 186 additions and 70 deletions
--- a/aliases/key_aliases.tmpl
+++ b/aliases/key_aliases.tmpl
@@ -14,7 +14,7 @@ fi "fish"
 # reload urxvt
 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"
+dua "du -ah --apparent-size | sort -h"
 # list file sizes in megabytes with depth 1
 # duh "sudo du -d 1 -h --apparent-size | sort -h"
 # dum "sudo du -d 1 -m --apparent-size | sort -h"
@@ -31,8 +31,8 @@ td "tldr"
 xr "xrandr"

 {{ if eq .chezmoi.fullHostname "nzxt" }}
-xrn "xrandr --output HDMI-0 --rotate normal" 
-xrr "xrandr --output HDMI-0 --rotate right" 
+xrn "xrandr --output HDMI-0 --rotate normal && grep wallpaper ~/.cache/wal/colors.sh | cut -d\' -f2 | xargs wal -i > /dev/null" 
+xrr "xrandr --output HDMI-0 --rotate right && grep wallpaper ~/.cache/wal/colors.sh | cut -d\' -f2 | xargs wal -i > /dev/null" 
 {{ end }}

 {{ if eq .chezmoi.fullHostname "x1-carbon" }}
@@ -45,7 +45,7 @@ xrs "xrandr -s 0"
 # ]]] display #

 ngb "sudo nvim /etc/default/grub"
-mkgb "sudo grub-mkconfig -o /boot/grub/grub.cfg"
+mgb "sudo grub-mkconfig -o /boot/grub/grub.cfg"

 # a "bat"
 ba "bat"
@@ -91,8 +91,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 -P 399 kevin@165.22.239.234"
 # phone
-ssp "mosh --ssh='ssh -p 8022' 192.168.0.13"
-sfp "sftp -P 8022 192.168.0.13"
+ssp "mosh --ssh='ssh -p 8022' 192.168.0.14"
+sfp "sftp -P 8022 192.168.0.14"
 # test server sites
 # svp "firefox git.ataraxy.tk khkm.tk cal.khkm.tk pste.gq smol.gq twem.tk"
 # postgres ssh tunnel
@@ -259,7 +259,7 @@ spipi "sudo pip install"

 # internet [[[ #

-pg "ping -c 2 -W 1 8.8.8.8"
+pg2 "ping -c 2 -W 1 8.8.8.8"
 pgc "ping 8.8.8.8"
 dh "sudo dhcpcd"
 kdh "sudo killall dhcpcd"
@@ -286,15 +286,21 @@ mst "sudo rm ~/st/config.h && sudo bear make -C ~/st install"
 # applications  [[[ #

 # silent="> /dev/null 2>&1& "
+13 "rot13"
 am "antimicro"
 # task [[[ #

 a "task"
 aa "task add"
 aal "task add proj:lnx"
-aam "task add proj:mny"
+aam "task add proj:ms"
+aamy "task add proj:mny"
 aap "task add proj:"
+aacm "task add proj:codm"
+aacr "task add proj:crim"
 aas "task add proj:sch"
+aa2 "task add proj:sch +c324"
+aa8 "task add proj:sch +c384"
 aay "task add proj:pey"
 ac "task context"
 acn "task context none && task"
@@ -302,11 +308,13 @@ ach "task context home && task"
 aco "task context out && task"
 acs "task context sch && task"
 af "task proj:"
+afcm "task proj:codm"
+afcr "task proj:crim"
 apl "task completed"
 al "task limit:15"
 alg "task log"
 ans "task +next"
-ao "taskopen"
+ao "taskopen -A"
 asm "task summary"
 awt "task waiting"
 ay "task sync"
@@ -359,7 +367,7 @@ kd "killall Discord && killall Discord"
 kr "killall electron"
 kt "killall thunderbird"
 lio "libreoffice"
-mp "mpv --volume=50"
+# mpv "mpv --volume=50"
 mra "man ranger"
 # mt "minetest"
 n "nvim"
@@ -384,11 +392,18 @@ stp "termdown"
 # sw "swex"
 t  "tmux"#[[[
 ta "tmux a -t"
+ta2 "tmux a -t 324 || tmux new -s 324"
+ta22 "tmux a -t 324-2 || tmux new -s 324-2"
+ta8 "tmux a -t 384 || tmux new -s 384"
+ta82 "tmux a -t 384-2 || tmux new -s 384-2"
 tacf "tmux a -t config || tmux new -s config"
+tacm "tmux a -t codm || tmux new -s codm"
+tacr "tmux a -t crimson || tmux new -s crimson"
 taj "tmux a -t journal || tmux new -s journal"
 tal "tmux a"
 tc "clear && tmux clear-history" 
-tk "tmux kill-server"
+tk "tmux kill-session -t"
+tks "tmux kill-server"
 tl "tmux ls"
 tn "tmux new -s"
 tnb "tmux new -s backup"
@@ -408,12 +423,12 @@ trx "tar xvzf"

 # pass  [[[ #

-ps "pass"
-psc "pass -c"
-pse "pass edit"
-psi "pass insert -m"
-psg "pass generate -c"
-pss "pass show"
+p "pass"
+pc "pass -c"
+pe "pass edit"
+pi "pass insert -m"
+pg "pass generate -c"
+ps "pass show"

 xc "xclip -selection clipboard"
 yh "echo 'kevin.mok@live.ca' | xclip -selection clipboard"
@@ -430,6 +445,7 @@ w "watson"
 # start [[[ #

 wa "watson start"
+wacm "watson start fun +cod-mobile"
 wae "watson start && watson edit"
 wad "watson add -f '' -t ''"

@@ -452,14 +468,14 @@ wt "watson status"
 # log/report [[[ #

 wl "watson log -Gcd"
-wla "watson log -Gca -p"
-wlat "watson log -Gca -T"
+wla "watson log -Gcap"
+wlat "watson log -GcaT"
 ww "watson log -Gc"
 wwb "watson log -Gc | bat"
 wr "watson report -Gcd"
-wra "watson report -Gca -p"
+wra "watson report -Gcap"
 wram "watson report -Gca | rg -S '^\w.*-\s\d*h' | sort -t' ' -hk3 | sed 's/ - /,/' | xsv table"
-wrat "watson report -Gca -T"
+wrat "watson report -GcaT"
 wrw "watson report -Gc"

 # ]]] log/report #
@@ -485,9 +501,11 @@ gbu "git branch --no-merged"
 gbm "git branch --merged"

 gsm "git submodule"
+gsma "git submodule add"
+gsmi "git submodule init"
 gsmp "git submodule foreach git pull"
 gsmu "git submodule update --recursive --remote"
-
+ 
 gmg "git merge"
 gmgts "git merge -X theirs"
 gmgt "git mergetool"
@@ -507,11 +525,14 @@ gru "git branch --set-upstream-to=origin/master master"
 ga "git add -A && git status -u"
 gac "git add -A && git commit -S"
 gaf "git add -f"
+gal "git lfs track"
 # unsigned commt
 gacu "git add -A && git commit"

 glf "git lfs"
 glfi "git lfs install"
+glfp "git lfs pull"
+glft "git lfs track *"

 grm "git rm"
 grmf "git rm -f"
@@ -531,7 +552,7 @@ gdt "git difftool -w --tool=vimdiff"
 gdtc "git difftool -w --cached --tool=vimdiff"
 gl "git log"
 glm "git log master"
-gsl "git shortlog"
+# gsl "git shortlog"

 # ]]] diff/log #

@@ -556,6 +577,7 @@ gheadm1 "git reset --hard HEAD~1"
 gls "git ls-tree HEAD --name-only"

 gchp "git cherry-pick"
+gchpt "git cherry-pick --strategy=recursive -X theirs"
 gchpc "git cherry-pick --continue"

 gst "git stash"
@@ -729,6 +751,8 @@ wlm "watson log --all --project=minetest"
 wrm "watson report --all --project=minetest"
 wamv "watson start minetest +video"

+# minetest [[[ #
+
 mtg "minetest"
 mts "minetestserver"
 mtsc "minetestserver --gameid minetest --worldname Creative --terminal"
@@ -737,9 +761,13 @@ mtsh "minetestserver --gameid mineclone2 --worldname Hevin-MC --config ~/.minete
 mtsv "minetestserver --gameid minimal --worldname Test --terminal"
 # mtrsy "rsync -vr .minetest/ /mnt/linux-files/.minetest/"

+# ]]] minetest #
+
 tet "pandoc -f markdown -t html twitch-emote-conversion.md | xclip -selection clipboard"
 shrg "printf '¯\\\\\\\\\\_(ツ)_/¯' | xclip -selection clipboard"

+dce "mono DiscordChatExporter.Cli.exe"
+
 # ]]] games #

 # school  [[[ #
@@ -751,13 +779,18 @@ gpa "column -ts',' ~/Documents/gpa.md"
 ssc "mosh mokkar@teach.cs.utoronto.ca"

 # 324
-rhs "clear && tmux clear-history && runhaskell Ex3.hs"
+# hk "clear && tmux clear-history && runhaskell TestChups.hs"
+hk "clear && tmux clear-history && runhaskell"
 rk "clear && tmux clear-history && raco test"
-rki "racket -l racket/base -i"
 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  #
--- a/aliases/key_dirs.tmpl
+++ b/aliases/key_dirs.tmpl
@@ -12,10 +12,10 @@ D  ~/Documents
 k ~/
 lc ~/linux-config
 lf /mnt/linux-files
-lfv /mnt/linux-files/Videos
+Lfv /mnt/linux-files/Videos
 me /run/media/kevin
 o /
-p ~/.password-store
+pd ~/.password-store
 P ~/Pictures
 std ~/st
 # tm /tmp
@@ -37,6 +37,7 @@ drk ~/coding/dark-sky
 hbd ~/.habitctl
 ib ~/linux-config/dot_config/i3blocks/scripts
 ra ~/linux-config/dot_config/ranger
+rd ~/Documents/red-discord-bot
 sr ~/linux-config/scripts
 snp ~/.vim/plugged/vim-snippets/UltiSnips
 sw ~/.local/share/nvim/swap/
@@ -52,12 +53,14 @@ j ~/Documents/journal
 lh ~/Documents/listening-history
 mmd ~/coding/move-mouse-with-head
 ms ~/coding/mf-site
-mh ~/coding/mf-site/layouts
-# mg ~/coding/best-mf-site-personal
+ml ~/coding/mf-site/content/letter
+mp ~/coding/mf-site/static/pdf
+pn ~/coding/red-discord-bot
 sv ~/coding/spotify-lib-vis/src
 svg ~/coding/spotify-lib-vis/src/graphs/static/graphs/scripts
 swd ~/coding/swex
 tb ~/coding/trapbot/src/trapbot
+ur ~/coding/uranium-godot
 wo ~/Documents/workout-logs

 # gaming [[[ #
@@ -69,7 +72,7 @@ mta ~/.minetest/clientmods/custom_aliases
 mtc ~/.minetest/games/mineclone2/mods
 mtm ~/.minetest/minetest

-pk ~/Downloads/gba/mgba/pokemon/emerald/1
+# pk ~/Downloads/gba/mgba/pokemon/emerald/1

 # ]]] gaming #

@@ -85,16 +88,27 @@ adP ~/Pictures/ada-mario

 # ]]] cdn #

+cm ~/Documents/codm
+cs ~/Documents/codm/site
+csi ~/Documents/codm/site/static/images
+Css ~/Pictures/screenshots/mobile/codm
+
 # sch [[[ #

 sc ~/school
 lt ~/school/latex-notes

+# 324
 2 ~/school/324
-2e ~/school/324/e/3
+2a ~/school/324-a2
+2e ~/school/324/e/10
+2f ~/school/324/final
+2l ~/school/324/l/9
+2m ~/school/324/midterm

+# 384
 8 ~/school/384
-8a ~/school/384/a1
-8t ~/school/latex-notes/384/a1
+8a ~/school/384/a4
+# 8t ~/school/latex-notes/384/a2

 # ]]] sch #
--- a/aliases/key_files.tmpl
+++ b/aliases/key_files.tmpl
@@ -56,8 +56,8 @@ tt txt/todo.md
 tm ~/.vim/plugged/vim-snippets/UltiSnips/texmath.snippets
 tp /tmp/
 tw ~/linux-config/dot_taskrc
+w ~/.config/watson/state.tmp
 wh ~/Documents/journal/todo/work-habit.md
-wt ~/.config/watson/state.tmp

 # ]]] cdn #

@@ -81,4 +81,8 @@ wt ~/.config/watson/state.tmp

 # ]]] sch #

+# gaming
+cra ~/Documents/red-discord-bot/repos/gobcog/adventure/data/default/attribs.json
+crm ~/Documents/red-discord-bot/repos/gobcog/adventure/data/default/monsters.json
 mta ~/.minetest/clientmods/custom_aliases/init.lua
+pk ~/Downloads/pokecord/pokecord2.md
--- a/dot_Xresources.tmpl
+++ b/dot_Xresources.tmpl
@@ -50,8 +50,8 @@ URxvt*inheritPixmap: true
 ! URxvt*transparent: false
 ! URxvt*shading: 0 (blackest) to 99 black, 101 to 200 (whitest) white
 ! URxvt*shading: 50
-URxvt*shading: 40
-! URxvt*shading: 35
+! URxvt*shading: 40
+URxvt*shading: 35
 ! urxvt*blurRadius: 10

 /* ]]] transparency */
--- a/dot_config/fish/config.fish.tmpl
+++ b/dot_config/fish/config.fish.tmpl
@@ -17,14 +17,15 @@ set -x GPG_TTY (tty)

 set -U fish_greeting

-# spv
+# spv[[[
 {{ if eq .chezmoi.fullHostname "nzxt" }}
 set -U spv_dir "/home/kevin/coding/spotify-lib-vis"
 set -U mfs_dir "/home/kevin/coding/mf-site"
 source /home/kevin/coding/spotify-lib-vis/src/scripts/api-keys-fish.sh
 abbr hum "cd $mfs_dir && hugo serve -D --disableFastRender"
-{{ end }}
+{{ 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
 set -x LD_LIBRARY_PATH $LD_LIBRARY_PATH /usr/local/lib /usr/local/lib64
@@ -32,27 +33,34 @@ 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 }}
+#]]]

-{{ if eq .linux_os "termux" }}
-# 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
+# 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
+# set SPACEFISH_PROMPT_ORDER vi_mode dir git pyenv exec_time jobs exit_code line_sep char
 set SPACEFISH_DIR_PREFIX ''
-set SPACEFISH_PROMPT_ORDER vi_mode dir git pyenv exec_time jobs exit_code line_sep char
+set SPACEFISH_DIR_TRUNC 0
+set SPACEFISH_DIR_TRUNC_REPO false
 set SPACEFISH_VI_MODE_INSERT ''
 set SPACEFISH_VI_MODE_NORMAL '[n] '
 set SPACEFISH_VI_MODE_SUFFIX ''
-{{ end }}
+#]]]

+# pass[[[
 set -x PASSWORD_STORE_CLIP_TIME 120
 set -xU XSET_RATE 90
 set -xU XSET_DELAY 200
 {{ if and (eq .chezmoi.fullHostname "x1-carbon") (not (eq .chezmoi.username "root")) }}
 xset r rate $XSET_DELAY $XSET_RATE
-{{ end }}
+{{ end }}#]]]

 # set -U BROWSER "chromium"
 set -xU BROWSER "firefox"

+set -xU FZF_DEFAULT_COMMAND "find ."
+
 # ]]] universal var's #

 # fish-specific [[[ #
@@ -71,7 +79,7 @@ chezmoi apply
 {{ if not (eq .linux_os "termux") }}
  ~/scripts/sync-shortcuts
 {{ end }}
-source ~/.config/fish/key_abbr.fish > /dev/null
+# source ~/.config/fish/key_abbr.fish > /dev/null
 set -U fish_fxn_dir "{{ .chezmoi.homedir }}/linux-config/dot_config/fish/functions"
 # set -U fish_fxn_dir "~/.config/fish/functions"
 abbr ff "cd $fish_fxn_dir"
@@ -109,10 +117,12 @@ abbr ant "task-notes"
 abbr apr "task-mod-pri"
 abbr aprl "task-mod-pri L"
 abbr aprm "task-mod-pri M"
+abbr aprn "task-mod-pri ''"
 abbr aprh "task-mod-pri H"
 abbr apj "task-mod-proj"
-abbr at "task-mod-tag"
 abbr asr "task-start"
+abbr at "task-mod-tag"
+abbr aw "task-wait"
 abbr ax "task-context"

 # ]]] task #
@@ -131,7 +141,7 @@ abbr def "define"
 abbr ens "enable-site"
 abbr ev "evince-silent"
 # abbr fbg "find-bg"
-abbr fv "fzf-vim"
+abbr fn "fzf-vim"
 abbr fvft "find-vim-filetype"
 # git [[[ #

@@ -157,6 +167,7 @@ abbr pgr "grep-pdf"
 abbr pgrf "grep-pdf-file"
 abbr png "git-push-new-gitea"
 abbr pst "pastebin"
+abbr qh "qalc-history"
 abbr rf "refresh-config"
 abbr rs "redshift-set"
 abbr sma "smol-add"
@@ -167,6 +178,7 @@ abbr shrm "shred-rm"
 abbr shs "scan-history"
 abbr svp "server-pages"
 abbr thes "thesaurus"
+abbr usc "us-to-cad"
 abbr ut "unix-timestamp"
 abbr uzr "unzip-rm"
 abbr vsnp "vim-snippet"
--- a/dot_config/fish/functions/fish_mode_prompt.fish
+++ b/dot_config/fish/functions/fish_mode_prompt.fish
--- a/dot_config/fish/functions/git-log-short.fish
+++ b/dot_config/fish/functions/git-log-short.fish
@@ -0,0 +1,3 @@
+function git-log-short
+    git log --pretty="%C(Yellow)%h  %C(reset)%ad (%C(Green)%cr%C(reset))%x09 %C(Cyan)%an: %C(reset)%s"
+end
--- a/dot_config/fish/functions/pastebin.fish
+++ b/dot_config/fish/functions/pastebin.fish
@@ -1,5 +1,6 @@
 function pastebin
    # cat $argv[1] | curl -F 'sprunge=<-' http://sprunge.us
    # set -x HASTE_SERVER https://pste.gq
-    cat $argv[1] | haste --raw
+    # cat $argv[1] | haste --raw
+    cat $argv[1] | haste
 end
--- a/dot_config/fish/functions/qalc-history.fish
+++ b/dot_config/fish/functions/qalc-history.fish
@@ -0,0 +1,3 @@
+function qalc-history
+    qalc $argv[1] | tee -a /home/kevin/Documents/journal/personal/calc-history.md
+end
--- a/dot_config/fish/functions/task/task-next-rm.fish
+++ b/dot_config/fish/functions/task/task-next-rm.fish
@@ -1,4 +1,4 @@
 function task-next-rm
-    task $argv[1] modify -nx
+    task $argv[1] modify -next
    and task
 end
--- a/dot_config/fish/functions/task/task-next.fish
+++ b/dot_config/fish/functions/task/task-next.fish
@@ -1,4 +1,4 @@
 function task-next
-    task $argv[1] modify +nx
+    task $argv[1] modify +next
    and task
 end
--- a/dot_config/fish/functions/task/task-wait.fish
+++ b/dot_config/fish/functions/task/task-wait.fish
@@ -0,0 +1,4 @@
+function task-wait
+    task $argv[1] mod wait:+$argv[2]
+    and task
+end
--- a/dot_config/fish/functions/us-to-cad.fish
+++ b/dot_config/fish/functions/us-to-cad.fish
@@ -0,0 +1,3 @@
+function us-to-cad
+    qalc "$argv[1]\$ to CAD"
+end
--- a/dot_config/i3/config.tmpl
+++ b/dot_config/i3/config.tmpl
@@ -16,6 +16,7 @@ exec wal -i $(/home/kevin/scripts/shuffler "$HOME/Pictures/Backgrounds/dim/non-e
 # 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'
 exec --no-startup-id i3-msg 'workspace $ws3; exec $browser'
+exec --no-startup-id i3-msg 'workspace $ws6; exec discord'

 #  ]]] startup # 

@@ -50,7 +51,9 @@ bindsym Mod4+c exec $browser
 bindsym Mod4+e exec ~/scripts/twem
 bindsym Mod4+f exec firefox
 # bindsym Mod4+$mod+f exec printf 'Kevin@fosstodon.org' | xclip -selection clipboard
-bindsym Mod4+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+$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'
 # bindsym Mod4+$mod+m exec pass -c uoft/markus
@@ -60,20 +63,21 @@ 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 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+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 printf 'kevin.mok@mail.utoronto.ca' | xclip -selection clipboard
 bindsym Mod4+u exec $type_delay_cmd && xdotool type 'kevin.mok@mail.utoronto.ca'
 # bindsym Mod4+$mod+u exec pass -c uoft/acorn
 bindsym Mod4+w exec notify-send "watson status" "$(watson status)"
 bindsym Mod4+$mod+w exec notify-send "watson stop" "$(watson status && watson stop)"
 bindsym Control+Mod4+w exec $term -e nvim /home/kevin/.config/watson/state.tmp
 # bindsym Mod4+x exec $swex
+bindsym Control+$mod+x exec $type_delay_cmd && xdotool type 'http://codm.ataraxy.tk/'
 bindsym Mod4+z exec cliqz
 {{ if .ext_kb }}
 bindsym Mod4+x exec ~/scripts/xmodmap-custom
@@ -299,6 +303,9 @@ bindsym $mod+F1 workspace $ws1; exec $term
 set $ws2 "2 "
 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 crimson'
+bindsym Control+$mod+Shift+F2 workspace $ws2; exec $term -e fish -c 'tmux-attach codm'

 set $ws3 "3 "
 # set $ws3 "3 "
@@ -319,6 +326,7 @@ 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 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
@@ -337,8 +345,10 @@ for_window [class="ada-mario"] move absolute position 640 0
 set $ws6 "6 "
 workspace $ws6 output $secondary
 assign [class="Slack"] $ws6
-# bindsym Mod4+d workspace $ws6; exec discord
-bindsym Mod4+d workspace $ws6; exec riot-desktop
+# bindsym Mod4+$mod+d workspace $ws6; exec discord
+# bindsym Mod4+d workspace $ws6; exec riot-desktop
+bindsym Mod4+d workspace $ws6; exec discord
+bindsym Mod4+$mod+d workspace $ws6; exec riot-desktop
 # bindsym Mod4+i workspace $ws6; exec firefox -new-window https://riot.im/app/#/home
 bindsym Mod4+k workspace $ws6; exec slack

@@ -368,7 +378,7 @@ workspace $ws10 output $secondary
 set $hp 2
 # bindsym Mod4+v workspace $ws10; exec $term -e alsamixer -c 0
 bindsym Mod4+v workspace $ws10; exec $term -e alsamixer -c 1
-bindsym Mod4+$mod+c workspace $ws10; exec $term -e cava
+# bindsym Mod4+$mod+c workspace $ws10; exec $term -e cava
 # bindsym Mod4+h workspace $ws10; exec $term -e alsamixer -c $hp
 bindsym Mod4+s workspace $ws10; exec spotify

--- a/dot_config/neofetch/config.conf
+++ b/dot_config/neofetch/config.conf
@@ -337,7 +337,7 @@ public_ip_host="http://ident.me"
 #      'Disk (/): 74G / 118G (66%)'
 #
 # disk_show=('/' '/home' '/mnt/linux-files' )
-disk_show=('/dev/sda1' '/dev/sda3' '/dev/sdc2' )
+disk_show=('/dev/sda1' '/dev/sda3' '/dev/sdb2' )

 # Disk subtitle.
 # What to append to the Disk subtitle.
--- a/dot_config/ranger/rc.conf.tmpl
+++ b/dot_config/ranger/rc.conf.tmpl
@@ -680,7 +680,8 @@ map rr source ~/.config/ranger/rc.conf

 #  backgrounds [[[ # 

-map w shell /usr/bin/wal -i %f && sudo ~/st/make-st.sh
+# map w shell /usr/bin/wal -i %f && sudo ~/st/make-st.sh
+map w shell /usr/bin/wal -i %f
 map bde shell mv %f /home/kevin/Pictures/Backgrounds/dim/editing
 map bdn shell mv %f /home/kevin/Pictures/Backgrounds/dim/non-editing
 map bbe shell mv %f /home/kevin/Pictures/Backgrounds/bright/editing
--- a/dot_gitconfig.tmpl
+++ b/dot_gitconfig.tmpl
@@ -1,7 +1,7 @@
 [user]
-	email = kevin.mok@live.ca
+	email = me@kevin-mok.com
 	name = Kevin Mok
-	signingkey = AEA75288DC135CF5
+	signingkey = 6E920656BBAD3E6C
 [color]
 	ui = auto
 [core]
--- a/11
+++ b/11
@@ -49,9 +49,13 @@ taskd.credentials=Hevin\/Kevin\/eb6225dc-80fb-4721-8b03-9114c6c4423d

 #  urgency {{{ # 

+urgency.due.coefficient=18
+urgency.user.project.codm.coefficient=2
+urgency.user.project.crim.coefficient=7
+urgency.user.project.mny.coefficient=7
 urgency.user.project.ms.coefficient=3
-urgency.user.project.pey.coefficient=7
-urgency.user.project.sch.coefficient=5
+urgency.user.project.pey.coefficient=5
+urgency.user.project.sch.coefficient=7
 urgency.uda.priority.H.coefficient=10
 urgency.uda.priority.L.coefficient=-7
 urgency.uda.priority..coefficient=1
@@ -63,6 +67,7 @@ urgency.user.tag.nx.coefficient=15

 # context.home=project.not:ieas project.not:out project.not:sch tag.not:amn
 context.home=project.not:ieas project.not:out
+context.ieas=project:ieas
 context.out=project:out 
 context.sch=project:sch

@@ -71,3 +76,5 @@ context=home
 # context=sch

 #  }}} context # 
+
+report.ready.sort=urgency-
--- a/dot_tmux.conf
+++ b/dot_tmux.conf
@@ -57,8 +57,8 @@ bind-key -n M-a command-prompt "rename-window '%%'"

 bind-key -n M-p previous-window
 bind-key -n M-n next-window
-bind-key -n C-Left swap-window -t -1
-bind-key -n C-Right swap-window -t +1
+bind-key -n C-Left swap-window -t -1; previous-window
+bind-key -n C-Right swap-window -t +1; next-window

 #  }}} windows # 

--- a/dot_vimrc.tmpl
+++ b/dot_vimrc.tmpl
@@ -66,7 +66,7 @@ autocmd FileType *css,gitcommit,haskell,htmldjango,html,javascript,json,lisp,mar
 autocmd BufNewFile,BufRead *.gd set expandtab!
 autocmd Filetype go set expandtab! sw=4
 autocmd FileType html,javascript,python,lua set fdm=indent
-" autocmd Filetype markdown set commentstring=<!---\ %s\ -->
+autocmd Filetype markdown let g:AutoPairs = {'(':')', '[':']', '{':'}','"':'"', "`":"`", '```':'```', '"""':'"""', "'''":"'''", "*":"*"}
 " autocmd Filetype markdown map <F8> :LivedownToggle<CR>
 autocmd Filetype markdown map <F8> :InstantMarkdownPreview<CR>
 autocmd Filetype markdown map <F9> :InstantMarkdownStop<CR>:InstantMarkdownPreview<CR>
@@ -76,6 +76,7 @@ autocmd Filetype markdown inoremap < <Esc><<A
 autocmd Filetype markdown inoremap << <
 autocmd Filetype markdown inoremap > <Esc>>>A
 autocmd Filetype markdown inoremap >> >
+" autocmd Filetype markdown set commentstring=<!---\ %s\ -->
 " format options [[[ "

 " a = auto-format paragraphs 
@@ -87,11 +88,12 @@ autocmd Filetype markdown inoremap >> >
 " v = break lines in insert 
 " w = whitespace continues paragraph
 " ]]] format options "
-" 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 markdown,tex,text set spell spelllang=en_us formatoptions=acjMqtvw
+autocmd FileType markdown,tex,text set spell spelllang=en_us formatoptions=cjMqtvw
 autocmd Filetype json nnoremap <leader>j :%!python -m json.tool<CR>
 autocmd Filetype json set foldmethod=marker
 autocmd Filetype racket set commentstring=;%s;
+autocmd Filetype racket let g:AutoPairs = {'(':')', '[':']', '{':'}','"':'"', "`":"`", '```':'```', '"""':'"""', "'''":"'''"}
 autocmd FileType sh map <F8> :!clear && shellcheck %<CR>
 autocmd Filetype taskdata set tw=0
 autocmd FileType tex set updatetime=1000 timeoutlen=300 tw=65
@@ -174,6 +176,9 @@ Plug 'lervag/vimtex'
          \ 'overfull' : 0,
          \ 'underfull' : 0,
          \ 'global' : 0,
+          \ 'packages' : {
+          \   'gensymb' : 0,
+          \ },
          \ 'references' : 0,
          \ 'unused' : 0,
          \}
@@ -320,6 +325,8 @@ Plug 'junegunn/vim-easy-align'
 Plug 'wlangstroth/vim-racket'
 Plug 'neovimhaskell/haskell-vim'
 Plug 'masukomi/vim-markdown-folding'
+  autocmd FileType markdown set foldexpr=NestedMarkdownFolds()
+Plug 'cespare/vim-toml'
 " ]]] vim-plug "

 " Mappings [[[ "
@@ -438,6 +445,7 @@ nnoremap <leader>rl q:i.s///g<left><left><left>
 " replace in visual selection
 " remove italics tags
 nnoremap <leader>rmi :%s/<\/\?i>//g<CR>
+nnoremap <leader>rs :res 
 " reload vim config
 nnoremap <leader>rv :source $MYVIMRC<CR>
 vnoremap <leader>r q:is///g<ESC>3ha
@@ -458,6 +466,10 @@ nnoremap <leader>sys :set syn=sh<CR>
 vnoremap <leader>t :!tac<CR>
 " capitalize letter
 nnoremap <leader>u vU
+" comment visual block
+" nnoremap <leader>vcc V<leader>cc
+" uncomment visual block
+" nnoremap <leader>vcu V<leader>cu
 " horizontal split "
 nnoremap <leader>vs :vs 
 " open vimrc in vertical split
@@ -558,7 +570,9 @@ autocmd Filetype c inoremap <localleader>uc unsigned char

 autocmd BufNewFile,BufRead *.h nnoremap <localleader>x 0iextern <Esc>f{hc$;<Esc>

-autocmd BufNewFile,BufRead ~/.habitctl/log nnoremap <localleader>d Gy3kGpf<Tab>hV3j<C-a>$rnj.j.j$.
+autocmd BufNewFile,BufRead ~/.habitctl/log nnoremap <localleader>d Gy3kGp5e<C-V>3j<C-a>$rnj.j.j$.
+autocmd BufNewFile,BufRead ~/.habitctl/log nnoremap <localleader>n $rn
+autocmd BufNewFile,BufRead ~/.habitctl/log nnoremap <localleader>y $ry

 autocmd Filetype fish inoremap <localleader>1 $argv[1]
 autocmd Filetype fish inoremap <localleader>2 $argv[2]
--- a/private_dot_calcurse/conf
+++ b/private_dot_calcurse/conf
@@ -1,4 +1,4 @@
-appearance.calendarview=weekly
+appearance.calendarview=monthly
 appearance.compactpanels=yes
 appearance.defaultpanel=calendar
 appearance.layout=3
--- a/scripts/executable_twem
+++ b/scripts/executable_twem
@@ -1,7 +1,13 @@
-#!/bin/bash
+#!/bin/dash

+# for i in {1..4} ; do
+    # xdotool key Left
+# done
 sleep .3
 xdotool type 'https://twem.tk/.png'
-for i in {1..4} ; do
+i=0
+while [ "$i" -ne 4 ]
+do
    xdotool key Left
+    i=$((i + 1))
 done
--- a/txt/exclude-dirs-backup-full.txt
+++ b/txt/exclude-dirs-backup-full.txt
@@ -1,4 +1,5 @@
 /dev/*
+/home/kevin/.cache/spotify
 /lost+found
 /media/*
 /mnt/*