options/custom/desktops/niri/binds.nix

@@ -135,7 +135,6 @@ in {
             (key "O" "Mod" (spawn [loupe "/tmp/wallpaper.png"]))
             (key "P" "Ctrl+Alt" (spawn [pkill "1password"]))
             (key "P" "Mod" (spawn _1password))
-            (key "P" "Mod+Shift" (spawn [_1password "--quick-access"]))
             (key "Q" "Mod" close-window)
             (key "R" "Mod" focus-window-or-workspace-down)
             (key "R" "Mod+Shift" move-window-down-or-to-workspace-down)

options/custom/desktops/niri/default.nix

@@ -35,13 +35,8 @@ in {
         };
       };
 
-      services = {
       # Enable rootless Xwayland
-        xwayland-satellite.enable = cfg.xwayland;
+      services.xwayland-satellite.enable = cfg.xwayland;
-
-        # Enable X11/Wayland clipboard sync
-        clipsync.enable = true;
-      };
     };
 
     # https://github.com/YaLTeR/niri

options/custom/desktops/niri/misc.nix

@@ -53,6 +53,7 @@ in {
             home = hm.home.homeDirectory;
           in
             [
+              {command = [_1password "--silent"];} # Launch password manager in background
               {command = [audio "--init"];} # Enforce audio profile state
               {command = [rm "${home}/.cache/walker/clipboard.gob"];} # Clear clipboard history
               {command = [sway-audio-idle-inhibit];} # Inhibit while audio is playing

options/custom/desktops/niri/rules.nix

@@ -203,21 +203,6 @@ in {
             }
 
             ### Overrides
-            # TODO: Remove when switching 1Password to Wayland
-            (let
-              height = builtins.floor (config.custom.height / config.custom.scale * 0.4); # 40%
-            in {
-              matches = [
-                {
-                  app-id = "^1Password";
-                  title = "^Quick Access — 1Password$";
-                }
-              ];
-
-              max-height = height;
-              min-height = height;
-              open-floating = true;
-            })
           ];
         };
       }

options/custom/programs/1password.nix

@@ -6,14 +6,11 @@
 }:
 with lib; let
   cfg = config.custom.programs._1password;
-
-  _1password = getExe config.programs._1password-gui.package;
 in {
   options.custom.programs._1password = {
     enable = mkOption {default = false;};
     agent = mkOption {default = true;};
     browser = mkOption {default = null;};
-    service = mkOption {default = true;};
   };
 
   config = mkIf cfg.enable {
@@ -41,26 +38,6 @@ in {
       };
     };
 
-    systemd.user.services."1password" = mkIf cfg.service {
-      enable = true;
-      wantedBy = ["graphical-session.target"];
-
-      unitConfig = {
-        Description = "Launch 1Password in the background";
-
-        After =
-          ["graphical-session.target"]
-          ++ optionals config.custom.services.xwayland-satellite.enable ["xwayland-satellite.service"];
-      };
-
-      serviceConfig = {
-        Type = "simple";
-
-        # FIXME: 1password clipboard does not work in wayland
-        ExecStart = "${_1password} --silent --ozone-platform=x11";
-      };
-    };
-
     home-manager.users.${config.custom.username} = {
       programs.ssh.extraConfig = mkIf cfg.agent ''
         Host *

options/custom/services/clipnotify.nix

@@ -1,43 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-with lib; let
-  cfg = config.custom.services.clipsync;
-
-  clipnotify = getExe pkgs.clipnotify;
-  wl-copy = getExe' pkgs.wl-clipboard "wl-copy";
-  xclip = getExe pkgs.xclip;
-in {
-  options.custom.services.clipsync = {
-    enable = mkOption {default = false;};
-  };
-
-  config = mkIf cfg.enable {
-    # https://github.com/cdown/clipnotify
-    systemd.user.services.clipsync = {
-      enable = true;
-      wantedBy = ["graphical-session.target"];
-
-      unitConfig = {
-        Description = "Sync clipboard between Wayland and X11";
-
-        After =
-          ["graphical-session.target"]
-          ++ optionals config.custom.services.xwayland-satellite.enable ["xwayland-satellite.service"];
-      };
-
-      serviceConfig = {
-        Type = "simple";
-
-        ExecStart = pkgs.writeShellScript "clipsync" ''
-          while ${clipnotify}; do
-            ${xclip} -selection clipboard -out | ${wl-copy}
-          done
-        '';
-      };
-    };
-  };
-}

options/custom/services/keyd.nix

@@ -1,7 +1,6 @@
 {
   config,
   lib,
-  pkgs,
   ...
 }:
 with lib; let
@@ -25,7 +24,7 @@ in {
         control.esc = "toggle(qwerty)"; # Control+Esc toggles qwerty
         shift.shift = "capslock"; # Both Shifts toggle Capslock
 
-        "meta+control+shift" = {
+        meta = {
           # Mouse repeat macro
           "," = "macro2(300, 100, leftmouse)";
           "." = "macro2(300, 100, rightmouse)";
@@ -133,7 +132,5 @@ in {
         };
       };
     };
-
-    environment.systemPackages = [pkgs.keyd];
   };
 }

options/custom/services/swaync/default.nix

@@ -40,7 +40,7 @@ in {
 
       # https://github.com/ErikReider/SwayNotificationCenter/blob/main/src/configSchema.json
       settings = {
-        control-center-height = builtins.floor (config.custom.height * 0.5); # 50%
+        control-center-height = builtins.floor (config.custom.height * 0.75); # 75%
         control-center-positionY = "bottom";
         control-center-width = 750;
         fit-to-screen = false;

options/custom/settings/packages.nix

@@ -38,10 +38,8 @@ in {
           testdisk # Data recovery tool
           trashy # CLI trash
           waypipe # Wayland proxy
-          wev # Wayland keysym tester
           wl-clipboard # Wayland clipboard
           xclip # X11 clipboard
-          xorg.xev # X11 keysym tester
 
           ### Dependencies
           man-pages