feat: Nix version bump + other updatesHEADmaster

Lots of updates

4 files changed, 31 insertions, 4 deletions

diff --git a/home-manager/i3/config b/home-manager/i3/config
index 59116ba..d58db13 100644
--- a/home-manager/i3/config
+++ b/home-manager/i3/config
@@ -133,7 +133,7 @@ bindsym $mod+Shift+d exec --no-startup-id "prime-run rofi -i -show drun -disable
 #bindsym $mod+d exec dmenu_run -i -nb '#303239' -nf '#f3f4f5' -sb  '#bf00f6' -sf '#f3f4f5'
 
 # Password menu
-bindsym $mod+g exec --no-startup-id "~/bin/rofi-passmenu"
+bindsym $mod+g exec --no-startup-id "rofi-passmenu"
 
 # i3 command runner
 bindsym $mod+Shift+semicolon exec --no-startup-id "i3-msg $(echo | rofi -l 0 -dmenu -p 'i3 command')"
diff --git a/home-manager/i3/default.nix b/home-manager/i3/default.nix
index 087415c..5fba6e1 100644
--- a/home-manager/i3/default.nix
+++ b/home-manager/i3/default.nix
@@ -21,12 +21,12 @@
     xsession.enable = true;
     xsession.windowManager.i3 = {
         enable = true;
-        package = pkgs.i3-gaps;
+        package = pkgs.i3;
     };
     xdg.configFile."i3/config".enable = false;
     home.file.".config/i3/config" = {
         source = ./config;
-        onChange = "${pkgs.i3-gaps}/bin/i3-msg restart";
+        onChange = "${pkgs.i3}/bin/i3-msg restart";
     };
     home.packages = with pkgs; [
 		i3lock
diff --git a/home-manager/i3/scripts/image_upload.sh b/home-manager/i3/scripts/image_upload.sh
index 896f23f..ea327ad 100755
--- a/home-manager/i3/scripts/image_upload.sh
+++ b/home-manager/i3/scripts/image_upload.sh
@@ -2,6 +2,6 @@
 image_name=$(rofi -dmenu -l 0 -p "Image name")
 xclip -selection clipboard -t image/png -o > ~/Documents/tehbox-files/$image_name
 eval $(ssh-agent)
-rsync ~/Documents/tehbox-files/$image_name files@tehbox.org:/srv/files
+rsync ~/Documents/tehbox-files/$image_name boss@tehbox.org:/srv/files
 notify-send "uploaded https://files.tehbox.org/$image_name"
 echo -n "https://files.tehbox.org/$image_name" | xclip -i -selection clipboard
diff --git a/home-manager/i3/scripts/rofi-passmenu b/home-manager/i3/scripts/rofi-passmenu
new file mode 100755
index 0000000..798961b
--- /dev/null
+++ b/home-manager/i3/scripts/rofi-passmenu
@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+
+shopt -s nullglob globstar
+
+typeit=1
+
+if [[ -n $WAYLAND_DISPLAY ]]; then
+	rofi=rofi-wl
+	xdotool="ydotool type --file -"
+elif [[ -n $DISPLAY ]]; then
+	rofi=rofi
+	xdotool="xdotool type --clearmodifiers --file -"
+else
+	echo "Error: No Wayland or X11 display detected" >&2
+	exit 1
+fi
+
+prefix=${PASSWORD_STORE_DIR-~/.password-store}
+password_files=( "$prefix"/**/*.gpg )
+password_files=( "${password_files[@]#"$prefix"/}" )
+password_files=( "${password_files[@]%.gpg}" )
+
+password=$(printf '%s\n' "${password_files[@]}" | "$rofi" -dmenu "$@")
+
+[[ -n $password ]] || exit
+
+pass show "$password" | { IFS= read -r pass; printf %s "$pass"; } | $xdotool