Lots of small fixes back in arch

apps/de/sway/config

@@ -33,9 +33,8 @@ input type:touchpad {
 
 bindsym $mod+control+space exec makoctl dismiss
 bindsym $mod+shift+space exec makoctl invoke
-bindsym $mod+return exec kitty
+bindsym $mod+return exec kitty --single-instance
 bindsym $mod+shift+return exec $dfpbin/floating-term
-bindsym $mod+t exec kitty
 bindsym $mod+shift+alt+return exec kitty
 bindsym $mod+c kill
 bindsym $mod+shift+c kill # TODO: kill -9?

apps/git/config

@@ -51,7 +51,11 @@
 [pager]
 	branch = false
 	# remove ansi codes, pad each file's diff with newlines, show as diff, remove top padding
-	diff = vimpager -c 'silent %sm/\\e[^mK]*[mK]//g' -c 'silent %s/^diff/\\r\\rdiff/' -c 'silent set ft=diff' -c 'silent execute \"normal gg2dd\"'
+	diff = nvim -c 'silent %sm/\\e[^mK]*[mK]//g' \
+		-c 'silent %s/^diff/\\r\\rdiff/' \
+		-c 'silent set ft=diff' \
+		-c 'silent execute \"normal gg2dd\"' \
+		-c 'silent setlocal nobuflisted buftype=nofile bufhidden=wipe noswapfile'
 
 [url "git@github.com:postmates"]
 	insteadOf = https://github.com/postmates

apps/kanshi/config

@@ -1,7 +1,7 @@
 profile desktop-H  {
   output "Samsung Electric Company CF791 HTRJ500315" enable mode 3440x1440@100Hz position 1440,560 scale 1 transform normal
-  output "Dell Inc. DELL U2719DC 5DL4QS2" enable mode 2560x1440@60Hz position 0,0 scale 1 transform 90
+  output "Dell Inc. DELL U2719DC 5DL4QS2" enable mode 2560x1440@60Hz position 0,0 scale 1 transform 270
-  output "Dell Inc. DELL U2719DC 9DL4QS2" enable mode 2560x1440@60Hz position 4880,0 scale 1 transform 270
+  output "Dell Inc. DELL U2719DC 9DL4QS2" enable mode 2560x1440@60Hz position 4880,0 scale 1 transform 90
   exec "$HOME/.config/lytedev-dotfiles/apps/kanshi/desktop-H-workspaces.sh"
 }
 

apps/kanshi/desktop-H-workspaces.sh

@@ -2,7 +2,7 @@
 
 # kanshi will potentially run this more than once
 LOCKFILE="/tmp/kanshi-workspace-arranging.lock"
-if ! (set -o noclobber; echo > "$LOCKFILE"); then exit 1; fi
+if ! (set -o noclobber; echo > "$LOCKFILE" &>/dev/null) &>/dev/null; then echo "Already locked: $LOCKFILE" >&2; exit 0; fi
 touch "$LOCKFILE"
 # TODO: some way to ensure the lock file is cleaned up?
 # maybe check if the file is older than a minute?

apps/ranger/.gitignore

@@ -1,3 +0,0 @@
-*
-!.gitignore
-!rc.conf

apps/ranger/rc.conf

@@ -1,2 +0,0 @@
-set preview_images true
-set preview_images_method kitty

bin/floating-term

@@ -1,6 +1,7 @@
 #!/usr/bin/env sh
 
 kitty \
+	--single-instance \
 	-o remember_window_size=no \
 	-o initial_window_width=60c \
 	-o initial_window_height=12c \

bin/setup-dotfiles

@@ -128,7 +128,7 @@ links=(
 )
 
 # TODO: pass interactive?
-_dotfiles_setup_run_setup "$dfp/.agreed-to-erasing-files.lock" "${links[@]}"
+_dotfiles_setup_run_setup "$HOME/.using-lytedev-dotfiles.lock" "${links[@]}"
 
 if [[ "$INTERACTIVE" = 1 ]]; then
 	echo -n -e "Do you want to run the env/common/sudo_setup script for changes to /etc"

env/arch-linux/provisioning/2-essentials.bash

@@ -26,10 +26,10 @@ yay -S \
 	kitty `# Almost Better Terminal Emulator` \
 	feh `# Image Viewer & Wallpaper Manager` \
 	wlroots-git sway-git `# Wayland Compositor` \
-	swaylock-git `# Wayland Compositor` \
+	swaylock-git swayidle-git `# Auto-Locking for Sway` \
-	kanshi-git `# Monitor Management for Wayland` \
+	kanshi-git `# Monitor Management for Sway` \
-	waybar-git mako-git `# Wayland Bar & Notifications` \
+	waybar-git mako-git `# Sway Bar & Notifications` \
-	slurp grim wl-clipboard `# Wayland Screen Selection & Clipping` \
+	slurp grim wl-clipboard `# Sway Screen Selection & Clipping` \
 	ttf-iosevka `# Primary Fonts` \
 	ttf-font-awesome `# Icon Font` \
 	curl `# HTTP Utility` \

env/common/sudo_setup

@@ -7,7 +7,7 @@ if [[ $UID -ne 0 ]]; then
 fi
 
 dfp=$(cd "$(dirname "${BASH_SOURCE[0]}" )/../../" && pwd)
-source "${dfp}/bin/lib/setup_helpers.bash"
+source "${dfp}/env/common/setup_helpers.bash"
 
 # cp "$dfp/apps/de/sway/dm-entry" "/usr/share/wayland-sessions/lsway.desktop"
 
@@ -27,5 +27,5 @@ links=(
 	"apps/de/gnome/gdm-tap-to-click"   "/etc/dconf/db/gdm.d/06-tap-to-click"
 )
 
-_dotfiles_setup_run_setup "$dfp/.agreed-to-erasing-root-files.lock" "${links[@]}"
+_dotfiles_setup_run_setup "$HOME/.using-lytedev-etcfiles.lock" "${links[@]}"
 

env/nix/modules/de/sway.nix

@@ -23,6 +23,8 @@ in {
 				unstable.kanshi
 				unstable.gammastep
 			];
+			# TODO: this should come from the user's homedir maybe through dotfiles
+			# somehow? home-manager?
 			extraSessionCommands = ''
 				systemctl --user import-environment
 				export TERMINAL=kitty