enable plasma6 on shodan so it can be used as the desktop session

modules/nixos/preservation/default.nix

@@ -1,5 +1,10 @@
-{ lib, config, ...}:
+{
-let cfg = config.preservationSetup; in {
+  lib,
+  config,
+  ...
+}: let
+  cfg = config.preservationSetup;
+in {
   options = {
     preservationSetup.enable = lib.mkEnableOption "Enable setup of preservation of files in /persistent";
     global.desktop = lib.mkOption {
@@ -15,14 +20,14 @@ let cfg = config.preservationSetup; in {
   };
 
   config = lib.mkIf cfg.enable {
-
     preservation = {
       # the module doesn't do anything unless it is enabled
       enable = true;
 
       preserveAt."/persistent" = {
         # preserve system directories
-      directories = [
+        directories =
+          [
             #Shared
             "/var/lib/sbctl"
             "/var/lib/bluetooth"
@@ -44,11 +49,13 @@ let cfg = config.preservationSetup; in {
               directory = "/var/secrets";
               inInitrd = true;
             }
-      ] ++ lib.mkIf (cfg.desktop == true) [
+          ]
+          ++ lib.mkIf (cfg.desktop == true) [
             #Desktop
             "/var/lib/decky-loader"
             "/var/lib/flatpak"
-      ] ++ lib.mkIf (cfg.server == true) [
+          ]
+          ++ lib.mkIf (cfg.server == true) [
             #Server
             "/var/lib/continuwuity"
             "/var/lib/dhcpcd"
@@ -108,12 +115,14 @@ let cfg = config.preservationSetup; in {
             commonMountOptions = [
               "x-gvfs-hide"
             ];
-          directories = [
+            directories =
+              [
                 {
                   directory = ".ssh";
                   mode = "0700";
                 }
-          ] ++ lib.mkIf (cfg.desktop == true) [
+              ]
+              ++ lib.mkIf (cfg.desktop == true) [
                 #Desktop
                 ".local/state/wireplumber"
                 ".local/share/direnv"
@@ -152,6 +161,7 @@ let cfg = config.preservationSetup; in {
                 ".config/sops"
                 ".config/vesktop"
                 ".config/kde.org"
+                ".config/heroic"
               ];
             #Shared
             files = [

modules/nixos/sops/default.nix

@@ -1,5 +1,10 @@
-{ lib, config, ...}:
+{
-let cfg = config.sopsSetup; in {
+  lib,
+  config,
+  ...
+}: let
+  cfg = config.sopsSetup;
+in {
   options = {
     sopsSetup.enable = lib.mkEnableOption "Enable Module";
     global.desktop = lib.mkOption {

modules/nixos/stylix/default.nix

@@ -1,5 +1,11 @@
-  { lib, config, pkgs, ...}:
+{
-let cfg = config.stylixSetup; in {
+  lib,
+  config,
+  pkgs,
+  ...
+}: let
+  cfg = config.stylixSetup;
+in {
   options = {
     stylixSetup.enable = lib.mkEnableOption "Enable Module";
   };

nixos/desktop/default.nix

@@ -173,8 +173,6 @@
     #   enable = true;
     #   wayland.enable = true;
     # };
-    displayManager.defaultSession = lib.mkDefault "plasma";
-    desktopManager.plasma6.enable = true;
     desktopManager.plasma6.notoPackage = pkgs.atkinson-hyperlegible;
 
     # Enable flatpak support

nixos/hosts/EDI/configuration.nix

@@ -41,15 +41,15 @@
   virtualisation.libvirtd.enable = true;
 
   virtualisation.spiceUSBRedirection.enable = true;
-
+  services = {
-  services.displayManager.plasma-login-manager = {
+    displayManager.plasma-login-manager = {
       enable = true;
     };
 
-  services.displayManager.defaultSession = "plasma";
+    displayManager.defaultSession = "plasma";
-  services.desktopManager.plasma6.enable = true;
+    desktopManager.plasma6.enable = true;
 
-  services.samba = {
+    samba = {
       enable = true;
       openFirewall = true;
       settings = {
@@ -69,11 +69,12 @@
         };
       };
     };
-  users.groups.samba.members = ["lillian"];
 
-  services.vpn-ip = {
+    vpn-ip = {
       ip = "3";
     };
+  };
+  users.groups.samba.members = ["lillian"];
 
   networking = {
     hostName = "EDI";

nixos/hosts/GLaDOS/configuration.nix

@@ -4,6 +4,7 @@
   inputs,
   outputs,
   pkgs,
+  lib,
   ...
 }: {
   # You can import other NixOS modules here
@@ -30,21 +31,22 @@
   environment.systemPackages = with pkgs; [
     gparted
   ];
-
+  services = {
-  services.displayManager.plasma-login-manager = {
+    displayManager.plasma-login-manager = {
       enable = true;
     };
 
-  services.displayManager.defaultSession = "plasma";
+    displayManager.defaultSession = "plasma";
-  services.desktopManager.plasma6.enable = true;
+    desktopManager.plasma6.enable = true;
 
-  services.vpn-ip = {
+    vpn-ip = {
       ip = "2";
     };
 
-  networking.hostName = "GLaDOS";
+    xserver.videoDrivers = ["amdgpu"];
+  };
 
-  services.xserver.videoDrivers = ["amdgpu"];
+  networking.hostName = "GLaDOS";
   programs = {
     steam = {
       enable = true;

nixos/hosts/shodan/configuration.nix

@@ -52,11 +52,37 @@
     kernelParams = ["quiet" "udev.log_priority=0" "fbcon=vc:2-6" "console=tty0"];
     plymouth.enable = true;
   };
-  services.udev.extraRules = ''
+  services = {
+    udev.extraRules = ''
       KERNEL=="hidraw*", ATTRS{idVendor}=="2dc8", MODE="0660", TAG+="uaccess"
       KERNEL=="hidraw*", KERNELS=="*2DC8:*", MODE="0660", TAG+="uaccess"
       SUBSYSTEM=="hidraw", ATTRS{idVendor}=="2dc8", MODE="0666"
     '';
+    vpn-ip = {
+      ip = "4";
+    };
+
+    openssh = {
+      enable = true;
+      settings = {
+        # require public key authentication for better security
+        PasswordAuthentication = false;
+        KbdInteractiveAuthentication = false;
+        PermitRootLogin = "no";
+      };
+    };
+    desktopManager.plasma6.enable = true;
+    displayManager = {
+      # defaultSession = "plasma";
+      sddm.wayland.enable = lib.mkForce true;
+      sddm.settings = {
+        Autologin = {
+          Session = "plasma.desktop";
+          User = "lillian";
+        };
+      };
+    };
+  };
   zramSwap.enable = false;
   networking = {
     domain = "";
@@ -72,32 +98,8 @@
 
     hostName = "shodan";
   };
-  services.vpn-ip = {
-    ip = "4";
-  };
 
   xdg.portal.extraPortals = [pkgs.kdePackages.xdg-desktop-portal-kde];
-  services = {
-    openssh = {
-      enable = true;
-      settings = {
-        # require public key authentication for better security
-        PasswordAuthentication = false;
-        KbdInteractiveAuthentication = false;
-        PermitRootLogin = "no";
-      };
-    };
-    displayManager = {
-      # defaultSession = "plasma";
-      sddm.wayland.enable = lib.mkForce true;
-      sddm.settings = {
-        Autologin = {
-          Session = "plasma.desktop";
-          User = "lillian";
-        };
-      };
-    };
-  };
 
   environment.systemPackages = with pkgs; [
     # Custom tools

nixos/shared/preservation.nix

@@ -132,6 +132,7 @@
             ".config/sops"
             ".config/vesktop"
             ".config/kde.org"
+            ".config/heroic"
           ];
           #Shared
           files = [