Make desktop work

client/desktop.nix

@@ -1,14 +1,46 @@
 { pkgs, ... }:
 
 {
-  services.xserver = {
-    enable = true;
-    displayManager.gdm = {
+  services = {
+    xserver = {
       enable = true;
-      wayland = true;
+
+      displayManager = {
+        lightdm = {
+          enable = true;
+          greeters.slick.enable = true;
+
+          extraSeatDefaults = ''
+            greeter-show-manual-login=true
+            greeter-hide-users=true
+            allow-guest=false
+          '';
+        };
+      };
+
+      desktopManager = {
+        gnome = {
+          enable = true;
+          debug = true;
+        };
+
+        xterm.enable = false;
+      };
+
+      xkb.layout = "de";
+    };
+
+    displayManager = {
+      defaultSession = "gnome";
+      logToFile = true;
+    };
+
+    gnome = {
+      core-utilities.enable = true;
+      core-shell.enable = true;
+      core-os-services.enable = true;
+      gnome-keyring.enable = true;
     };
-    desktopManager.gnome.enable = true;
-    xkb.layout = "de";
   };
 
   environment.gnome.excludePackages = with pkgs; [

client/gpu.nix

@@ -1,11 +1,18 @@
-{ pkgs, ... }:
+{ config, ... }:
 
 {
   hardware.opengl = {
     enable = true;
     driSupport32Bit = true;
-    extraPackages = with pkgs; [
-    ];
   };
+
+  hardware.nvidia = {
+    modesetting.enable = true;
+    powerManagement.enable = false;
+
+    package = config.boot.kernelPackages.nvidiaPackages.stable;
+  };
+
+  services.xserver.videoDrivers = [ "nvidia" ];
 }
 

client/hardware.nix

@@ -9,36 +9,34 @@
 
   boot = {
     loader = {
-      systemd-boot.enable = true;
-      efi.canTouchEfiVariables = true;
+      grub.enable = true;
     };
 
-    consoleLogLevel = 3;
+    #consoleLogLevel = 3;
 
     initrd = {
-      systemd.enable = true;
-      verbose = false;
+      #systemd.enable = true;
+      #verbose = true;
       availableKernelModules = [
-        "uhci_hcd"
-        "ehci_pci"
-        "ata_piix"
-        "mptsas"
-        "usb_storage"
+        "xhci_pci"
+        "ahci"
+        "nvme"
         "usbhid"
-        "sd_mod"
-        "sr_mod"
       ];
     };
 
+    kernelModules = [ "kvm-intel" ];
+
     kernelParams = [
-      "quiet"
-      "udev.log_level=3"
+      #"quiet"
+      #"udev.log_level=3"
+      "log_level=4"
     ];
 
-    plymouth = {
-      enable = true;
-      theme = "bgrt";
-    };
+    #plymouth = {
+    #  enable = true;
+    #  theme = "bgrt";
+    #};
   };
 
   hardware.enableRedistributableFirmware = true;

client/users.nix

@@ -20,6 +20,11 @@ in
       sssdStrictAccess = true;
       unixAuth = lib.mkForce true;
     };
+    lightdm = {
+      makeHomeDir = true;
+      sssdStrictAccess = true;
+      unixAuth = lib.mkForce true;
+    };
     systemd-user = {
       makeHomeDir = true;
       sssdStrictAccess = true;

clients.nix

@@ -11,5 +11,9 @@
   "04" = {
     mac = "";
   };
+  "13" = {
+    targetHost = "10.33.65.113";
+    mac = "";
+  };
 }
 

flake.lock

@@ -203,11 +203,11 @@
     "ldap-sync": {
       "flake": false,
       "locked": {
-        "lastModified": 1705328305,
-        "narHash": "sha256-PPc16Obzg53YVLSMP2pCOXBF6+q7/BIG6FF7EiI0st8=",
+        "lastModified": 1731935440,
+        "narHash": "sha256-hMVN9As58cqqiu9JQaS4ffmzhG4xV01QhNKsTP5BF9c=",
         "ref": "refs/heads/main",
-        "rev": "49edeafeaf7fbadbfe59e4763223593cab989317",
-        "revCount": 14,
+        "rev": "4b4b76543b298f0db15644c308c3a4deaaa4dbdd",
+        "revCount": 17,
         "type": "git",
         "url": "https://gogs.informatik.hs-fulda.de/fooker/ldap-sync.git"
       },

flake.nix

@@ -95,7 +95,7 @@
       // (builtins.listToAttrs (builtins.map
         (id: {
           name = "client-${id}";
-          value = ./client;
+          value = (import ./client) id;
         })
         clients))
       ;

installer.nix

@@ -75,7 +75,6 @@ in
     };
   };
 
-  # Expose the installer script
-  system.build.installer = installer;
+  system.stateVersion = config.system.nixos.release;
 }
 

machines/nfs/netinstaller.nix

@@ -27,6 +27,10 @@ let
         --no-channel-copy \
         --no-root-password \
         --verbose
+
+      # umount -R /mnt
+
+      # reboot
     '';
 
   ipxe-script = pkgs.writeText "boot-local.ipxe" ''
@@ -36,7 +40,7 @@ let
 
     prompt --key 0x18 --timeout 5000 Press Ctrl-X to re-deploy system... || goto local
 
-    echo "Starting installer..."
+    echo Starting installer...
     sleep 2
 
     kernel --name kernel http://''${next-server:ipv4}/bzImage || goto err
@@ -45,10 +49,11 @@ let
     boot kernel initrd=initrd init=${installer.config.system.build.toplevel}/init nixos.install=${installer-script} loglevel=4 || goto err
 
     :err
+    :shell
     shell
 
     :local
-    echo "Booting local disk..."
+    prompt --key 0x19 --timeout 2000 Booting local disk... && goto shell
     sleep 2
 
     sanboot -n -d 0x80

machines/nfs/nfs.nix

@@ -6,7 +6,7 @@ with lib;
   services.nfs.server = {
     enable = true;
     exports = ''
-      /home   10.32.45.0/24(rw,async,no_root_squash)
+      /home   10.33.64.0/20(rw,async,no_root_squash)
     '';
   };