changes to modules + adoption of PC

hosts/laptop/configuration.nix

@@ -1,65 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-  imports = [
-    ./hardware-configuration.nix
-    ./disko.nix
-
-    # Modules
-    ../../modules/core
-    ../../modules/development
-    ../../modules/networking
-    ../../modules/virtualization
-
-    ## Desktop Environment
-    ../../desktops/hyprland
-  ];
-
-  boot = {
-    zfs.forceImportRoot = false;
-    supportedFilesystems = [ "zfs" ];
-
-    initrd = {
-      availableKernelModules = [
-        "tpm_tis"
-        "tpm_crb"
-      ];
-    };
-
-    loader = {
-      efi = {
-        canTouchEfiVariables = true;
-        efiSysMountPoint = "/boot";
-      };
-      grub = {
-        enable = true;
-        device = "nodev";
-        efiSupport = true;
-        useOSProber = true;
-      };
-    };
-
-    kernelModules = [
-      "tpm_tis"
-      "tpm_crb"
-    ];
-  };
-
-  security = {
-    tpm2.enable = true;
-    sudo.wheelNeedsPassword = false;
-  };
-
-  services.zfs.autoScrub.enable = true;
-  services.zfs.autoSnapshot.enable = true;
-
-  networking.hostId = "8425e349";
-
-  environment.systemPackages = with pkgs; [
-    tpm2-tools
-    brave
-    fprintd # Fingerprint
-  ];
-
-  system.stateVersion = "26.05";
-}

hosts/laptop/disko.nix

@@ -1,69 +0,0 @@
-{ disk, ... }:
-
-{
-  disko.devices = {
-    disk.main = {
-      type = "disk";
-      device = disk;
-      content = {
-        type = "gpt";
-        partitions = {
-          ESP = {
-            size = "1G";
-            type = "EF00";
-
-            content = {
-              type = "filesystem";
-              format = "vfat";
-              mountpoint = "/boot";
-            };
-          };
-
-          luks = {
-            size = "100%";
-            content = {
-              type = "luks";
-              name = "cryptroot";
-              # important: allow TPM-based unlocking
-              settings = {
-                allowDiscards = true;
-              };
-
-              # this is key for TPM workflows
-              initrdUnlock = true;
-              content = {
-                type = "zfs";
-                pool = "rpool";
-              };
-            };
-          };
-        };
-      };
-    };
-
-    # Moved inside disko.devices
-    zpool.rpool = {
-      type = "zpool";
-      rootFsOptions = {
-        compression = "zstd";
-        "com.sun:auto-snapshot" = "true";
-      };
-      datasets = {
-        root = {
-          type = "zfs_fs";
-          mountpoint = "/";
-        };
-
-        nix = {
-          type = "zfs_fs";
-          mountpoint = "/nix";
-        };
-
-        home = {
-          type = "zfs_fs";
-          mountpoint = "/home";
-        };
-      };
-    };
-  };
-}

hosts/pc/configuration.nix

@@ -0,0 +1,72 @@
+{
+  pkgs,
+  inputs,
+  ...
+}:
+
+{
+  imports = [
+    ./hardware-configuration.nix
+    inputs.home-manager.nixosModules.default
+
+    # Modules
+    ../../modules/core
+    ../../modules/networking
+    ../../modules/bluetooth
+    ../../modules/gaming
+    ../../modules/virtualization
+    ../../modules/ollama
+    ../../modules/development
+    ../../modules/development/claude.nix
+    ../../modules/additionalUsers/aariz.nix
+    ../../modules/obs
+
+    # Desktop
+    ../../desktops/plasma
+    ../../desktops/hyprland
+  ];
+
+  boot.loader.systemd-boot.enable = true;
+  boot.loader.efi.canTouchEfiVariables = true;
+
+  networking.hostName = "nixos";
+
+  environment.systemPackages = with pkgs; [
+    libsecret
+    tree
+    libxtst
+    usbutils
+    brave
+    pciutils
+    stow
+    termius
+    kdePackages.partitionmanager
+    python3
+    fastfetch
+    localsend
+    nvtopPackages.amd
+    pass
+    pinentry-curses
+    github-copilot-cli
+    xautoclick
+    tsx
+    slack
+  ];
+
+  systemd.network.wait-online.enable = false;
+  boot.initrd.systemd.network.wait-online.enable = false;
+  services.flatpak.enable = true;
+
+  networking.firewall.allowedTCPPorts = [
+    5900
+    16570
+    18789
+  ];
+
+  hardware = {
+    enableAllFirmware = true;
+    enableRedistributableFirmware = true;
+  };
+
+  system.stateVersion = "25.11";
+}

hosts/pc/hardware-configuration.nix

@@ -0,0 +1,31 @@
+# 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 =
+    [ (modulesPath + "/installer/scan/not-detected.nix")
+    ];
+
+  boot.initrd.availableKernelModules = [ "nvme" "ahci" "xhci_pci" "usbhid" "uas" "sd_mod" ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-amd" ];
+  boot.extraModulePackages = [ ];
+
+  fileSystems."/" =
+    { device = "/dev/disk/by-uuid/b290de04-28e6-477f-a23e-6d146c1e36e2";
+      fsType = "ext4";
+    };
+
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/7082-DAFE";
+      fsType = "vfat";
+      options = [ "fmask=0077" "dmask=0077" ];
+    };
+
+  swapDevices = [ ];
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+}