chore(flake): update flake lock, remove devenv input

users/modules/desktop/default.nix

@@ -19,7 +19,6 @@ in {
     ./swaync.nix
     ./theme.nix
     ./waybar.nix
-    ./wl-kbptr.nix
     ./wlr-which-key.nix
     ./wlsunset.nix
   ];

users/modules/desktop/wl-kbptr.nix

@@ -1,37 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-with lib; let
-  configDir = config.xdg.configHome;
-  cfg = config.home.desktop.wl-kbptr;
-  iniFormat = pkgs.formats.ini {};
-in {
-  options.home.desktop.wl-kbptr = {
-    enable = mkEnableOption "enable wl-kbptr";
-    config = mkOption {
-      inherit (iniFormat) type;
-      default = {};
-      description = ''
-        Options to add to the {file}`config` file. See
-        <https://github.com/moverest/wl-kbptr/blob/main/config.example>
-        for options.
-      '';
-      example = {
-        general = {
-          home_row_keys = "abcd";
-        };
-      };
-    };
-  };
-  config = mkIf cfg.enable {
-    home = {
-      packages = [pkgs.wl-kbptr];
-      file."${configDir}/wl-kbptr/config" = mkIf (cfg.config != {}) {
-        source = iniFormat.generate "wl-kbptr-config" cfg.config;
-      };
-    };
-  };
-}

users/phundrak/home.nix

@@ -131,7 +131,6 @@
               bind < urlincrement -1
               bind > urlincrement 1
               bind ypv js tri.native.run(`mpv --ytdl-format="[height >=? 480]" --ontop --fs "''${document.location.href}"`)
-              bind ypm hint -JF e => tri.native.run(`mpv --ytdl-format="[height >=? 480]" --ontop --fs "''${e.href}"`)
             '';
           };
         };
@@ -139,17 +138,6 @@
           enable = true;
           spicetify.enable = true;
         };
-        wl-kbptr = {
-          enable = true;
-          config = {
-            general = {
-              # first eight chars to select areas, last three chars
-              # for left, right, middle click
-              home_row_keys = "auiectsrtsr";
-              modes = "tile,bisect";
-            };
-          };
-        };
       };
       dev = {
         ai.claude.enable = true;

users/phundrak/wlr-which-key/default.nix

@@ -1,7 +1,6 @@
 {
   config,
   pkgs,
-  lib,
   ...
 }: {
   config.home.desktop.wlr-which-key.settings = {
@@ -28,223 +27,217 @@
       logout = import ./logout.nix {inherit pkgs;};
       ytplay = import ../../modules/cli/scripts/ytplay.nix {inherit pkgs;};
       plock = import ../../modules/cli/scripts/plock.nix {inherit pkgs;};
-    in
+    in [
-      [
+      {
-        {
+        key = "a";
-          key = "a";
+        desc = "Apps";
-          desc = "Apps";
+        submenu = [
-          submenu = [
+          {
-            {
+            key = "b";
-              key = "b";
+            desc = "Browser";
-              desc = "Browser";
+            cmd = "zen";
-              cmd = "zen";
+          }
-            }
+          {
-            {
+            key = "B";
-              key = "B";
+            desc = "Qutebrowser";
-              desc = "Qutebrowser";
+            cmd = "${pkgs.qutebrowser}/bin/qutebrowser";
-              cmd = "${pkgs.qutebrowser}/bin/qutebrowser";
+          }
-            }
+          {
-            {
+            key = "d";
-              key = "d";
+            desc = "Discord";
-              desc = "Discord";
+            cmd = "${pkgs.vesktop}/bin/vesktop";
-              cmd = "${pkgs.vesktop}/bin/vesktop";
+          }
-            }
+          {
-            {
+            key = "e";
-              key = "e";
+            desc = "Emacs";
-              desc = "Emacs";
+            cmd = "${config.home.dev.editors.emacs.package}/bin/emacsclient -c -n";
-              cmd = "${config.home.dev.editors.emacs.package}/bin/emacsclient -c -n";
+          }
-            }
+          {
-            {
+            key = "g";
-              key = "g";
+            desc = "Gimp";
-              desc = "Gimp";
+            cmd = "${pkgs.gimp}/bin/gimp";
-              cmd = "${pkgs.gimp}/bin/gimp";
+          }
-            }
+          {
-            {
+            key = "h";
-              key = "h";
+            desc = "Handy";
-              desc = "Handy";
+            cmd = "pkill -USR2 -n handy";
-              cmd = "pkill -USR2 -n handy";
+          }
-            }
+          {
-            {
+            key = "n";
-              key = "n";
+            desc = "Nemo";
-              desc = "Nemo";
+            cmd = "${pkgs.nemo-with-extensions}/bin/nemo";
-              cmd = "${pkgs.nemo-with-extensions}/bin/nemo";
+          }
-            }
+          {
-            {
+            key = "N";
-              key = "N";
+            desc = "Nextcloud";
-              desc = "Nextcloud";
+            cmd = "${pkgs.nextcloud-client}/bin/nextcloud";
-              cmd = "${pkgs.nextcloud-client}/bin/nextcloud";
+          }
-            }
+          {
-            {
+            key = "r";
-              key = "r";
+            desc = "Rofi";
-              desc = "Rofi";
+            submenu = [
-              submenu = [
+              {
-                {
+                key = "b";
-                  key = "b";
+                desc = "Bluetooth";
-                  desc = "Bluetooth";
+                cmd = "${pkgs.rofi-bluetooth}/bin/rofi-bluetooth";
-                  cmd = "${pkgs.rofi-bluetooth}/bin/rofi-bluetooth";
+              }
-                }
+              {
-                {
+                key = "c";
-                  key = "c";
+                desc = "calc";
-                  desc = "calc";
+                cmd = "rofi -show calc";
-                  cmd = "rofi -show calc";
+              }
-                }
+              {
-                {
+                key = "e";
-                  key = "e";
+                desc = "Emoji";
-                  desc = "Emoji";
+                cmd = "rofi -show emoji";
-                  cmd = "rofi -show emoji";
+              }
-                }
+              {
-                {
+                key = "r";
-                  key = "r";
+                desc = "App Menu";
-                  desc = "App Menu";
+                cmd = "rofi -show drun";
-                  cmd = "rofi -show drun";
+              }
-                }
+              {
-                {
+                key = "s";
-                  key = "s";
+                desc = "SSH";
-                  desc = "SSH";
+                cmd = "rofi -show ssh";
-                  cmd = "rofi -show ssh";
+              }
-                }
+              {
-                {
+                key = "y";
-                  key = "y";
+                desc = "YouTube";
-                  desc = "YouTube";
+                cmd = "${ytplay}/bin/ytplay";
-                  cmd = "${ytplay}/bin/ytplay";
+              }
-                }
+            ];
-              ];
+          }
-            }
+        ];
-          ];
+      }
-        }
+      {
-        {
+        key = "b";
-          key = "b";
+        desc = "Buffers";
-          desc = "Buffers";
+        submenu = [
-          submenu = [
+          {
-            {
+            key = "c";
-              key = "c";
+            desc = "Center";
-              desc = "Center";
+            cmd = "${center-window}/bin/center-window";
-              cmd = "${center-window}/bin/center-window";
+          }
-            }
+          {
-            {
+            key = "d";
-              key = "d";
+            desc = "Close";
-              desc = "Close";
+            cmd = "${close-window}/bin/close-window";
-              cmd = "${close-window}/bin/close-window";
+          }
-            }
+          {
-            {
+            key = "f";
-              key = "f";
+            desc = "Fullscreen";
-              desc = "Fullscreen";
+            cmd = "${fullscreen}/bin/fullscreen";
-              cmd = "${fullscreen}/bin/fullscreen";
+          }
-            }
+          {
-            {
+            key = "F";
-              key = "F";
+            desc = "Float";
-              desc = "Float";
+            cmd = "${float-window}/bin/float-window";
-              cmd = "${float-window}/bin/float-window";
+          }
-            }
+          {
-            {
+            key = "u";
-              key = "u";
+            desc = "Urgent";
-              desc = "Urgent";
+            cmd = "${focus-urgent}/bin/focus-urgent";
-              cmd = "${focus-urgent}/bin/focus-urgent";
+          }
-            }
+          {
-            {
+            key = ".";
-              key = ".";
+            desc = "Resize";
-              desc = "Resize";
+            submenu = [
-              submenu = [
+              {
-                {
+                key = left;
-                  key = left;
+                desc = "Decrease Width";
-                  desc = "Decrease Width";
+                cmd = "echo decrease width";
-                  cmd = "echo decrease width";
+                keep-open = true;
-                  keep-open = true;
+              }
-                }
+              {
-                {
+                key = down;
-                  key = down;
+                desc = "Increase Height";
-                  desc = "Increase Height";
+                cmd = "echo decrease height";
-                  cmd = "echo decrease height";
+                keep-open = true;
-                  keep-open = true;
+              }
-                }
+              {
-                {
+                key = up;
-                  key = up;
+                desc = "Decrease Height";
-                  desc = "Decrease Height";
+                cmd = "echo decrease height";
-                  cmd = "echo decrease height";
+                keep-open = true;
-                  keep-open = true;
+              }
-                }
+              {
-                {
+                key = right;
-                  key = right;
+                desc = "Increase Width";
-                  desc = "Increase Width";
+                cmd = "echo increase width";
-                  cmd = "echo increase width";
+                keep-open = true;
-                  keep-open = true;
+              }
-                }
+            ];
-              ];
+          }
-            }
+        ];
-          ];
+      }
-        }
+      {
-        {
+        key = "l";
-          key = "l";
+        desc = "Lock session";
-          desc = "Lock session";
+        cmd = "${plock}/bin/plock";
-          cmd = "${plock}/bin/plock";
+      }
-        }
+      {
-        {
+        key = "p";
-          key = "p";
+        desc = "Power";
-          desc = "Power";
+        submenu = [
-          submenu = [
+          {
-            {
+            key = "l";
-              key = "l";
+            desc = "Logout";
-              desc = "Logout";
+            cmd = "${logout}/bin/logout";
-              cmd = "${logout}/bin/logout";
+          }
-            }
+          {
-            {
+            key = "s";
-              key = "s";
+            desc = "Suspend";
-              desc = "Suspend";
+            cmd = "systemctl suspend";
-              cmd = "systemctl suspend";
+          }
-            }
+          {
-            {
+            key = "r";
-              key = "r";
+            desc = "Reboot";
-              desc = "Reboot";
+            cmd = "systemctl reboot";
-              cmd = "systemctl reboot";
+          }
-            }
+          {
-            {
+            key = "o";
-              key = "o";
+            desc = "Poweroff";
-              desc = "Poweroff";
+            cmd = "systemctl poweroff";
-              cmd = "systemctl poweroff";
+          }
-            }
+        ];
-          ];
+      }
-        }
+      {
-        {
+        key = "s";
-          key = "s";
+        desc = "Screenshots";
-          desc = "Screenshots";
+        submenu = [
-          submenu = [
+          {
-            {
+            key = "Print";
-              key = "Print";
+            desc = "Screenshot";
-              desc = "Screenshot";
+            cmd = "screenshot";
-              cmd = "screenshot";
+          }
-            }
+          {
-            {
+            key = "d";
-              key = "d";
+            desc = "Delayed";
-              desc = "Delayed";
+            cmd = "screenshot -d 3";
-              cmd = "screenshot -d 3";
+          }
-            }
+          {
-            {
+            key = "D";
-              key = "D";
+            desc = "Select, Delay, Edit, and Copy";
-              desc = "Select, Delay, Edit, and Copy";
+            cmd = "screenshot -secd 3";
-              cmd = "screenshot -secd 3";
+          }
-            }
+          {
-            {
+            key = "e";
-              key = "e";
+            desc = "Select, Edit, and Copy";
-              desc = "Select, Edit, and Copy";
+            cmd = "screenshot -sec";
-              cmd = "screenshot -sec";
+          }
-            }
+          {
-            {
+            key = "g";
-              key = "g";
+            desc = "Select, Gimp, and Copy";
-              desc = "Select, Gimp, and Copy";
+            cmd = "screenshot -sgc";
-              cmd = "screenshot -sgc";
+          }
-            }
+          {
-            {
+            key = "s";
-              key = "s";
+            desc = "Select and Copy";
-              desc = "Select and Copy";
+            cmd = "screenshot -sc";
-              cmd = "screenshot -sc";
+          }
-            }
+        ];
-          ];
+      }
-        }
+    ];
-      ]
-      ++ lib.lists.optional config.home.desktop.wl-kbptr.enable {
-        key = "m";
-        desc = "Mouse Warp";
-        cmd = "wl-kbptr";
-      };
   };
 }