merge from main

1 files changed, 6 insertions, 4 deletions

diff --git a/modules/desktop/hjem/wm/sway.nix b/modules/desktop/hjem/wm/sway.nix
index 1cd7750..367cd0d 100644
--- a/modules/desktop/hjem/wm/sway.nix
+++ b/modules/desktop/hjem/wm/sway.nix
@@ -4,7 +4,7 @@
   lib,
   ...
 }: let
-  cfg = config.collinux.desktop.sway;
+  cfg = config.collinux.desktop.wm.sway;
 
   colors = ''
     set $rosewater #f5e0dc
@@ -36,7 +36,6 @@
   '';
 
   settings = ''
-    exec ${pkgs.foot}/bin/foot --server
     exec ${pkgs.swaybg}/bin/swaybg -i ${config.collinux.desktop.wallpaper}
     exec ${pkgs.dunst}/bin/dunst
 
@@ -74,13 +73,15 @@
     bindsym Mod4+Shift+8 move container to workspace number 8
     bindsym Mod4+Shift+9 move container to workspace number 9
 
-    bindsym Mod4+Return       exec ${pkgs.foot}/bin/footclient
-    bindsym Mod4+Shift+Return exec ${pkgs.foot}/bin/foot
+    bindsym Mod4+Return       exec ${pkgs.foot}/bin/foot
     bindsym Mod4+Space        exec ${pkgs.fuzzel}/bin/fuzzel
     bindsym Mod4+b            exec ${pkgs.firefox}/bin/firefox
     bindsym Mod4+Shift+b      exec ${pkgs.qutebrowser}/bin/qutebrowser
     bindsym Mod4+q kill
 
+    bindsym Mod4+Shift+s exec '${pkgs.grim}/bin/grim -g "$(${pkgs.slurp}/bin/slurp)" ~/Pictures/$(date +"%s_grim.png")'
+    bindsym Mod4+Alt+s exec '${pkgs.hyprpicker}/bin/hyprpicker'
+
     bindsym XF86AudioRaiseVolume  exec 'wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+; dunstify -t 300 -h string:x-canonical-private-synchronous:audio "Volume: " -h "int:value:$(dec=$(wpctl get-volume @DEFAULT_AUDIO_SINK@ | cut -d\" \" -f2);echo "$dec * 100" | ${pkgs.bc}/bin/bc)"'
     bindsym XF86AudioLowerVolume  exec 'wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-; dunstify -t 300 -h string:x-canonical-private-synchronous:audio "Volume: " -h "int:value:$(dec=$(wpctl get-volume @DEFAULT_AUDIO_SINK@ | cut -d\" \" -f2);echo "$dec * 100" | ${pkgs.bc}/bin/bc)"'
 
@@ -106,5 +107,6 @@ in
       sway
       brightnessctl
       playerctl
+      wl-clipboard
     ];
   }