refactor(clipboard): simplify picker wiring #170

Merged
alexion merged 1 commits from refactor/clipboard-module-cleanup into main 2026-10-11 21:40:43 -04:00
Showing only changes of commit 2edad6c5df - Show all commits

View File

@@ -6,21 +6,15 @@
}: }:
# Clipboard history: cliphist records every copy, picked back through rofi. # Clipboard history: cliphist records every copy, picked back through rofi.
let let
user = config.user.name;
cliphist = "${pkgs.cliphist}/bin/cliphist";
rofi = "${pkgs.rofi}/bin/rofi";
wl-copy = "${pkgs.wl-clipboard}/bin/wl-copy";
# The picker reuses the themed rofi, so history looks like every other menu # The picker reuses the themed rofi, so history looks like every other menu
# the launcher drives. # the launcher drives.
# decode is needed because list emits id-prefixed lines rather than the copied # decode is needed because list emits id-prefixed lines rather than the copied
# bytes, so the chosen id has to be resolved back before it can be re-copied. # bytes, so the chosen id has to be resolved back before it can be re-copied.
picker = pkgs.writeShellScript "clipboard-picker" '' picker = pkgs.writeShellScript "clipboard-picker" ''
${cliphist} list \ ${lib.getExe pkgs.cliphist} list \
| ${rofi} -dmenu -i -p Clipboard \ | ${lib.getExe pkgs.rofi} -dmenu -i -p Clipboard \
| ${cliphist} decode \ | ${lib.getExe pkgs.cliphist} decode \
| ${wl-copy} | ${lib.getExe' pkgs.wl-clipboard "wl-copy"}
''; '';
in in
{ {
@@ -28,15 +22,7 @@ in
lib.mkEnableOption "cliphist clipboard history"; lib.mkEnableOption "cliphist clipboard history";
config = lib.mkIf config.modules.desktop.utilities.clipboard.enable { config = lib.mkIf config.modules.desktop.utilities.clipboard.enable {
registry.keybind.${config.networking.hostName}.clipboard-history = { home-manager.users.${config.user.name} = {
keys = "SUPER + SHIFT + V";
action = {
kind = "exec";
command = "${picker}";
};
};
home-manager.users.${user} = {
# wl-copy and wl-paste on PATH, so the shell can pipe into and out of the # wl-copy and wl-paste on PATH, so the shell can pipe into and out of the
# clipboard. # clipboard.
# The watchers and picker above reach wl-clipboard by store path, so this # The watchers and picker above reach wl-clipboard by store path, so this
@@ -47,5 +33,13 @@ in
# session so uwsm starts and stops them with it. # session so uwsm starts and stops them with it.
services.cliphist.enable = true; services.cliphist.enable = true;
}; };
registry.keybind.${config.networking.hostName}.clipboard-history = {
keys = "SUPER + SHIFT + V";
action = {
kind = "exec";
command = "${picker}";
};
};
}; };
} }