Merge branch 'master' of github.com:ChausseBenjamin/dotfiles

9 files changed, 27 insertions, 26 deletions

diff --git a/.config/alacritty/alacritty.yml b/.config/alacritty/alacritty.yml
index a4f6c74..c1d7722 100644
--- a/.config/alacritty/alacritty.yml
+++ b/.config/alacritty/alacritty.yml
@@ -170,7 +170,7 @@ font:
     style: Bold Italic
 
   # Point size
-  size: 14
+  size: 11
 
   # Offset is the extra space around each character. `offset.y` can be thought
   # of as modifying the line spacing, and `offset.x` as modifying the letter
diff --git a/.config/sxhkd/sxhkdrc b/.config/sxhkd/sxhkdrc
index 2ff1a2b..c6e1387 100644
--- a/.config/sxhkd/sxhkdrc
+++ b/.config/sxhkd/sxhkdrc
@@ -148,9 +148,9 @@ XF86WLAN
 ## TUI Audio Mixer (alsamixer)
 super + p
     flameshot gui
-## TODOs (Todoist.nvim)
+## TODOs (orgmode-nvim)
 super + space
-    dropdowntoggle todoist nvim +Todoist
+    dropdowntoggle orgmode nvim $HOME/Dropbox/org/home.org
 ## Terminal Calculator
 super + a
     dropdowntoggle calc tmux-r
diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc
index ca70102..d1aa444 100644
--- a/.config/zsh/.zshrc
+++ b/.config/zsh/.zshrc
@@ -102,6 +102,8 @@ lfcd () {
 }
 alias f='lfcd'
 
+# Git Root
+alias gr='cd $(git rev-parse --show-cdup)'
 
 # Load zsh-syntax-highlighting; should be last.
 source /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh 2>/dev/null
diff --git a/.local/bin/dwmbar/dwmb-layout b/.local/bin/dwmbar/dwmb-layout
index e0cf446..26b62c5 100755
--- a/.local/bin/dwmbar/dwmb-layout
+++ b/.local/bin/dwmbar/dwmb-layout
@@ -1,11 +1,3 @@
 #!/bin/sh
 
-# echo "  $(cat $HOME/.cache/layout) "
-echo " $(cat $HOME/.cache/layout) "
-case $BLOCK_BUTTON in
-	  1) layouttoggle ;;
-	  2) remaps && Capslock remaps reinitialized;;
-		3) notify-send -a " Keyboard" "Click this widget to toggle the keyboard layout between french and english.
-Middle click it to remap Capslock to super (and escape when tapped) if it somehow gets unmapped.";;
-    6) "$TERMINAL" -e "$EDITOR" "$0" ;;
-esac
+echo "   $(cat $HOME/.cache/layout) "
diff --git a/.local/bin/layouttoggle b/.local/bin/layouttoggle
index 139ceb9..d1ceba5 100755
--- a/.local/bin/layouttoggle
+++ b/.local/bin/layouttoggle
@@ -1,18 +1,20 @@
 #!/bin/sh
 
-layout=$(cat $HOME/.cache/layout)
+layout=$(cat "$HOME/.cache/layout")
 
 case "$layout" in
-	ca) setxkbmap -model pc104 -layout us -variant ,,
-			echo us > $HOME/.cache/layout
-			;;
-	us) setxkbmap -model pc104 -layout ca -variant ,,
-			echo ca > $HOME/.cache/layout
-			;;
-		*) setxkbmap -model pc104 -layout us -variant ,,
-			echo us > $HOME/.cache/layout
-			;;
-	esac
-
-kill -38 $(pidof dwmblocks)
+ca)
+	setxkbmap -model pc104 -layout us -variant ,,
+	echo us >"$HOME/.cache/layout"
+	;;
+us)
+	setxkbmap -model pc104 -layout ca -variant ,,
+	echo ca >"$HOME/.cache/layout"
+	;;
+*)
+	setxkbmap -model pc104 -layout us -variant ,,
+	echo us >"$HOME/.cache/layout"
+	;;
+esac
 
+kill -38 "$(pidof dwmblocks)"
diff --git a/.local/bin/upsite b/.local/bin/upsite
index fa7649a..aad82be 100755
--- a/.local/bin/upsite
+++ b/.local/bin/upsite
@@ -4,6 +4,6 @@ sitename="chausse.xyz"
 
 cd "$HOME/Workspace/$sitename"
 
-hugo
+hugo --gc=true --minify
 
 rsync -auvz "$HOME/Workspace/$sitename/public/" "master@$sitename:/var/www/dev"
diff --git a/.local/share/yadm/repo.git/hooks/post-checkout b/.local/share/yadm/repo.git/hooks/post-checkout
new file mode 120000
index 0000000..ace4560
--- /dev/null
+++ b/.local/share/yadm/repo.git/hooks/post-checkout
@@ -0,0 +1 @@
+post-commit
\ No newline at end of file
diff --git a/.local/share/yadm/repo.git/hooks/post-commit b/.local/share/yadm/repo.git/hooks/post-commit
new file mode 100755
index 0000000..56d9d54
--- /dev/null
+++ b/.local/share/yadm/repo.git/hooks/post-commit
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+kill -41 $(pidof dwmblocks)
diff --git a/.local/share/yadm/repo.git/hooks/post-pull b/.local/share/yadm/repo.git/hooks/post-pull
new file mode 120000
index 0000000..ace4560
--- /dev/null
+++ b/.local/share/yadm/repo.git/hooks/post-pull
@@ -0,0 +1 @@
+post-commit
\ No newline at end of file