flake.lock

@@ -829,11 +829,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1741792691,
+        "lastModified": 1719007440,
-        "narHash": "sha256-f0BVt1/cvA0DQ/q3rB+HY4g4tKksd03ZkzI4xehC2Ew=",
+        "narHash": "sha256-ll9zg1P0W8cMk1Co1BOQOrICr9dDgUw+ZL3mGy5GnOg=",
         "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "e1f12151258b12c567f456d8248e4694e9390613",
+        "rev": "e6d40db8924c3a663e1f76e0daed09510fea51c3",
         "type": "github"
       },
       "original": {

home/modules/linux/graphical/wayland.nix

@@ -84,22 +84,15 @@ let
         "${pkgs.kdePackages.plasma-workspace}/share/dbus-1/services/org.kde.plasma.Notifications.service";
     };
 
-  rofi-rbw-script = pkgs.writeTextFile rec {
+  rofi-rbw-script = pkgs.writeShellApplication {
     name = "rofi-rbw-script";
-    text = ''
+    runtimeInputs = with pkgs; [
-      #!/usr/bin/env fish
+      rofi
-      set -a PATH ${
+      wtype
-        lib.concatMapStringsSep " " (p: "${lib.getBin p}/bin") [
-          config.programs.rofi.package
-          pkgs.ydotool
-          pkgs.rofi-rbw
-        ]
-      }
       rofi-rbw
-    '';
+    ];
-    executable = true;
+    text = "rofi-rbw";
-    destination = "/bin/${name}";
+    meta.mainProgram = "rofi-rbw-script";
-    meta.mainProgram = name;
   };
 in
 with lib;

home/modules/programs/my-niri.nix

@@ -12,20 +12,12 @@ let
   playerctl = lib.getExe pkgs.playerctl;
   amixer = lib.getExe' pkgs.alsa-utils "amixer";
   brightnessctl = lib.getExe pkgs.brightnessctl;
-  app-menu = "${pkgs.dmenu}/bin/dmenu_path | ${pkgs.bemenu}/bin/bemenu | ${pkgs.findutils}/bin/xargs niri msg action spawn --";
+  app-menu = "${pkgs.dmenu}/bin/dmenu_path | ${pkgs.bemenu}/bin/bemenu | ${pkgs.findutils}/bin/xargs swaymsg exec --";
 
   wallpaper = config.linux.graphical.wallpaper;
 
   xwayland-display = ":0";
 
-  # Override for lack of per-keyboard layout
-  ydotool-en = pkgs.writeScriptBin "ydotool" ''
-    #!/usr/bin/env sh
-    niri msg action switch-layout 1 && fcitx5-remote -c # us
-    ${lib.getExe pkgs.ydotool} "$@"
-    niri msg action switch-layout 0 # ja
-  '';
-
 in
 {
   options.programs.my-niri = {
@@ -85,7 +77,6 @@ in
   };
 
   config = lib.mkIf cfg.enable {
-    home.packages = [ ydotool-en ];
     programs.my-niri.workspaces = {
       # Default workspaces, always there
       "01" = {
@@ -167,7 +158,7 @@ in
           XDG_MENU_PREFIX = "plasma-";
         };
       input.keyboard.xkb = {
-        layout = "jp,us";
+        layout = "jp";
       };
       input.touchpad = lib.mkIf cfg.enableLaptop {
         tap = true;
@@ -375,7 +366,7 @@ in
 
         # Some basic spawns
         "Mod+Return".action = spawn (lib.getExe config.linux.graphical.defaults.terminal.package);
-        "Mod+Space".action = spawn "rofi" "-show" "drun";
+        "Mod+Space".action = spawn (lib.getExe pkgs.rofi) "-show" "drun";
         "Mod+R".action = sh app-menu;
         "Mod+Semicolon".action = spawn cfg.lock-command;
         "Mod+Shift+P".action = spawn "rofi-rbw-script";

home/nki-framework.nix

@@ -53,7 +53,7 @@
     let
       change-mode = pkgs.writeScript "change-mode" ''
         #!/usr/bin/env ${lib.getExe pkgs.fish}
-        set -ax PATH ${lib.getBin pkgs.power-profiles-daemon} ${lib.getBin config.programs.rofi.package} ${lib.getBin pkgs.ripgrep}
+        set -ax PATH ${lib.getBin pkgs.power-profiles-daemon} ${lib.getBin pkgs.rofi} ${lib.getBin pkgs.ripgrep}
 
         set profiles (powerprofilesctl list | rg "^[ *] (\S+):" -r '$1')
         set selected_index (math (contains -i (powerprofilesctl get) $profiles) - 1)

modules/common/linux/default.nix

@@ -79,10 +79,6 @@ let
         programs.niri.package = pkgs.niri-stable;
         # Override gnome-keyring disabling
         services.gnome.gnome-keyring.enable = lib.mkForce false;
-        # ydotool
-        programs.ydotool.enable = true;
-        users.extraGroups.${config.programs.ydotool.group}.members = [ cfg.username ];
-
       };
 
     logitech =