dotfiles @ ae9fa7059a5714e48d5b54a0e8d83ca037bb1be7

M bin/catfetch

@@ -1,35 +1,23 @@
 #!/bin/sh
-
-# Kernel version
 kernel=$(cat /proc/sys/kernel/osrelease|cut -d '-' -f1)
-
-# Window manager name
 [ ! "$wm" ] && [ "$DISPLAY" ] && command -v xprop >/dev/null && {
     wmname="$(xprop -id $(xprop -root -notype\
-        | awk '$1=="_NET_SUPPORTING_WM_CHECK:"{print $5}') -notype -f _NET_WM_NAME 8t\
-        | grep "WM_NAME"\
-        | cut -f2 -d \")"
+    | awk '$1=="_NET_SUPPORTING_WM_CHECK:"{print $5}') -notype -f _NET_WM_NAME 8t\
+    | grep "WM_NAME"\
+    | cut -f2 -d \")"
 }
-
-# Shell
 shell=$(basename $SHELL)
-
-# Packages
-manager=$(which apt pacman yay apk xbps-query 2>/dev/null)
+manager=$(which apt pacman yay 2>/dev/null)
 manager=${manager##*/}
 case "$manager" in
     apt) packages="$(dpkg-query -f '${binary:Package}\n' -W | wc -l)";;
     yay) packages="$(yay -Q | wc -l)";;
     pacman) packages="$(pacman -Q | wc -l)";;
-esac 
-
-
-# Colors ####
+esac
 bold=$(tput bold)
 reset="\e[0m"
 blue="\e[36m"
 
-# Fetch ####
 echo -e "            ${blue}${bold}    WM ${reset}${wmname}"
 echo -e "   /\_/\    ${blue}${bold} SHELL ${reset}${shell}"
 echo -e "  (=^.^=)   ${blue}${bold}KERNEL ${reset}${kernel}"

M bin/kbhl

@@ -3,4 +3,3 @@ case "$1" in
     "on"|"-on"|"--on"|1) xset led on ;;
     "of"|"off"|"-off"|"--off"|0) xset led off ;;
 esac
-

M config/bspwm/bspwmrc

@@ -39,10 +39,10 @@ bspc rule -a Google-chrome        desktop='^2' focus=on  follow=on
 bspc rule -a LibreWolf            desktop='^2' focus=on  follow=on
 bspc rule -a Code                 desktop='^3' focus=on  follow=on
 bspc rule -a '*:nvim'             desktop='^4' focus=on  follow=off
-bspc rule -a '*:ranger'           desktop='^4' focus=on  follow=off
-bspc rule -a Todoist              desktop='^5' focus=on  follow=off
-bspc rule -a Joplin               desktop='^5' focus=on  follow=on
-bspc rule -a Simplenote           desktop='^5' focus=on  follow=on
+bspc rule -a Todoist              desktop='^4' focus=on  follow=off
+bspc rule -a Joplin               desktop='^4' focus=on  follow=on
+bspc rule -a Simplenote           desktop='^4' focus=on  follow=on
+bspc rule -a '*:ranger'           desktop='^5' focus=on  follow=off
 bspc rule -a discord              desktop='^6' focus=off follow=off
 bspc rule -a telegram-desktop     desktop='^6' focus=off follow=on
 bspc rule -a KeePassXC            desktop='^7' focus=on  follow=off

M config/bspwm/sxhkd

@@ -6,7 +6,7 @@ super + {_,shift} Return
     {kitty,                       \
      rofi -show drun -theme ntenV2}
 
-super + shift + {w, e, f, c, a, q}
+super + shift + {w, e, f, c, t, q}
     {google-chrome-stable,           \
      kitty --class nvim   -e nvim,   \
      kitty --class ranger -e ranger, \

M config/nvim/init.vim

@@ -70,8 +70,6 @@ autocmd FileType python,go,json setlocal et sw=4 ts=4
 autocmd FileType css,javascript,javascriptreact,yaml setlocal noet sw=2 ts=2
 
 "== Aliases
-command! W  :w
-command! Q  :q
 command! WQ :wq
 command! Wq :wq
 command! Wiki :e ~/doc/index.md

M vscode/settings.json

@@ -28,8 +28,7 @@ "vim.surround": true,
   "vim.useSystemClipboard": true,
   "vim.normalModeKeyBindings": [{"before": ["f"], "after" : ["leader","leader","s"]}],
 
-  "cSpell.userWords": ["getenv"],
-
+  "cSpell.userWords": ["getenv", "popen"],
   "emmet.includeLanguages": {
     "javascript": "javascriptreact"
   },

M zshrc

@@ -5,7 +5,7 @@ ### Oh my zsh
 export OMH="$HOME/.oh-my-zsh"
 ZSH_THEME="simple"
 DISABLE_AUTO_TITLE="true"
-plugins=(yarn nvm)
+plugins=(yarn nvm golang)
 source $OMH/oh-my-zsh.sh
 
 ### Aliases