From 554b05c33b6523e94367d5105dec76c3f7be4989 Mon Sep 17 00:00:00 2001 From: SebastianStork Date: Fri, 10 May 2024 17:43:09 +0200 Subject: [PATCH] Extract clipboard into it's own module --- modules/home/clipboard.nix | 19 +++++++++++++++++++ modules/home/de/hyprland/default.nix | 2 -- modules/home/de/hyprland/keybinds.nix | 2 +- modules/home/default.nix | 1 + users/seb/home.nix | 1 + 5 files changed, 22 insertions(+), 3 deletions(-) create mode 100644 modules/home/clipboard.nix diff --git a/modules/home/clipboard.nix b/modules/home/clipboard.nix new file mode 100644 index 0000000..f3c6fa8 --- /dev/null +++ b/modules/home/clipboard.nix @@ -0,0 +1,19 @@ +{ + config, + pkgs, + lib, + wrappers, + ... +}: { + options.myConfig.clipboard.enable = lib.mkEnableOption ""; + + config = lib.mkIf config.myConfig.clipboard.enable { + services.cliphist.enable = true; + + home.packages = [ + (pkgs.writeScriptBin "clipboard" '' + ${lib.getExe pkgs.cliphist} list | ${lib.getExe (wrappers.rofi {inherit (config.myConfig.de) theme;})} -dmenu -display-columns 2 | ${lib.getExe pkgs.cliphist} decode | ${lib.getExe' pkgs.wl-clipboard "wl-copy"} + '') + ]; + }; +} diff --git a/modules/home/de/hyprland/default.nix b/modules/home/de/hyprland/default.nix index e43cbec..2648d44 100644 --- a/modules/home/de/hyprland/default.nix +++ b/modules/home/de/hyprland/default.nix @@ -21,8 +21,6 @@ in { splash=false ''; - services.cliphist.enable = true; - services.dunst.enable = true; myConfig.de = { diff --git a/modules/home/de/hyprland/keybinds.nix b/modules/home/de/hyprland/keybinds.nix index 454f38a..e48d948 100644 --- a/modules/home/de/hyprland/keybinds.nix +++ b/modules/home/de/hyprland/keybinds.nix @@ -22,7 +22,7 @@ # Launch programs bind = $mod, RETURN, exec, kitty bindr = $mod, R, exec, pkill rofi || rofi -show drun - bind = $mod, V, exec, ${lib.getExe pkgs.cliphist} list | rofi -dmenu -display-columns 2 | ${lib.getExe pkgs.cliphist} decode | ${lib.getExe' pkgs.wl-clipboard "wl-copy"} + bind = $mod, V, exec, clipboard bind = $mod, B, exec, brave bind = $mod, F, exec, nemo bind = $mod, C, exec, codium diff --git a/modules/home/default.nix b/modules/home/default.nix index 93a63dd..2c40862 100644 --- a/modules/home/default.nix +++ b/modules/home/default.nix @@ -7,5 +7,6 @@ ./git.nix ./equalizer ./sops.nix + ./clipboard.nix ]; } diff --git a/users/seb/home.nix b/users/seb/home.nix index 5a55bf1..1535914 100644 --- a/users/seb/home.nix +++ b/users/seb/home.nix @@ -24,6 +24,7 @@ vscode.enable = true; equalizer.enable = true; sops.enable = false; + clipboard.enable = true; }; home.packages = [