diff --git a/modules/home/wms/programs/default.nix b/modules/home/wms/programs/default.nix index 4d7666f4..a3e86a78 100644 --- a/modules/home/wms/programs/default.nix +++ b/modules/home/wms/programs/default.nix @@ -6,17 +6,15 @@ ./rofi ./swaylock ./waybar - ./wlpicker ]; home.packages = with pkgs; lib.mkIf config.home.desktop.enable [ brightnessctl clipman - grim hyprpicker libnotify rot8 - slurp + shotman wdisplays wl-clipboard wlsunset diff --git a/modules/home/wms/programs/wlpicker/default.nix b/modules/home/wms/programs/wlpicker/default.nix deleted file mode 100644 index 6c098e2a..00000000 --- a/modules/home/wms/programs/wlpicker/default.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ config, lib, pkgs, ... }: -{ - home.packages = with pkgs; lib.mkIf config.home.desktop.enable [ - (pkgs.writeScriptBin "wlpicker" '' - # Get color position - position=$(slurp -b 00000000 -p) - - # Sleep to prevet grim always returning improper color - sleep 1 - - # Store the hex color value using imagemagick - grim -g "$position" -t png - | magick - -format '%[pixel:p{0,0}]' txt:- | tail -n 1 | cut -d ' ' -f 4 | wl-copy -n - '') - ]; -} diff --git a/modules/home/wms/sway/hotkeys/default.nix b/modules/home/wms/sway/hotkeys/default.nix index 299b1f22..9686d369 100644 --- a/modules/home/wms/sway/hotkeys/default.nix +++ b/modules/home/wms/sway/hotkeys/default.nix @@ -35,7 +35,7 @@ # Prime + ctrl + key "${primeMod}+Ctrl+s" = ''exec rofiscratch''; - "${primeMod}+Ctrl+c" = ''exec wlpicker && notify-send "Color copied to clipboard"''; + "${primeMod}+Ctrl+c" = ''exec hyprpicker | wl-copy -n && notify-send "Color copied to clipboard"''; ## Media @@ -60,9 +60,9 @@ "${primeMod}+Ctrl+n" = ''exec makoctl dismiss -a''; # Screenshots - "${secMod}+f" = ''exec ${pkgs.shotman}/bin/shotman --copy --capture region''; - "${secMod}+Shift+f" = ''exec ${pkgs.shotman}/bin/shotman --copy --capture window''; - "${secMod}+Ctrl+f" = ''exec ${pkgs.shotman}/bin/shotman --copy --capture output''; + "${secMod}+f" = ''exec shotman --copy --capture region''; + "${secMod}+Shift+f" = ''exec shotman --copy --capture window''; + "${secMod}+Ctrl+f" = ''exec shotman --copy --capture output''; # Display brightness "${primeMod}+equal" = ''exec brightnessctl s 5%+'';