2 files changed, 74 insertions, 26 deletions

diff --git a/accounts/gkleen@sif/niri/default.nix b/accounts/gkleen@sif/niri/default.nix
index aa109616..57bc578c 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; };
         };
@@ -177,13 +199,13 @@ in {
           active.gradient = {
             from = "hsla(195 100% 60% 0.9)";
             to = "hsla(155 100% 50% 0.9)";
-            angle = 45;
+            angle = 29;
             relative-to = "workspace-view";
           };
           inactive.gradient = {
             from = "hsla(0 0% 42% 0.66)";
             to = "hsla(0 0% 35% 0.66)";
-            angle = 45;
+            angle = 29;
             relative-to = "workspace-view";
           };
         };
@@ -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%";
@@ -422,9 +466,11 @@ in {
         "Mod+Shift+E".action = quit;
         "Mod+Shift+Minus" = {
           action = spawn systemctl "suspend";
+          allow-when-locked = true;
         };
         "Mod+Shift+Control+Minus" = {
           action = spawn systemctl "hibernate";
+          allow-when-locked = true;
         };
 
         "XF86MonBrightnessUp" = {
diff --git a/accounts/gkleen@sif/niri/waybar.nix b/accounts/gkleen@sif/niri/waybar.nix
index 2d00c6d8..ff48ba83 100644
--- a/accounts/gkleen@sif/niri/waybar.nix
+++ b/accounts/gkleen@sif/niri/waybar.nix
@@ -24,14 +24,14 @@
           modules-center = [ "niri/window" ];
           modules-right = [ # "custom/worktime" "custom/worktime-today"
             "custom/weather"
-            # "custom/keymap"
+            "custom/keymap"
             "privacy" "tray" "wireplumber" "backlight" "battery" "idle_inhibitor" "clock" ];
 
           "custom/weather" = {
             format = "{}";
             tooltip = true;
             interval = 3600;
-            exec = "${lib.getExe pkgs.wttrbar} --hide-conditions --nerd --custom-indicator \"<span font=\\\"Symbols Nerd Font Mono\\\" size=\\\"120%\\\">{ICON}</span> {FeelsLikeC}°\"";
+            exec = "${lib.getExe pkgs.wttrbar} --hide-conditions --nerd --custom-indicator \"<span font=\\\"Symbols Nerd Font Mono\\\" size=\\\"100%\\\">{ICON}</span> {FeelsLikeC}°\"";
             return-type = "json";
           };
           "custom/keymap" = {
@@ -41,8 +41,6 @@
             exec = pkgs.writers.writePython3 "keymap" {} ''
               import os
               import socket
-              import re
-              import subprocess
               import json
 
 
@@ -55,20 +53,20 @@
                   print(json.dumps({'text': short, 'tooltip': keymap}, separators=(',', ':')), flush=True)  # noqa: E501
 
 
-              r = subprocess.run(["hyprctl", "devices", "-j"], check=True, stdout=subprocess.PIPE, text=True)  # noqa: E501
-              for keyboard in json.loads(r.stdout)['keyboards']:
-                  if keyboard['name'] != "at-translated-set-2-keyboard":
-                      continue
-                  output(keyboard['active_keymap'])
+              keyboard_layouts = []
 
               sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
-              sock.connect(os.environ["XDG_RUNTIME_DIR"] + "/hypr/" + os.environ["HYPRLAND_INSTANCE_SIGNATURE"] + "/.socket2.sock")  # noqa: E501
-              expected = re.compile(r'^activelayout>>at-translated-set-2-keyboard,(?P<keymap>.+)$')  # noqa: E501
+              sock.connect(os.environ["NIRI_SOCKET"])
+              sock.send(b"\"EventStream\"\n")
               for line in sock.makefile(buffering=1, encoding='utf-8'):
-                  if match := expected.match(line):
-                      output(match.group("keymap"))
+                  if line_json := json.loads(line):
+                      if "KeyboardLayoutsChanged" in line_json:
+                          keyboard_layouts = line_json["KeyboardLayoutsChanged"]["keyboard_layouts"]["names"]  # noqa: E501
+                          output(keyboard_layouts[line_json["KeyboardLayoutsChanged"]["keyboard_layouts"]["current_idx"]])  # noqa: E501
+                      if "KeyboardLayoutSwitched" in line_json:
+                          output(keyboard_layouts[line_json["KeyboardLayoutSwitched"]["idx"]])  # noqa: E501
             '';
-            on-click = "hyprctl switchxkblayout at-translated-set-2-keyboard next";
+            on-click = "niri msg action switch-layout next";
           };
           "custom/worktime" = {
             interval = 60;
@@ -80,7 +78,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 +164,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;