4 files changed, 63 insertions, 15 deletions

diff --git a/accounts/gkleen@sif/niri/default.nix b/accounts/gkleen@sif/niri/default.nix
index afedd6e3..36811d21 100644
--- a/accounts/gkleen@sif/niri/default.nix
+++ b/accounts/gkleen@sif/niri/default.nix
@@ -96,6 +96,28 @@ let
     '';
   };
   with-unnamed-workspace-action = config.lib.niri.actions.spawn (lib.getExe with_unnamed_workspace);
+
+  with_select_window = pkgs.writeShellApplication {
+    name = "with-unnamed-workspace";
+    runtimeInputs = [ niri pkgs.gojq pkgs.socat config.programs.fuzzel.package pkgs.gawk ];
+    text = ''
+      window_select="$1"
+      shift
+      action="$1"
+      shift
+
+      windows_json="$(niri msg -j windows)"
+      active_workspace="$(jq -r '.[] | select(.is_focused) | .workspace_id' <<<"$windows_json")"
+      window="$(gojq -r --arg active_workspace "$active_workspace" '.[] | select('"$window_select"') | "\(.title)\t\(.id)"' <<<"$windows_json" | fuzzel --log-level=warning --dmenu)"
+      window_id="$(awk -F $'\t' '{print $2}' <<<"$window")"
+      window_json="$(jq -r --arg window_id "$window_id" '.[] | select(.id == ($window_id | tonumber))' <<<"$windows_json")"
+
+      [[ -z "$window_json" ]] && exit 1
+
+      jq -c "$action" <<<"$window_json" | socat STDIO "$NIRI_SOCKET"
+    '';
+  };
+  with-select-window-action = config.lib.niri.actions.spawn (lib.getExe with_select_window);
 in {
   imports = [
     ./waybar.nix
@@ -152,7 +174,7 @@ in {
       };
 
       outputs = {
-        "Samsung Display Corp. 0x4141 Unknown" = {
+        "eDP-1" = {
           scale = 1.5;
           position = { x = 0; y = 0; };
         };
@@ -209,11 +231,11 @@ in {
       cursor.hide-when-typing = true;
 
       workspaces = {
-        "001".name = "pwctl";
-        "002".name = "kpxc";
-        "003".name = "bmgr";
-        "004".name = "term";
-        "005".name = "edit";
+        "001" = { name = "pwctl"; open-on-output = "eDP-1"; };
+        "002" = { name = "kpxc"; open-on-output = "eDP-1"; };
+        "003" = { name = "bmgr"; open-on-output = "eDP-1"; };
+        "004" = { name = "term"; open-on-output = "eDP-1"; };
+        "005" = { name = "edit"; open-on-output = "eDP-1"; };
         "101".name = "comm";
         "102".name = "web";
         "104".name = "read";
@@ -329,8 +351,10 @@ in {
             fi
             [[ -n "$QALC_RES" ]] || exit 1
             EXISTING=false
+            set +e
             grep -Fxrl "$QALC_RES" "$RESULTS_DIR" | xargs -r touch
             [[ ''${PIPESTATUS[0]} -eq 0 ]] && EXISTING=true
+            set -e
             if [[ $QALC_RET -eq 0 ]] && ! $EXISTING; then
               RES_FILE="$RESULTS_DIR"/$(date -uIs).$(tr -Cd 'a-zA-Z0-9' </dev/random | head -c 10)
               cat >"$RES_FILE" <<<"$QALC_RES"
@@ -349,6 +373,26 @@ in {
             wl-copy "$(cut -d ':' -f 1 <<<"$FUZZEL_RES" | tr -d '\n')" && wtype -k XF86Paste
           '';
         }));
+        "Print".action = spawn (lib.getExe (pkgs.writeShellApplication {
+          name = "screenshot";
+          runtimeInputs = with pkgs; [ grim slurp wl-clipboard-rs coreutils ];
+          text = ''
+            grim -g "$(slurp -b 00000080 -c FFFFFFFF -s 00000000 -w 1)" - \
+              | tee "$HOME/screenshots/$(date +"%Y-%m-%dT%H:%M:%S").png" \
+              | wl-copy --type image/png
+          '';
+        }));
+        "Shift+Print".action = spawn (lib.getExe (pkgs.writeShellApplication {
+          name = "screenshot";
+          runtimeInputs = with pkgs; [ grim niri gojq wl-clipboard-rs coreutils ];
+          text = ''
+            grim -o "$(niri msg -j workspaces | jq -r '.[] | select(.is_focused) | .output')" - \
+              | tee "$HOME/screenshots/$(date +"%Y-%m-%dT%H:%M:%S").png" \
+              | wl-copy --type image/png
+          '';
+        }));
+        "Mod+B".action = with-select-window-action ".workspace_id == ($active_workspace | tonumber)" "{\"Action\":{\"FocusWindow\":{\"id\": .id}}}";
+        "Mod+Shift+B".action = with-select-window-action "true" "{\"Action\":{\"FocusWindow\":{\"id\": .id}}}";
 
         "Mod+H".action = focus-column-left;
         "Mod+T".action = focus-window-down;
@@ -406,8 +450,8 @@ in {
         "Mod+Shift+F".action = maximize-column;
         "Mod+Shift+Ctrl+F".action = fullscreen-window;
 
-        "Mod+B".action = switch-focus-between-floating-and-tiling;
-        "Mod+Shift+B".action = toggle-window-floating;
+        "Mod+V".action = switch-focus-between-floating-and-tiling;
+        "Mod+Shift+V".action = toggle-window-floating;
 
         "Mod+Left".action = set-column-width "-10%";
         "Mod+Down".action = set-window-height "-10%";
diff --git a/accounts/gkleen@sif/niri/waybar.nix b/accounts/gkleen@sif/niri/waybar.nix
index 2d00c6d8..1c328ea6 100644
--- a/accounts/gkleen@sif/niri/waybar.nix
+++ b/accounts/gkleen@sif/niri/waybar.nix
@@ -80,7 +80,9 @@
             exec = "${lib.getExe pkgs.worktime} today";
             tooltip = false;
           };
-          "niri/workspaces" = {};
+          "niri/workspaces" = {
+            ignore = ["pwctl" "kpxc" "bmgr" "edit" "term"];
+          };
           "niri/window" = {
             separate-outputs = true;
             icon = true;
@@ -164,7 +166,9 @@
           modules-center = [ "niri/window" ];
           modules-right = [ "clock" ];
 
-          "niri/workspaces" = {};
+          "niri/workspaces" = {
+            ignore = ["pwctl" "kpxc" "bmgr" "edit" "term"];
+          };
           "niri/window" = {
             separate-outputs = true;
             icon = true;
diff --git a/flake.lock b/flake.lock
index 27a157d5..ce7e59e4 100644
--- a/flake.lock
+++ b/flake.lock
@@ -966,16 +966,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1734278650,
-        "narHash": "sha256-z9FiyHDbKC2nwfd/qsHCxLBEogzQj73zo85lW3zIlzY=",
+        "lastModified": 1737014022,
+        "narHash": "sha256-5cG3lbjvrqvotI3oEPham3jGq8Fd96NfrqCGvC1e6Qw=",
         "owner": "gkleen",
         "repo": "Waybar",
-        "rev": "5432f9c1697a8d2d3e1264a5ce820d7eac26e2c6",
+        "rev": "83765e0f8e99a7d344eae511a4090a76a27e5791",
         "type": "github"
       },
       "original": {
         "owner": "gkleen",
-        "ref": "feat/privacy-ignore",
+        "ref": "feat/niri-workspaces-hide",
         "repo": "Waybar",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index 47c03f23..b5ced0a0 100644
--- a/flake.nix
+++ b/flake.nix
@@ -172,7 +172,7 @@
       type = "github";
       owner = "gkleen";
       repo = "Waybar";
-      ref = "feat/privacy-ignore";
+      ref = "feat/niri-workspaces-hide";
       inputs = {
         nixpkgs.follows = "nixpkgs";
         flake-compat.follows = "flake-compat";