flake.lock

@@ -1166,11 +1166,11 @@
     },
     "nixpkgs_9": {
       "locked": {
-        "lastModified": 1731239293,
+        "lastModified": 1730137625,
-        "narHash": "sha256-q2yjIWFFcTzp5REWQUOU9L6kHdCDmFDpqeix86SOvDc=",
+        "narHash": "sha256-9z8oOgFZiaguj+bbi3k4QhAD6JabWrnv7fscC/mt0KE=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "9256f7c71a195ebe7a218043d9f93390d49e6884",
+        "rev": "64b80bfb316b57cdb8919a9110ef63393d74382a",
         "type": "github"
       },
       "original": {

home/modules/linux/graphical/wayland.nix

@@ -61,12 +61,6 @@ let
     '';
     xdg.dataFile."dbus-1/services/org.freedesktop.Notifications.service".source = "${pkgs.kdePackages.plasma-workspace}/share/dbus-1/services/org.kde.plasma.Notifications.service";
   };
-
-  rofi-rbw-script = pkgs.writeShellApplication {
-    name = "rofi-rbw-script";
-    runtimeInputs = with pkgs; [ rofi wtype rofi-rbw ];
-    text = "rofi-rbw";
-  };
 in
 with lib;
 {
@@ -75,7 +69,6 @@ with lib;
     # Additional packages
     home.packages = with pkgs; [
       wl-clipboard # Clipboard management
-      rofi-rbw-script
 
       # Mimic the clipboard stuff in MacOS
       (pkgs.writeShellScriptBin "pbcopy" ''
@@ -86,16 +79,6 @@ with lib;
       '')
     ];
 
-    programs.rofi = {
-      enable = true;
-      package = pkgs.rofi-wayland;
-      cycle = true;
-      font = "monospace";
-      terminal = "${lib.getExe config.programs.kitty.package}";
-      theme = "Paper";
-      plugins = with pkgs; [ rofi-bluetooth rofi-calc rofi-rbw rofi-power-menu ];
-    };
-
     home.sessionVariables = {
       ANKI_WAYLAND = "1";
     };

home/modules/programs/my-sway/default.nix

@@ -45,6 +45,12 @@ let
     ${pkgs.grim}/bin/grim -g (${pkgs.slurp}/bin/slurp) - | ${pkgs.swappy}/bin/swappy -f -
   '';
 
+  rofi-rbw-script = pkgs.writeShellApplication {
+    name = "rofi-rbw-script";
+    runtimeInputs = with pkgs; [ rofi wtype rofi-rbw ];
+    text = "rofi-rbw";
+  };
+
   ignored-devices = [ "Surface_Headphones" ];
   playerctl = "${pkgs.playerctl}/bin/playerctl --ignore-player=${strings.concatStringsSep "," ignored-devices}";
 
@@ -217,7 +223,7 @@ in
         # Launcher
         "${mod}+space" = "exec rofi -show drun";
         "${mod}+tab" = "exec ${./rofi-window.py}";
-        "${mod}+shift+p" = "exec rofi-rbw-script";
+        "${mod}+shift+p" = "exec ${lib.getExe rofi-rbw-script}";
       } // {
         ## Splits
         "${mod}+v" = "split v";
@@ -775,9 +781,14 @@ in
     # For waybar
     font-awesome
   ]);
-
   config.programs.rofi = mkIf cfg.enable {
-    font = lib.mkForce "monospace ${toString cfg.fontSize}";
+    enable = true;
+    package = pkgs.rofi-wayland;
+    cycle = true;
+    font = "monospace ${toString cfg.fontSize}";
+    terminal = cfg.terminal;
+    theme = "Paper";
+    plugins = with pkgs; [ rofi-bluetooth rofi-calc rofi-rbw rofi-power-menu ];
   };
 }