.bashrc

@@ -16,3 +16,8 @@ fi
 
 
 # Put your fun stuff here.
+
+# https://wiki.gentoo.org/wiki/Fish#fish_as_a_default_shell_with_bash_as_the_login_shell
+# Use nu in place of bash
+# keep this line at the bottom of ~/.bashrc
+# [ -x /bin/nu ] && SHELL=/bin/nu exec nu

.config/nvim

@@ -1 +1 @@
-Subproject commit 4fd5fd0e0ceef326f1b569354449187c9323014e
+Subproject commit fd3bdba06fa3bffe1f3465ef6963606e71ba5ff4

.config/sway/conf.d/keybinds

@@ -11,8 +11,8 @@ set $menu fuzzel
 # my keybinds
 
 # screenshot
-bindsym $mod+Print exec grim -g "$(slurp -d)" - | wl-copy
-bindsym $mod+Shift+s exec grim -g "$(slurp -d)" - | wl-copy
+bindsym $mod+Print exec grimshot --cursor copy area
+bindsym $mod+Shift+s exec grimshot --cursor copy area
 # notification client
 bindsym $mod+m exec swaync-client -t -sw
 # Logout

.config/sway/scripts/logout.sh

@@ -1,41 +1,41 @@
 #!/bin/bash
 #
 # Modified from sway's locking script
-# TODO: remove bashism
 
-if [[ ! $(which swayidle 2>/dev/null) ]]; then
-	notify-send "ERROR" "Swayidle not found"
-	exit 1
+
+if [[ ! $(which swayidle 2> /dev/null) ]]; then
+    notify-send "ERROR" "Swayidle not found"
+    exit 1
 fi
 
 choices=("suspend" "poweroff" "reboot" "lock")
 choice=$(printf "%s\n" "${choices[@]}" | fuzzel -d --prompt "🔌: ")
 
-if test "$choice" = lock; then
-	# sleep less when power on
-	if acpi -a | grep -q on; then
-		sleep_time=3600
-	else
-		sleep_time=10
-	fi
-	sleep 0.3
-	playerctl stop
 
-	bright=$(light)
+if test "$choice" = lock ; then
+    # sleep less when power on
+    if acpi -a | grep -q on; then
+        sleep_time=3600
+    else
+        sleep_time=10
+    fi
+    sleep 0.3
 
-	swayidle -w \
-		timeout 5 "light -S 1" resume "light -S $bright" \
-		timeout $sleep_time 'swaymsg "output * power off"' resume 'swaymsg "output * power on"' \
-		&
-	idlepid=$!
+    bright=`light`
 
-	# swaylock -e -c 282828 --inside-color 00000003
-	swaylock -S --effect-blur "12x12" --effect-greyscale --effect-vignette 0.5:0.5 --inside-color 28282860 \
-		-e --ring-color 00000000 --line-color 00000000 --indicator --clock --text-color ebdbb2
+    swayidle -w \
+        timeout 5 "light -S 1" resume "light -S $bright" \
+        timeout $sleep_time 'swaymsg "output * power off"' resume 'swaymsg "output * power on"' \
+        &
+    idlepid=$!
 
-	kill $idlepid
-	swaymsg "output * power on"
-	light -S $bright
+    # swaylock -e -c 282828 --inside-color 00000003
+    swaylock -S --effect-blur "12x12" --effect-greyscale --effect-vignette 0.5:0.5 --inside-color 28282860 \
+        -e --ring-color 00000000 --line-color 00000000 --indicator --clock --text-color ebdbb2
+
+    kill $idlepid
+    swaymsg "output * power on"
+    light -S $bright
 elif test -n "$choice"; then
-	systemctl $choice
+    systemctl $choice
 fi

.config/waybar/config

@@ -21,7 +21,7 @@
 			"clock"
 		],
 		"include": [
-			"~/.config/waybar/sway-modules.jsonc"
+			"~/.config/waybar/sway-modules.json"
 		]
 	},
 	{

.config/waybar/sway-modules.json

@@ -44,8 +44,8 @@
 		]
 	},
 	"clock": {
-		"format": "{:󰅐 %H:%M   %m-%d}",
-		"format-alt": " {:%A, %B %d, %Y (%r)}",
+		"format": "{:󰅐 %H:%M}",
+		"format-alt": "{: %m-%d}",
 		"tooltip-format": "<tt><small>{calendar}</small></tt>",
 		"calendar": {
 			"mode": "year",
@@ -90,7 +90,8 @@
 		},
 		"return-type": "json",
 		"exec": "playerctl -a metadata --format '{\"text\": \"{{playerName}}: {{artist}} - {{markup_escape(title)}}\", \"tooltip\": \"{{markup_escape(title)}} - {{markup_escape(album)}}\", \"class\": \"{{status}}\", \"alt\": \"{{status}}\" }' -F",
-		"max-length": 48,
-		"on-click": "playerctl play-pause"
+		"max-length": 40,
+		"on-click": "playerctl play-pause",
+		"on-click-right": "pavucontrol"
 	}
 }

.zshrc

@@ -34,14 +34,14 @@ zinit light zsh-users/zsh-history-substring-search
 
 # Software
 if  ! command -v bat &> /dev/null ; then
-    zinit ice as"command" from"gh-r" mv"bat* -> bat" pick"bat/bat"
-    zinit light sharkdp/bat
+	zinit ice as"command" from"gh-r" mv"bat* -> bat" pick"bat/bat"
+	zinit light sharkdp/bat
 fi
 
-zinit from"gh-r" as"program" mv"direnv* -> direnv" \
-    atclone'./direnv hook zsh > zhook.zsh' atpull'%atclone' \
-    pick"direnv" src="zhook.zsh" for \
-    direnv/direnv
+if ! command -v direnv &> /dev/null; then
+	zinit ice from"gh-r" as"program" mv"direnv* -> direnv"
+	zinit light direnv/direnv
+fi
 
 autoload -Uz _zinit
 (( ${+_comps} )) && _comps[zinit]=_zinit