Move snowflake to all systems, modify ly's sorting behavior

modules/system/programs/desktops/default.nix

@@ -14,5 +14,19 @@
 
     services.dbus.enable = true;
     security.pam.services.swaylock = {};
+
+    services.displayManager.ly.settings.waylandsessions = "/etc/greetd/environments";
+    environment.etc = {
+      "greetd/environments/sway.desktop".text = ''
+        [Desktop Entry]
+        Name=Sway
+        Exec=sway --unsupported-gpu
+      '';
+      "greetd/environments/niri.desktop".text = ''
+        [Desktop Entry]
+        Name=Niri
+        Exec=niri-session
+      '';
+    };
   };
 }

modules/system/services/general/default.nix

@@ -9,6 +9,7 @@
     ./libvirtd
     ./mpd
     ./portals
+    ./snowflake
     ./ssh
     ./sunshine
     ./tlp

modules/system/services/general/displaymanager/default.nix

@@ -1,25 +1,7 @@
-{ config, pkgs, lib, ... }:
+{ config, ... }:
 {
-  config = lib.mkIf config.system.desktop.enable {
-    services.displayManager.ly = {
-      enable = true;
-      settings = {
-	vi_mode = true;
-        waylandsessions = "/etc/greetd/environments";
-      };
-    };
-
-    environment.etc = {
-      "greetd/environments/sway.desktop".text = ''
-        [Desktop Entry]
-        Name=Sway
-        Exec=sway --unsupported-gpu
-      '';
-      "greetd/environments/niri.desktop".text = ''
-        [Desktop Entry]
-        Name=Niri
-        Exec=niri-session
-      '';
-    };
+  services.displayManager.ly = {
+    enable = config.system.desktop.enable;
+    settings.vi_mode = true;
   };
 }

modules/system/services/server/default.nix

@@ -10,7 +10,6 @@
     ./minecraft
     ./mysql
     ./nginx
-    ./snowflake
     ./social
     ./transmission
     ./vaultwarden

modules/system/services/server/fileserver/default.nix

@@ -1,7 +1,8 @@
 { ... }:
 {
   imports = [
-    ./local
-    ./public
+    ./nextcloud
+    ./nfs
+    ./samba
   ];
 }

modules/system/services/server/fileserver/local/default.nix

@@ -1,7 +0,0 @@
-{ ... }:
-{
-  imports = [
-    ./nfs
-    ./samba
-  ];
-}

modules/system/services/server/fileserver/public/default.nix

@@ -1,4 +0,0 @@
-{ ... }:
-{
-  imports = [ ./nextcloud ];
-}