revamp

class/desktop/default.nix

@@ -14,6 +14,7 @@
     ./plasma.nix
     ./printing.nix
     ./syncthing.nix
+    ./users.nix
     ./vm.nix
     ./wine.nix
   ];

class/desktop/fs.nix

@@ -1,14 +1,5 @@
 {
   boot.initrd.luks.devices.main.device = "/dev/disk/by-label/cryptmain";
 
-  fileSystems = {
-    "/home" = {
-      device = "/dev/mapper/main";
-      fsType = "btrfs";
-      options = ["subvol=home" "compress=zstd" "noatime"];
-    };
-    "/nix".device = "/dev/mapper/main";
-    "/persist".device = "/dev/mapper/main";
-    "/var/log".device = "/dev/mapper/main";
-  };
+  fileSystems."/".device = "/dev/mapper/main";
 }

class/desktop/mullvad.nix

@@ -1,6 +1,4 @@
 {pkgs, ...}: {
-  environment.persistence."/persist".directories = ["/etc/mullvad-vpn"];
-
   services.mullvad-vpn = {
     enable = true;
     package = pkgs.mullvad-vpn;

class/desktop/networking.nix

@@ -1,6 +1,4 @@
 {
-  environment.persistence."/persist".directories = ["/etc/NetworkManager"];
-
   services.resolved.enable = true;
 
   networking = {

class/desktop/plasma.nix

@@ -11,25 +11,15 @@
     };
   };
 
-  environment = {
-    systemPackages = with pkgs.kdePackages; [discover kate];
-    sessionVariables = {
-      SUDO_ASKPASS = pkgs.writeShellScript "kdialogaskpass" ''
-        exec ${lib.getExe' pkgs.kdialog "kdialog"} --password Askpass
-      '';
-      MOZ_USE_XINPUT2 = "1";
-      GDK_SCALE = "1";
-    };
+  environment.systemPackages = with pkgs.kdePackages; [sddm-kcm discover kate];
+
+  programs = {
+    kdeconnect.enable = true;
+    partition-manager.enable = true;
   };
 
   xdg.portal = {
     xdgOpenUsePortal = true;
     extraPortals = [pkgs.xdg-desktop-portal-gtk];
   };
-
-  programs = {
-    kdeconnect.enable = true;
-    partition-manager.enable = true;
-    dconf.enable = true;
-  };
 }

class/desktop/users.nix

@@ -0,0 +1,3 @@
+{
+  users.mutableUsers = true;
+}

class/server/fs.nix

@@ -1,12 +1,3 @@
 {
-  fileSystems = {
-    "/home" = {
-      device = "tmpfs";
-      fsType = "tmpfs";
-      options = ["size=4G" "mode=751"];
-    };
-    "/nix".device = "/dev/disk/by-label/main";
-    "/persist".device = "/dev/disk/by-label/main";
-    "/var/log".device = "/dev/disk/by-label/main";
-  };
+  fileSystems."/".device = "/dev/disk/by-label/main";
 }

class/server/users.nix

@@ -0,0 +1,3 @@
+{
+  users.mutableUsers = false;
+}