Update

dot_Xmodmap

@@ -3,5 +3,4 @@ clear Lock
 keycode 22 = Caps_Lock
 keycode 66 = BackSpace
 
-pointer = 1 2 3 6 7 8 9 10 11 12 4 5
 pointer = 1 10 3 6 7 4 5 2 11 12 8 9

dot_config/fish/config.fish.tmpl

@@ -22,7 +22,7 @@ set -U mfs_dir "/home/kevin/coding/mf-site"
 source /home/kevin/coding/spotify-lib-vis/src/scripts/api-keys-fish.sh
 {{ end }}
 
-set -x PATH $PATH ~/.local/bin ~/scripts ~/scripts/colors ~/go/bin
+set -x PATH $PATH ~/.local/bin ~/scripts ~/scripts/colors ~/go/bin ~/.minetest/minetest/bin
 set -x CLASSPATH $CLASSPATH /home/kevin/java/*.jar
 set -x LD_LIBRARY_PATH $LD_LIBRARY_PATH /usr/local/lib /usr/local/lib64
 set -x PKG_CONFIG_PATH $PKG_CONFIG_PATH /usr/lib/pkgconfig
@@ -92,7 +92,7 @@ abbr cpp "copy echo (pwd)"
 abbr cff "create-fish-function"
 abbr def "define"
 abbr ev "evince-silent"
-abbr fbg "find-bg"
+# abbr fbg "find-bg"
 abbr fzv "fzf-vim"
 # git [[[ #
 
@@ -101,10 +101,12 @@ abbr gdf "git-diff-files"
 abbr gpsmt "git-push-multiple"
 abbr gremotes "git-mult-remotes"
 abbr grmb "git-delete-branch"
+abbr gro "git-replace-origin"
 
 # ]]] git #
 abbr hs "scan-history"
 abbr hst "$EDITOR ~/.local/share/fish/fish_history"
+abbr mn "man-vim"
 abbr mat "math"
 abbr pgr "grep-pdf"
 abbr pgrf "grep-pdf-file"
@@ -117,10 +119,6 @@ abbr uzr "unzip-rm"
 abbr vsnp "vim-snippet"
 abbr fvft "find-vim-filetype"
 
-# ]]] fxn abbr's #
-
-abbr hm "cd $mfs_dir && hugo serve -D --disableFastRender"
-
 # school [[[ #
 
 # 369
@@ -132,3 +130,7 @@ abbr jcr "java-compile-run"
 abbr jct "java-compile-test"
 
 # ]]] school #
+
+# ]]] fxn abbr's #
+
+abbr hm "cd $mfs_dir && hugo serve -D --disableFastRender"

dot_config/fish/functions/git/git-replace-origin.fish

@@ -0,0 +1,5 @@
+function git-replace-origin
+    git remote remove origin
+    and git remote add origin $argv[1]
+    and git push --set-upstream origin master
+end

dot_config/i3/config.tmpl

@@ -45,7 +45,7 @@ bindsym Mod4+c exec $browser
 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
-bindsym Mod4+m exec urxvt -e ~/scripts/vim-man
+# bindsym Mod4+m exec urxvt -e ~/scripts/vim-man
 bindsym Mod4+$mod+m exec pass -c uoft/markus
 bindsym Mod4+n exec urxvt -e nvim
 bindsym Mod4+o exec xclip -selection clipboard ~/.password-store/social/gmail
@@ -141,17 +141,24 @@ bindsym $mod+space focus mode_toggle
 
 #  gaps [[[ # 
 
-for_window [class="^.*"] border pixel 3
-set $inner_gaps 40
+set $inner_gaps 20
+# set $inner_gaps 7
+# set $inner_gaps 0
+
 set $outer_gaps 0
+set $border_radius 15
 # remove window titlebars
-# for_window [class="^.*"] border pixel 1
+# for_window [class="^.*"] border pixel 2
+for_window [class="^.*"] border pixel 3
 
 # gaps inner $inner_gaps
 # gaps outer $outer_gaps
 # gaps bottom 0
 gaps inner 0
 gaps outer 0
+{{ if eq .chezmoi.fullHostname "nzxt" }}
+border_radius $border_radius
+{{ end }}
 
 #  other gaps [[[ # 
 
@@ -288,6 +295,7 @@ bindsym $mod+F5 workspace $ws5; exec $browser
 # 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+m workspace $ws5; layout tabbed; exec urxvt -e ~/.minetest/minetest/bin/minetest
 bindsym Mod4+t workspace $ws5; exec thunderbird
 bindsym Mod4+5 workspace $ws5; exec godot
 bindsym Mod4+F5 workspace $ws5; exec cd ~/coding/ada-mario && godot -e
@@ -335,6 +343,7 @@ set $ws11 "11 "
 # assign [class="Summoners War Exporter"] $ws11
 workspace $ws11 output $secondary
 bindsym $mod+F11 workspace $ws11; exec urxvt -e htop -s PERCENT_CPU 
+bindsym Mod4+a workspace $ws11; exec antimicro
 
 set $ws12 "12 "
 bindsym $mod+F12 workspace $ws12; exec $term

dot_config/ranger/rc.conf.tmpl

@@ -684,8 +684,8 @@ 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
 map bbn shell mv %f /home/kevin/Pictures/Backgrounds/bright/non-editing
-map be shell mv %f editing
-map bn shell mv %f non-editing
+# map be shell mv %f editing
+# map bn shell mv %f non-editing
 
 #  ]]] backgrounds # 
 

dot_config/zathura/zathurarc

@@ -1,4 +1,8 @@
 set recolor true
-set recolor-darkcolor "#dcdccc"
-set recolor-lightcolor "#1f1f1f"
+# black
+set recolor-darkcolor "#ffffff"
+set recolor-lightcolor "#000000"
+# grey
+# set recolor-darkcolor "#dcdccc"
+# set recolor-lightcolor "#1f1f1f"
 set selection-clipboard clipboard

dot_vimrc.tmpl

@@ -67,8 +67,21 @@ autocmd Filetype markdown inoremap < <Esc><<A
 autocmd Filetype markdown inoremap << <
 autocmd Filetype markdown inoremap > <Esc>>>A
 autocmd Filetype markdown inoremap >> >
-autocmd FileType markdown,tex,text set spell spelllang=en_us formatoptions=tcqjvaw
-autocmd FileType python set fdm=indent
+" format options [[[ "
+
+" a = auto-format paragraphs 
+" c = wrap comments
+" j = remove comment header when joining lines
+" M = don't add space when joining lines
+" q = format comments with gq
+" 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 python,lua set fdm=indent
 autocmd Filetype json nnoremap <leader>j :%!python -m json.tool<CR>
 autocmd Filetype json set foldmethod=marker
 autocmd FileType sh map <F8> :!clear && shellcheck %<CR>
@@ -296,9 +309,11 @@ colorscheme gotham256
 
 " normal mappings [[[ "
 
+" visual select across lines by default "
 nnoremap v <C-V>
+" last macro "
 nnoremap Q @@
-
+" toggle fold "
 nnoremap , za
 
 " indenting
@@ -351,9 +366,11 @@ nnoremap <leader>gdm :Gvdiff master<CR>
 " toggle search highlighting
 nnoremap <leader>h :set hlsearch! hlsearch?<CR>
 " help
-nnoremap <leader>he :help 
+nnoremap <leader>he :vert help 
 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
 " format current line
 nnoremap <leader>l Vgq
 " format this and next line
@@ -370,8 +387,11 @@ nnoremap <leader>nv :echo has('nvim')<CR>
 nnoremap <leader>nw :set nowrap<CR>
 " recursively open fold
 nnoremap <leader>o zO
+" paste from?
+" nnoremap <leader>p "*p
+" format paragraph
+nnoremap <leader>p gqip
 " Plug commands
-nnoremap <leader>p "*p
 nnoremap <leader>pli :PlugInstall<CR>
 nnoremap <leader>plc :PlugClean<CR>
 nnoremap <leader>plu :PlugUpdate<CR>

key_aliases.tmpl

@@ -80,7 +80,8 @@ ll "ls -al"
 cwd "echo (pwd) | xclip -selection clipboard"
 smv "sudo mv"
 f "cd"
-fz "fzf"
+fz "fzf -e"
+fbg "cd ~/Pictures/Backgrounds && fzf -e --delimiter '/' --with-nth -1"
 fnd "find . -type f -name"
 
 rmr "rm -rf"
@@ -150,6 +151,8 @@ tri "trizen -S --noedit"
 ya "yay -S  --answerclean=None --answerdiff=None --answeredit=None"
 # info
 yaq "yay -Qi"
+# list files
+yal "yay -Ql"
 # remove
 yar "yay -Rns"
 # sync
@@ -202,13 +205,14 @@ id "identify"
 # rz "source ~/{{ .chezmoi.os }}-config/aliases/zsh_aliases"
 
 # mst "sudo rm ~/st/config.h && sudo bear make -C ~/st install"
-mst "sudo ~/st/make-st.sh"
+# mst "sudo ~/st/make-st.sh"
 
 #  system ]]]
 
 # applications  [[[ #
 
 # silent="> /dev/null 2>&1& "
+a "antimicro"
 chr "google-chrome"
 clc "cloc ."
 cv "cava"
@@ -222,29 +226,34 @@ htm "htop -s PERCENT_MEM"
 i "sxiv"
 ig "sxiv -a"
 it "sxiv -t *"
+ki "kill -9"
 ka "killall"
 kd "killall Discord && killall Discord && killall slack"
 kt "killall thunderbird"
 mp "mpv --volume=50"
 mra "man ranger"
-mt "minetest"
+# mt "minetest"
 n "nvim"
 p3 "python3"
 pdft "pdftotext"
 pipes "pipes.sh -t 3"
 py "python"
 r "ranger"
-rgc "printf '\033c' && rg"
+# rgc "printf '\033c' && rg"
+# rgc "printf '\033c' && rg"
+rgc "clear && tmux clear-history && rg"
 rx "redshift -x"
 sn "sudo nvim"
 # sw "swex"
 t "tmux"
-ta "tmux a"
+ta "tmux a -t"
+tal "tmux a"
 tl "tmux ls"
 tn "tmux new -s"
 vmd "vimdiff"
 wg "wego"
 wp "grep wallpaper ~/.cache/wal/colors.sh"
+ytd "youtube-dl"
 z "zathura --fork"
 
 lz "unzip -l"
@@ -499,7 +508,6 @@ gpsh "git push heroku"
 
 # mfs [[[ #
 
-mfs "nvim ~/coding/best-mf-site-personal/index.html"
 ht "python3 -m http.server"
 # j "jekyll"
 # js "jekyll serve"
@@ -527,30 +535,38 @@ dea "deactivate"
 
 # ]]] coding projs  #
 
+# games [[[ #
+
+wlm "watson log --all --project=minetest"
+wrm "watson report --all --project=minetest"
+wamv "watson start minetest +video"
+
+mtg "minetest"
+ms "minetestserver"
+msc "minetestserver --gameid minetest --worldname Creative --terminal"
+# msh "minetestserver --gameid minetest --worldname Hevin --config ~/.minetest/hevin.conf --terminal"
+msh "minetestserver --gameid mineclone2 --worldname Hevin-MC --config ~/.minetest/hevin-mc.conf --terminal"
+mst "minetestserver --gameid minimal --worldname Test --terminal"
+# mtrsy "rsync -vr .minetest/ /mnt/linux-files/.minetest/"
+
+# ]]] games #
+
 # school  [[[ #
 
 # 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"
 
 # alg course
 jc "javac -d out *.java"
 jr "java -cp \"$CLASSPATH:out\""
 
 # 263
-wl6 "watson log --all --project=263 --tag=a4"
-wr6 "watson report --all --project=263 --tag=a4"
+wl6 "watson log --all --project=263 --tag=a5"
+wr6 "watson report --all --project=263 --tag=a5"
 z6 "zathura --fork ~/school/263/Introduction-to-Algorithms-CLRs/Introduction\ to\ Algorithms\ -\ 3rd\ Edition.pdf"
-pd6 "pdflatex a4"
+pd6 "pdflatex a5"
 
 # ]]] school  #
-
-# games [[[ #
-
-mtc "minetestserver --gameid minetest --worldname Creative --terminal"
-mth "minetestserver --gameid minetest --worldname Hevin --config hevin.conf --terminal"
-mtt "minetestserver --gameid minimal --worldname Test --terminal"
-# mtrsy "rsync -vr .minetest/ /mnt/linux-files/.minetest/"
-
-# ]]] games #

key_dirs.tmpl

@@ -39,7 +39,7 @@ ft ~/coding/face-tracker
 j ~/Documents/journal
 lh ~/Documents/listening-history
 mmd ~/coding/move-mouse-with-head
-ms ~/coding/mf-site
+mfs ~/coding/mf-site
 mh ~/coding/mf-site/layouts
 # mg ~/coding/best-mf-site-personal
 sv ~/coding/spotify-lib-vis/src
@@ -59,16 +59,27 @@ adP ~/Pictures/ada-mario
 
 # ]]] cdn #
 
+# gaming [[[ #
+
+mt ~/.minetest
+mta ~/.minetest/clientmods/custom_aliases
+mtc ~/.minetest/games/mineclone2/mods
+mtm ~/.minetest/minetest
+
+pk ~/Downloads/gba/mgba/pokemon/emerald/1
+
+# ]]] gaming #
+
 # sch [[[ #
 
 sc ~/school
 lt ~/school/latex-notes
 
 6 ~/school/263
-63 ~/school/263/a4
-631 ~/school/263/a4/q1
-632 ~/school/263/a4/q2
-63t ~/school/latex-notes/263/a4
+63 ~/school/263/a5
+# 631 ~/school/263/a4/q1
+# 632 ~/school/263/a4/q2
+63t ~/school/latex-notes/263/a5
 
 al1 ~/school/algorithms/w1-union-find
 
@@ -85,5 +96,3 @@ al1 ~/school/algorithms/w1-union-find
 
 # ]]] sch #
 
-mtd ~/.minetest
-pk ~/Downloads/gba/mgba/pokemon/emerald/1

key_files.tmpl

@@ -32,7 +32,7 @@ cmt /tmp/commit-msg.txt
 hlg ~/coding/spotify-lib-vis/src/api/management/commands/update-history.log
 id ~/coding/project-ideas/ideas.md
 ig ./.gitignore
-jn ~/Documents/journal/todo/2.md
+jn ~/Documents/journal/todo/8.md
 jt ~/Documents/journal/todo/todo.md
 lh ~/Documents/listening-history/polarbier.csv
 mc ~/coding/mf-site/assets/sass/main.scss
@@ -64,4 +64,4 @@ wt ~/.config/watson/state.tmp
 
 # ]]] sch #
 
-mta ~/.minetest/mods/custom_aliases/init.lua
+mta ~/.minetest/clientmods/custom_aliases/init.lua