From 1fcbebff6f3fb8b46b76c6fa7662b1dfa173e834 Mon Sep 17 00:00:00 2001
From: s-prechtl <stefan@tague.at>
Date: Sat, 28 Sep 2024 14:32:54 +0200
Subject: [PATCH] feat: hyprland small refactor + starting dunst

---
 hosts/default/configuration.nix   |  1 -
 modules/home-manager/dunst.nix    | 10 +++++++
 modules/home-manager/hyprland.nix | 44 +++++++++++++++----------------
 modules/home-manager/waybar.nix   |  1 -
 4 files changed, 32 insertions(+), 24 deletions(-)
 create mode 100644 modules/home-manager/dunst.nix

diff --git a/hosts/default/configuration.nix b/hosts/default/configuration.nix
index fd722a0..52fd042 100644
--- a/hosts/default/configuration.nix
+++ b/hosts/default/configuration.nix
@@ -107,7 +107,6 @@
     vim
     wget
     usbutils
-    dunst
     alacritty
     ripgrep
     git
diff --git a/modules/home-manager/dunst.nix b/modules/home-manager/dunst.nix
new file mode 100644
index 0000000..29ee053
--- /dev/null
+++ b/modules/home-manager/dunst.nix
@@ -0,0 +1,10 @@
+{...}: {
+  services.dunst = {
+    enable = true;
+    settings = {
+      global = {
+        frame_color = "#ffebdbb2";
+      };
+    };
+  };
+}
diff --git a/modules/home-manager/hyprland.nix b/modules/home-manager/hyprland.nix
index d9b40dc..71c684b 100644
--- a/modules/home-manager/hyprland.nix
+++ b/modules/home-manager/hyprland.nix
@@ -19,34 +19,35 @@
           "$mod,E,exec,nautilus"
           "$mod,D,exec,killall -q wofi; wofi --show drun -I"
           "$mod, P,exec,wofi-pass -c"
-          "SUPERSHIFT,R,exec,hyprctl reload"
+          "$mod SHIFT,R,exec,hyprctl reload"
           "$mod,space,togglefloating,"
           "ALTSHIFT, L, exec, swaylock"
           "$mod,F,fullscreen"
           "ALTSHIFT,K,exec,amixer set 'Master' 5%+"
           "ALTSHIFT,J,exec,amixer set 'Master' 5%-"
-          "SUPERSHIFT,N,exec, swaync-client -t -sw"
           "$mod, M, exec,hyprctl keyword monitor 'eDP-1, enable'"
-          "SUPERSHIFT, M, exec,hyprctl keyword monitor 'eDP-1, disable'"
-          "SUPERSHIFT,P,exec,hyprshot -m region -o ~/Screenshot/"
-          "SUPERALTSHIFT, P, exec, hyprshot -m window -o ~/Screenshot/"
+          "$mod SHIFT, M, exec,hyprctl keyword monitor 'eDP-1, disable'"
+          "$mod SHIFT,P,exec,hyprshot -m region -o ~/Screenshot/"
+          "$mod ALTSHIFT, P, exec, hyprshot -m window -o ~/Screenshot/"
 
           "$mod,left,movefocus,l"
           "$mod, H,movefocus,l"
-          "SUPERALT, left, movewindow, l"
-          "SUPERALT, H, movewindow, l"
+          "$mod ALT, left, movewindow, l"
+          "$mod ALT, H, movewindow, l"
           "$mod,right,movefocus,r"
           "$mod, L,movefocus,r"
-          "SUPERALT, right, movewindow, r"
-          "SUPERALT, L, movewindow, r"
+          "$mod ALT, right, movewindow, r"
+          "$mod ALT, L, movewindow, r"
           "$mod,up,movefocus,u"
           "$mod, K,movefocus,u"
-          "SUPERALT, up, movewindow, u"
-          "SUPERALT, K, movewindow, u"
+          "$mod ALT, up, movewindow, u"
+          "$mod ALT, K, movewindow, u"
           "$mod,down,movefocus,d"
           "$mod, J,movefocus,d"
-          "SUPERALT, down, movewindow, d"
-          "SUPERALT, J, movewindow, d"
+          "$mod ALT, down, movewindow, d"
+          "$mod ALT, J, movewindow, d"
+          "$mod, 0, workspace, 10"
+          "$mod SHIFT, 0, movetoworkspace, 10"
         ]
         ++ (
           # workspaces
@@ -69,14 +70,14 @@
       binde = [
         ",XF86MonBrightnessDown,exec,brightnessctl --device=intel_backlight s 5%-"
         ",XF86MonBrightnessUp,exec,brightnessctl --device=intel_backlight s 5%+"
-        "SUPERSHIFT,right,resizeactive, 10 0"
-        "SUPERSHIFT,L,resizeactive, 10 0"
-        "SUPERSHIFT,down,resizeactive, 0 10"
-        "SUPERSHIFT,J,resizeactive, 0 10"
-        "SUPERSHIFT,left,resizeactive, -10 0"
-        "SUPERSHIFT,H,resizeactive, -10 0"
-        "SUPERSHIFT,up,resizeactive, 0 -10"
-        "SUPERSHIFT,K,resizeactive, 0 -10"
+        "$mod SHIFT,right,resizeactive, 10 0"
+        "$mod SHIFT,L,resizeactive, 10 0"
+        "$mod SHIFT,down,resizeactive, 0 10"
+        "$mod SHIFT,J,resizeactive, 0 10"
+        "$mod SHIFT,left,resizeactive, -10 0"
+        "$mod SHIFT,H,resizeactive, -10 0"
+        "$mod SHIFT,up,resizeactive, 0 -10"
+        "$mod SHIFT,K,resizeactive, 0 -10"
       ];
 
       # MONITOR
@@ -142,7 +143,6 @@
       exec-once = [
         "waybar"
         "nm-applet"
-        "dunst"
         "whatpulse"
       ];
 
diff --git a/modules/home-manager/waybar.nix b/modules/home-manager/waybar.nix
index 97e9a5a..6ac90f6 100644
--- a/modules/home-manager/waybar.nix
+++ b/modules/home-manager/waybar.nix
@@ -27,7 +27,6 @@
           "bluetooth"
           "custom/arrow8"
           "pulseaudio"
-          "custom/kdeconnect"
           "tray"
         ];