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

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,40 +41,41 @@
   virtualisation.libvirtd.enable = true;
 
   virtualisation.spiceUSBRedirection.enable = true;
+  services = {
+    displayManager.plasma-login-manager = {
+      enable = true;
+    };
 
-  services.displayManager.plasma-login-manager = {
-    enable = true;
-  };
+    displayManager.defaultSession = "plasma";
+    desktopManager.plasma6.enable = true;
 
-  services.displayManager.defaultSession = "plasma";
-  services.desktopManager.plasma6.enable = true;
-
-  services.samba = {
-    enable = true;
-    openFirewall = true;
-    settings = {
-      global = {
-        "invalid users" = [
-          "root"
-        ];
-        "passwd program" = "/run/wrappers/bin/passwd %u";
-        security = "user";
-      };
-      public = {
-        browseable = "yes";
-        comment = "Public samba share.";
-        "guest ok" = "yes";
-        path = "/home/lillian/samba";
-        "read only" = "no";
+    samba = {
+      enable = true;
+      openFirewall = true;
+      settings = {
+        global = {
+          "invalid users" = [
+            "root"
+          ];
+          "passwd program" = "/run/wrappers/bin/passwd %u";
+          security = "user";
+        };
+        public = {
+          browseable = "yes";
+          comment = "Public samba share.";
+          "guest ok" = "yes";
+          path = "/home/lillian/samba";
+          "read only" = "no";
+        };
       };
     };
+
+    vpn-ip = {
+      ip = "3";
+    };
   };
   users.groups.samba.members = ["lillian"];
 
-  services.vpn-ip = {
-    ip = "3";
-  };
-
   networking = {
     hostName = "EDI";
     networkmanager.enable = true;

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 = {
+    displayManager.plasma-login-manager = {
+      enable = true;
+    };
 
-  services.displayManager.plasma-login-manager = {
-    enable = true;
-  };
+    displayManager.defaultSession = "plasma";
+    desktopManager.plasma6.enable = true;
 
-  services.displayManager.defaultSession = "plasma";
-  services.desktopManager.plasma6.enable = true;
+    vpn-ip = {
+      ip = "2";
+    };
 
-  services.vpn-ip = {
-    ip = "2";
+    xserver.videoDrivers = ["amdgpu"];
   };
 
   networking.hostName = "GLaDOS";
-
-  services.xserver.videoDrivers = ["amdgpu"];
   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 = ''
-    KERNEL=="hidraw*", ATTRS{idVendor}=="2dc8", MODE="0660", TAG+="uaccess"
-    KERNEL=="hidraw*", KERNELS=="*2DC8:*", MODE="0660", TAG+="uaccess"
-    SUBSYSTEM=="hidraw", ATTRS{idVendor}=="2dc8", MODE="0666"
-  '';
+  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 = [