complete rework v3

parts/hosts/laptop/configuration.nix

@@ -1,13 +1,32 @@
-{...}: {
-  imports = [
-    ../../modules/base.nix
-    ../../modules/shell.nix
-    ../../modules/graphical.nix
+{
+  pkgs,
+  ...
+}: {
+  # Enable OpenGL
+  hardware.graphics = {
+    enable = true;
+  };
+
+  # Load nvidia driver for Xorg and Wayland
+  services.xserver.videoDrivers = ["nvidia"];
+
+  environment.systemPackages = [
+    pkgs.glxinfo
   ];
 
-  config = {
-    user.username = "nickolaj";
-    networking.hostName = "laptop";
-    system.stateVersion = "24.11";
+  hardware.nvidia = {
+    open = true;
+    modesetting.enable = true;
+    powerManagement.enable = true;
+    powerManagement.finegrained = true;
+    nvidiaSettings = true;
+    prime = {
+      offload = {
+        enable = true;
+        enableOffloadCmd = true;
+      };
+      intelBusId = "PCI:0:2:0";
+      nvidiaBusId = "PCI:1:0:0";
+    };
   };
 }

parts/hosts/laptop/disk-configuration.nix

@@ -1,8 +1,8 @@
-{config, ...}: {
+_: {
   disko.devices = {
     disk = {
-      vdb = {
-        device = "/dev/nvme0n1";
+      main = {
+        device = "/dev/disk/by-id/nvme-SAMSUNG_MZVLB512HBJQ-000L2_S4DYNF0M893481";
         type = "disk";
         content = {
           type = "gpt";
@@ -28,8 +28,8 @@
               content = {
                 type = "luks";
                 name = "crypted";
-                # passwordFile = "/luks-password";
-                passwordFile = config.age.secrets.luks-password.path;
+                # Copied by deploy script, otherwise it will prompt for password
+                passwordFile = "/luks-password";
                 settings = {
                   allowDiscards = true;
                   bypassWorkqueues = true;

parts/hosts/laptop/hardware-configuration.nix

@@ -1,33 +0,0 @@
-# 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,
-  modulesPath,
-  ...
-}: {
-  imports = [
-    (modulesPath + "/installer/scan/not-detected.nix")
-  ];
-
-  boot.initrd.availableKernelModules = [
-    "xhci_pci"
-    "ahci"
-    "nvme"
-    "usbhid"
-  ];
-  boot.initrd.kernelModules = [];
-  boot.kernelModules = ["kvm-intel"];
-  boot.extraModulePackages = [];
-
-  # 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.enp7s0.useDHCP = lib.mkDefault true;
-
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-}