Merge branch 'main' of db:dotfiles

4 files changed, 64 insertions, 17 deletions

diff --git a/bin/guiscripts/dmfm b/bin/guiscripts/dmfm
index 969c111..d1dd8b8 100755
--- a/bin/guiscripts/dmfm
+++ b/bin/guiscripts/dmfm
@@ -1,17 +1,19 @@
 #!/bin/sh
 
-file=1
-while [ "$file" ]; do
-	file=$(ls -1 --group-directories-first | dmenu -i -l 8 -g 1 -p "$(basename $(pwd)):")
-	if [ -e "$file" ]; then
-		owd=$(pwd)
-		if [ -d "$file" ]; then
-			cd "$file"
-		else [ -f "$file" ]
-			if which xdg-open &> /dev/null; then
-				exec xdg-open "$owd/$file" &
-				unset file
-			fi
-		fi
+while true
+do
+	file=$(find . -maxdepth 1 -mindepth 1 -not -name '.*' -printf '%y\t%f\n' |
+		sort -k 1 -k 2 | cut -f 2- |
+		commander -xcd -p "$PWD>")
+
+	[ "$file" ] || break
+	[ ! -e "$file" ] && continue
+
+	if [ -d "$file" ]
+	then
+		cd "$file" || continue
+	else
+		setsid xdg-open "$PWD/$file" &
 	fi
+
 done
diff --git a/bin/guiscripts/locker b/bin/guiscripts/locker
index 7c42cda..a0a9eac 100755
--- a/bin/guiscripts/locker
+++ b/bin/guiscripts/locker
@@ -1,9 +1,8 @@
 #!/bin/sh
-which swaylock grim pixelate > /dev/null ||
-	exit 1
+which swaylock grim pixelate > /dev/null || exit 1
 umask 077
 
-monitors="$(hyprctl monitors -j | jq -r '.[].name' | xargs)"
+monitors="$(xrandr --listactivemonitors | awk '/^ [0-9]/ {print $4}')"
 
 for monitor in $monitors
 do
@@ -15,5 +14,5 @@ do
 	files="$files $file"
 done
 
-swaylock -f -u $img_opt
+swaylock --indicator-radius 0 $img_opt
 shred -uz -- $files
diff --git a/bin/guiscripts/startdwl b/bin/guiscripts/startdwl
new file mode 100755
index 0000000..bb5fec0
--- /dev/null
+++ b/bin/guiscripts/startdwl
@@ -0,0 +1,44 @@
+#!/bin/sh
+
+eval "$(keychain --dir "$XDG_CONFIG_HOME/keychain" --eval --quiet --agents gpg,ssh)"
+eval "$(keychain --dir "$XDG_CONFIG_HOME/keychain" --eval --quiet --agents gpg 3A626DD20A32EB2E5DD9CE71CFD9ABC97158CD5D 2> /dev/null)"
+
+export XCURSOR_THEME="Bibata-Modern-Classic"
+export XCURSOR_SIZE="24"
+
+export GTK_THEME="Arc-Dark"
+
+export GTK_IM_MODULE="fcitx"
+export XMODIFIERS="@im=fcitx"
+export GLFW_IM_MODULE="ibus"
+
+export MOZ_ENABLE_WAYLAND="1"
+
+export QT_IM_MODULE="fcitx"
+export QT_AUTO_SCREEN_SCALE_FACTOR="1"
+export QT_QPA_PLATFORM="wayland;xcb"
+export QT_QPA_PLATFORMTHEME="qt5ct"
+export QT_WAYLAND_DISABLE_WINDOWDECORATION="1"
+
+export XDG_CURRENT_DESKTOP="dwl"
+export XDG_SESSION_TYPE="wayland"
+export XDG_SESSION_DESKTOP="dwl"
+
+export SDL_IM_MODULE="fcitx"
+export SDL_VIDEODRIVER="wayland"
+export CLUTTER_BACKEND="wayland"
+
+export TERMINAL="foot"
+export MENUCMD="tofi"
+export IMAGE="imv"
+
+# # nvidia
+# env = LIBVA_DRIVER_NAME,nvidia
+# env = XDG_SESSION_TYPE,wayland
+# env = GBM_BACKEND,nvidia-drm
+# env = __GLX_VENDOR_LIBRARY_NAME,nvidia
+# env = WLR_NO_HARDWARE_CURSORS,1
+
+while true;
+do dwl -s "$HOME"/.config/dwl/startup.sh
+done
diff --git a/bin/guiscripts/startw b/bin/guiscripts/startw
index 9b35556..0383f48 100755
--- a/bin/guiscripts/startw
+++ b/bin/guiscripts/startw
@@ -3,4 +3,6 @@
 eval "$(keychain --dir "$XDG_CONFIG_HOME/keychain" --eval --quiet --agents gpg,ssh)"
 eval "$(keychain --dir "$XDG_CONFIG_HOME/keychain" --eval --quiet --agents gpg 3A626DD20A32EB2E5DD9CE71CFD9ABC97158CD5D 2> /dev/null)"
 
+(cd ~/.config/waybar/ && ln -sf hyprland.jsonc config.jsonc)
+
 Hyprland