diff --git a/distro/nix/common.nix b/distro/nix/common.nix index 48c906a2..3fb89de3 100644 --- a/distro/nix/common.nix +++ b/distro/nix/common.nix @@ -13,10 +13,6 @@ in dmsPkgs.dms-shell ] ++ lib.optional cfg.enableSystemMonitoring dmsPkgs.dgop - ++ lib.optionals cfg.enableClipboard [ - pkgs.cliphist - pkgs.wl-clipboard - ] ++ lib.optionals cfg.enableVPN [ pkgs.glib pkgs.networkmanager diff --git a/distro/nix/niri.nix b/distro/nix/niri.nix index c889df9d..24e6ceb0 100644 --- a/distro/nix/niri.nix +++ b/distro/nix/niri.nix @@ -76,18 +76,16 @@ in action = dms-ipc "night" "toggle"; hotkey-overlay.title = "Toggle Night Mode"; }; + "Mod+V" = { + action = dms-ipc "clipboard" "toggle"; + hotkey-overlay.title = "Toggle Clipboard Manager"; + }; } // lib.attrsets.optionalAttrs cfg.enableSystemMonitoring { "Mod+M" = { action = dms-ipc "processlist" "toggle"; hotkey-overlay.title = "Toggle Process List"; }; - } - // lib.attrsets.optionalAttrs cfg.enableClipboard { - "Mod+V" = { - action = dms-ipc "clipboard" "toggle"; - hotkey-overlay.title = "Toggle Clipboard Manager"; - }; }; }) @@ -99,16 +97,6 @@ in "run" ]; } - ] - ++ lib.optionals cfg.enableClipboard [ - { - command = [ - "wl-paste" - "--watch" - "cliphist" - "store" - ]; - } ]; }) ]; diff --git a/distro/nix/options.nix b/distro/nix/options.nix index 6cfc8e8a..396f78fe 100644 --- a/distro/nix/options.nix +++ b/distro/nix/options.nix @@ -16,6 +16,7 @@ in imports = [ (lib.mkRemovedOptionModule (path ++ [ "enableBrightnessControl" ]) builtInRemovedMsg) (lib.mkRemovedOptionModule (path ++ [ "enableColorPicker" ]) builtInRemovedMsg) + (lib.mkRemovedOptionModule (path ++ [ "enableClipboard" ]) builtInRemovedMsg) (lib.mkRemovedOptionModule ( path ++ [ "enableSystemSound" ] ) "qtmultimedia is now included on dms-shell package.") @@ -36,11 +37,6 @@ in default = true; description = "Add needed dependencies to use system monitoring widgets"; }; - enableClipboard = lib.mkOption { - type = types.bool; - default = true; - description = "Add needed dependencies to use the clipboard widget"; - }; enableVPN = lib.mkOption { type = types.bool; default = true;