code rules

environments/cinnamon.nix

@@ -1,5 +1,11 @@
 { pkgs, ... }:
 {
+  users.users.jawz.packages = builtins.attrValues {
+    inherit (pkgs)
+      adw-gtk3 # theme legacy applications
+      papirus-icon-theme # icon theme
+      ;
+  };
   services = {
     libinput.enable = true;
     xserver = {
@@ -12,10 +18,4 @@
     enable = true;
     style = "adwaita";
   };
-  users.users.jawz.packages = builtins.attrValues {
-    inherit (pkgs)
-      adw-gtk3 # theme legacy applications
-      papirus-icon-theme # icon theme
-      ;
-  };
 }

environments/gnome.nix

@@ -23,11 +23,6 @@ in
   };
   config = lib.mkIf cfg.enable {
     qt.enable = true;
-    services = {
-      gvfs.enable = true;
-      displayManager.gdm.enable = true;
-      desktopManager.gnome.enable = true;
-    };
     environment.gnome.excludePackages = builtins.attrValues {
       inherit (pkgs)
         baobab
@@ -55,5 +50,10 @@ in
           ;
       }
     );
+    services = {
+      gvfs.enable = true;
+      displayManager.gdm.enable = true;
+      desktopManager.gnome.enable = true;
+    };
   };
 }

environments/hyprland-home.nix

@@ -10,6 +10,9 @@ let
 in
 {
   programs = {
+    waybar = waybarConfig.programs.waybar // {
+      style = waybarStyle;
+    };
     wofi = {
       enable = true;
       settings = {
@@ -19,29 +22,10 @@ in
         width = "30%";
       };
     };
-    waybar = waybarConfig.programs.waybar // {
-      style = waybarStyle;
-    };
   };
   wayland.windowManager.hyprland = {
     enable = true;
     settings = {
-      general = {
-        gaps_in = 5;
-        gaps_out = 10;
-        border_size = 3;
-        layout = "dwindle";
-      };
-      misc = {
-        disable_hyprland_logo = true;
-        disable_splash_rendering = true;
-        force_default_wallpaper = 0;
-      };
-      dwindle = {
-        pseudotile = true;
-        preserve_split = true;
-        force_split = 2;
-      };
       bind = [
         "${mod}, return, exec, ghostty"
         "${mod}, Q, killactive,"
@@ -108,6 +92,22 @@ in
         "${mod}, mouse:272, movewindow"
         "${mod}, mouse:273, resizewindow"
       ];
+      general = {
+        gaps_in = 5;
+        gaps_out = 10;
+        border_size = 3;
+        layout = "dwindle";
+      };
+      misc = {
+        disable_hyprland_logo = true;
+        disable_splash_rendering = true;
+        force_default_wallpaper = 0;
+      };
+      dwindle = {
+        pseudotile = true;
+        preserve_split = true;
+        force_split = 2;
+      };
     };
   };
 }

environments/hyprland.nix

@@ -4,13 +4,6 @@
 }:
 {
   programs.hyprland.enable = true;
-  services.greetd = {
-    enable = true;
-    settings.default_session = {
-      command = "${pkgs.tuigreet}/bin/tuigreet --time --cmd Hyprland";
-      user = "greeter";
-    };
-  };
   users.users.jawz.packages = builtins.attrValues {
     inherit (pkgs)
       wl-clipboard-rs
@@ -25,4 +18,11 @@
       ;
   };
   home-manager.users.jawz.imports = [ ./hyprland-home.nix ];
+  services.greetd = {
+    enable = true;
+    settings.default_session = {
+      command = "${pkgs.tuigreet}/bin/tuigreet --time --cmd Hyprland";
+      user = "greeter";
+    };
+  };
 }