Update nixos system config

flake.nix

@@ -56,9 +56,7 @@
     nixosConfigurations."thinkpad" = nixpkgs.lib.nixosSystem {
       system = "x86_64-linux";
       modules = [
-        disko.nixosModules.disko
         ./hosts/nixos/thinkpad/system.nix
-        ./hosts/nixos/thinkpad/disk-config.nix
       ];
     };
 

hosts/nixos/hs/system.nix

@@ -1,7 +1,6 @@
 { config, pkgs, ... }: {
   imports = [
     ./hardware-configuration.nix
-    ./disk-config.nix
     ./containers.nix  # Host-specific container definitions
     ./proxy.nix       # Host-specific Traefik dynamic configuration
     ./disk-health.nix # Host-specific disk health monitoring

hosts/nixos/thinkpad/hardware-configuration.nix

@@ -1,28 +1,41 @@
-# This file will be auto-generated by nixos-generate-config during installation
-# It will contain the hardware scan results specific to your ThinkPad P14s Gen 2
-# 
-# DO NOT EDIT this file manually before installation!
-# Run 'nixos-generate-config --show-hardware-config' on the target machine
-# to generate the actual hardware configuration.
-
+# Do not modify this file!  It was generated by ‘nixos-generate-config’
+# and may be overwritten by future invocations.  Please make changes
+# to /etc/nixos/configuration.nix instead.
 { config, lib, pkgs, modulesPath, ... }:
 
 {
-  imports = [ ];
+  imports =
+    [ (modulesPath + "/installer/scan/not-detected.nix")
+    ];
 
-  # This will be populated automatically during installation
-  boot.initrd.availableKernelModules = [ ];
+  boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod" "sdhci_pci" ];
   boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
 
-  # Filesystem configuration will be added here by nixos-generate-config
-  # based on your actual disk partitioning
+  fileSystems."/" =
+    { device = "/dev/disk/by-uuid/97aa0a15-1b4a-43b6-b424-65d1926cec73";
+      fsType = "ext4";
+    };
 
-  # Swap configuration (if applicable) will be added here
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/7C9B-24EC";
+      fsType = "vfat";
+      options = [ "fmask=0077" "dmask=0077" ];
+    };
 
-  # CPU and platform configuration will be detected and added here
+  swapDevices = [ 
+    { device = "/dev/disk/by-partlabel/disk-main-swap"; }
+  ];
 
-  # The NixOS release version will be set here
-  system.stateVersion = "24.05";
+  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
+  # (the default) this is the recommended approach. When using systemd-networkd it's
+  # still possible to use this option, but it's recommended to use it in conjunction
+  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
+  networking.useDHCP = lib.mkDefault true;
+  # networking.interfaces.enp0s31f6.useDHCP = lib.mkDefault true;
+  # networking.interfaces.wlp9s0.useDHCP = lib.mkDefault true;
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 }

hosts/nixos/thinkpad/system.nix

@@ -1,7 +1,6 @@
 { config, pkgs, lib, ... }: {
   imports = [
     ./hardware-configuration.nix
-    ./disk-config.nix
   ];
 
   # Bootloader - standard UEFI setup
@@ -103,7 +102,7 @@
   i18n.defaultLocale = "en_US.UTF-8";
 
   # Sound configuration with PipeWire (better than PulseAudio)
-  hardware.pulseaudio.enable = false;
+  services.pulseaudio.enable = false;
   security.rtkit.enable = true;
   services.pipewire = {
     enable = true;
@@ -120,23 +119,24 @@
     # Video drivers
     videoDrivers = [ "modesetting" "nvidia" ];
     
-    # Display manager
-    displayManager.sddm = {
-      enable = true;
-      wayland.enable = true;
-    };
-    
-    # Desktop environment
-    desktopManager.plasma6.enable = true;
-    
     # Keyboard layout
     xkb = {
       layout = "us";
       variant = "";
     };
+  };
+  
+  # Display manager
+  services.displayManager.sddm = {
+    enable = true;
+    wayland.enable = true;
+  };
+  
+  # Desktop environment
+  services.desktopManager.plasma6.enable = true;
   
   # Touchpad configuration
-    libinput = {
+  services.libinput = {
     enable = true;
     touchpad = {
       naturalScrolling = true;
@@ -145,7 +145,6 @@
       accelProfile = "adaptive";
     };
   };
-  };
 
   # Power management for laptops
   powerManagement = {
@@ -250,11 +249,11 @@
     home-manager
     
     # KDE/Plasma utilities
-    kate
-    konsole
-    spectacle
-    filelight
-    ark
+    kdePackages.kate
+    kdePackages.konsole
+    kdePackages.spectacle
+    kdePackages.filelight
+    kdePackages.ark
     
     # System utilities
     pciutils

hosts/nixos/vps/system.nix

@@ -1,7 +1,6 @@
 { config, pkgs, ... }: {
   imports = [
     ./hardware-configuration.nix
-    ./disk-config.nix
     ./containers.nix  # Host-specific container definitions
     ./proxy.nix       # Host-specific Traefik dynamic configuration
     ../../../modules/wireguard.nix