fix: hyprland

modules/hypr/hyprland/apps/browser.nix

@@ -2,6 +2,7 @@
 
 {
   wayland.windowManager.hyprland = {
+    settings = {
       windowrule = [
         "match:class ^(chrome-facebook.com__-Default)$, workspace 1"
         "match:class ^(zen)$, workspace 2"
@@ -22,6 +23,7 @@
         "$mainMod Control_L, x, exec, uwsm app -- ~/.nix-profile/share/applications/x.desktop"
         "$mainMod Control_L, x, focuswindow, class:^(chrome-x.com__-Default)$"
       ];
+    };
 
     extraConfig =
       #hyprlang

modules/hypr/hyprland/apps/communicators.nix

@@ -2,6 +2,8 @@
 
 {
   wayland.windowManager.hyprland = {
+    settings = {
+
       windowrule = [
         # general rules
         "match:class ^(signal)$, workspace 1"
@@ -16,6 +18,8 @@
         "$mainMod Control_L, v, exec, uwsm app -- vesktop"
         "$mainMod Control_L, v, focuswindow, class:^(vesktop)$"
       ];
+
+    };
     extraConfig =
       #hyprlang
       ''

modules/hypr/hyprland/apps/games.nix

@@ -2,6 +2,7 @@
 
 {
   wayland.windowManager.hyprland = {
+    settings = {
       windowrule = [
         "match:class ^(steam)$, workspace 3 silent"
         "match:class ^(heroic)$, workspace 3"
@@ -13,6 +14,7 @@
         "$mainMod Control_L, g, exec, uwsm app -- steam"
         "$mainMod Control_L, g, focuswindow, class:^(steam)$"
       ];
+    };
     extraConfig =
       #hyprlang
       ''
@@ -37,5 +39,4 @@
         }
       '';
   };
-
 }

modules/hypr/hyprland/apps/misc.nix

@@ -2,6 +2,8 @@
 
 {
   wayland.windowManager.hyprland = {
+    settings = {
+
       windowrule = [
         # general rules
         "match:class ^(winboat)$, workspace 5"
@@ -23,6 +25,7 @@
         "$mainMod Control_L, m, exec, [workspace 9] uwsm app -- $music_player"
         "$mainMod CONTROL_L L_SHIFT, B, exec, killall ashell && uwsm app -- ashell"
       ];
+    };
 
     extraConfig =
       #hyprlang

modules/hypr/hyprland/autostart.nix

@@ -7,7 +7,7 @@ let
   uwsm_run = "${pkgs.uwsm}/bin/uwsm";
 in
 {
-  wayland.windowManager.hyprland = {
+  wayland.windowManager.hyprland.settings = {
     "exec-once" = [
       "wl-paste --type text --watch cliphist store"
       "wl-paste --type image --watch cliphist store"

modules/hypr/hyprland/general.nix

@@ -4,7 +4,6 @@
   ...
 }:
 let
-  uwsm_run = "${pkgs.uwsm}/bin/uwsm";
   exe = pkg: bin: if userConfig.isNixOS then "${pkg}/bin/${bin}" else "/usr/bin/${bin}";
   jq = exe pkgs.jq "jq";
   grim = exe pkgs.grim "grim";
@@ -26,6 +25,8 @@ in
     #portalPackage = lib.mkIf (userConfig.isNixOS
     #) inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland;
 
+    settings = {
+
       xwayland.enable = true;
       general = {
         gaps_in = 4;
@@ -102,4 +103,5 @@ in
         "$mainMod, PAUSE, exec, ${playerctl} play-pause --player spotify"
       ];
     };
+  };
 }

modules/hypr/hyprland/hardware.nix

@@ -2,6 +2,7 @@
 
 {
   wayland.windowManager.hyprland = {
+    settings = {
       input = {
         kb_layout = "pl";
         kb_variant = "";
@@ -36,6 +37,7 @@
         ", XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%- && ~/.local/bin/wp-vol.sh && paplay /usr/share/sounds/freedesktop/stereo/bell.oga"
         ", XF86AudioMicMute, exec, wpctl set-mute @DEFAULT_SOURCE@ toggle"
       ];
+    };
 
     extraConfig =
       #hyprlang

modules/hypr/hyprland/layouts.nix

@@ -2,7 +2,8 @@
   ...
 }:
 {
-  wayland.windowManager.hyprland = {
+  wayland.windowManager.hyprland.settings = {
+
     dwindle = {
       preserve_split = true;
     };

modules/hypr/hyprland/looks.nix

@@ -4,6 +4,8 @@
 }:
 {
   wayland.windowManager.hyprland = {
+    settings = {
+
       animations = {
         enabled = userConfig.animations;
         bezier = [
@@ -52,4 +54,5 @@
         };
       };
     };
+  };
 }

modules/hypr/hyprland/workspaces.nix

@@ -1,7 +1,7 @@
 { ... }:
 {
 
-  wayland.windowManager.hyprland = {
+  wayland.windowManager.hyprland.settings = {
     workspace = [
       "1, monitor:DP-2"
       "1, layout: dwindle"