update commits

2 files changed, 51 insertions, 48 deletions

diff --git a/home/desktops/hyprland/binds.nix b/home/desktops/hyprland/binds.nix
index df4ecc0..3266938 100644
--- a/home/desktops/hyprland/binds.nix
+++ b/home/desktops/hyprland/binds.nix
@@ -1,66 +1,67 @@
-{config, ...}: {
+{config, ...}: let
+  mod = "SUPER";
+in {
   wayland.windowManager.hyprland.settings = {
     # Keybinds
-    "$mod" = "SUPER";
     bind = [
       # Launch programs
 
-      "$mod, W, exec, ${config.default.browser}"
-      "$mod, D, exec, ${config.default.appLauncher}"
-      "$mod, L, exec, ${config.default.lockScreen}"
-      "$mod, Return, exec, ${config.default.terminal}"
+      "${mod}, W, exec, ${config.default.browser}"
+      "${mod}, D, exec, ${config.default.appLauncher}"
+      "${mod}, L, exec, ${config.default.lockScreen}"
+      "${mod}, Return, exec, ${config.default.terminal}"
       ", Print, exec, grimblast copy area"
 
       # Misc
 
-      "$mod SHIFT, L, exit"
-      #"$mod, tab, hyprexpo:expo, toggle"
+      "${mod} SHIFT, L, exit"
+      #"${mod}, tab, hyprexpo:expo, toggle"
 
       # Window operations
 
-      "$mod SHIFT, Q, killactive"
-      "$mod SHIFT, SPACE, togglefloating"
-      "$mod, F, fullscreen"
-      "$mod, J, togglesplit"
+      "${mod} SHIFT, Q, killactive"
+      "${mod} SHIFT, SPACE, togglefloating"
+      "${mod}, F, fullscreen"
+      "${mod}, J, togglesplit"
 
       # Move focus with mod + arrow keys
 
-      "$mod, left, movefocus, l"
-      "$mod, right, movefocus, r"
-      "$mod, up, movefocus, u"
-      "$mod, down, movefocus, d"
+      "${mod}, left, movefocus, l"
+      "${mod}, right, movefocus, r"
+      "${mod}, up, movefocus, u"
+      "${mod}, down, movefocus, d"
 
       # Move window across workspace with mod + arrow keys
 
-      "$mod SHIFT, left, hy3:movewindow, l"
-      "$mod SHIFT, right, hy3:movewindow, r"
-      "$mod SHIFT, up, hy3:movewindow, u"
-      "$mod SHIFT, down, hy3:movewindow, d"
+      "${mod} SHIFT, left, hy3:movewindow, l"
+      "${mod} SHIFT, right, hy3:movewindow, r"
+      "${mod} SHIFT, up, hy3:movewindow, u"
+      "${mod} SHIFT, down, hy3:movewindow, d"
 
       # Switch workspaces with mod + [0-9]
 
-      "$mod, 1, workspace, 1"
-      "$mod, 2, workspace, 2"
-      "$mod, 3, workspace, 3"
-      "$mod, 4, workspace, 4"
-      "$mod, 5, workspace, 5"
-      "$mod, 6, workspace, 6"
-      "$mod, 7, workspace, 7"
-      "$mod, 8, workspace, 8"
-      "$mod, 9, workspace, 9"
+      "${mod}, 1, workspace, 1"
+      "${mod}, 2, workspace, 2"
+      "${mod}, 3, workspace, 3"
+      "${mod}, 4, workspace, 4"
+      "${mod}, 5, workspace, 5"
+      "${mod}, 6, workspace, 6"
+      "${mod}, 7, workspace, 7"
+      "${mod}, 8, workspace, 8"
+      "${mod}, 9, workspace, 9"
 
       # Move active window to a workspace with mod + SHIFT + [0-9]
 
-      "$mod SHIFT, 1, movetoworkspacesilent, 1"
-      "$mod SHIFT, 2, movetoworkspacesilent, 2"
-      "$mod SHIFT, 3, movetoworkspacesilent, 3"
-      "$mod SHIFT, 4, movetoworkspacesilent, 4"
-      "$mod SHIFT, 5, movetoworkspacesilent, 5"
-      "$mod SHIFT, 6, movetoworkspacesilent, 6"
-      "$mod SHIFT, 7, movetoworkspacesilent, 7"
-      "$mod SHIFT, 8, movetoworkspacesilent, 8"
-      "$mod SHIFT, 9, movetoworkspacesilent, 9"
-      "$mod SHIFT, 0, movetoworkspacesilent, 10"
+      "${mod} SHIFT, 1, movetoworkspacesilent, 1"
+      "${mod} SHIFT, 2, movetoworkspacesilent, 2"
+      "${mod} SHIFT, 3, movetoworkspacesilent, 3"
+      "${mod} SHIFT, 4, movetoworkspacesilent, 4"
+      "${mod} SHIFT, 5, movetoworkspacesilent, 5"
+      "${mod} SHIFT, 6, movetoworkspacesilent, 6"
+      "${mod} SHIFT, 7, movetoworkspacesilent, 7"
+      "${mod} SHIFT, 8, movetoworkspacesilent, 8"
+      "${mod} SHIFT, 9, movetoworkspacesilent, 9"
+      "${mod} SHIFT, 0, movetoworkspacesilent, 10"
 
       # Move to tab
 
@@ -75,14 +76,14 @@
       "LALT, 9, hy3:focustab, index, 09"
       "LALT, 0, hy3:focustab, index, 10"
 
-      "$mod SHIFT, B, hy3:makegroup, h"
-      "$mod SHIFT, V, hy3:makegroup, v"
-      "$mod SHIFT, C, hy3:changegroup, toggletab"
+      "${mod} SHIFT, B, hy3:makegroup, h"
+      "${mod} SHIFT, V, hy3:makegroup, v"
+      "${mod} SHIFT, C, hy3:changegroup, toggletab"
 
       # Scroll through existing workspaces with mod + scroll
 
-      "$mod, mouse_down, workspace, e+1"
-      "$mod, mouse_up, workspace, e-1"
+      "${mod}, mouse_down, workspace, e+1"
+      "${mod}, mouse_up, workspace, e-1"
     ];
 
     bindn = [
@@ -96,8 +97,8 @@
     bindm = [
       # Move/resize windows with mod + LMB/RMB and dragging
 
-      "$mod, mouse:272, movewindow"
-      "$mod, mouse:273, resizewindow"
+      "${mod}, mouse:272, movewindow"
+      "${mod}, mouse:273, resizewindow"
     ];
 
     binde = [
diff --git a/home/desktops/hyprland/wallpaper.nix b/home/desktops/hyprland/wallpaper.nix
index e8fc861..0a404f5 100644
--- a/home/desktops/hyprland/wallpaper.nix
+++ b/home/desktops/hyprland/wallpaper.nix
@@ -3,8 +3,10 @@
     enable = config.desktops.hyprland.enable;
 
     settings = {
-      preload = config.theme.wallpaper;
-      wallpaper = ",${config.theme.wallpaper}";
+      wallpaper = {
+        monitor = "";
+        path = config.theme.wallpaper;
+      };
       splash = false;
     };
   };