Regenerated

2026-03-21 18:56:24 +00:00
parent 886cb94209
commit 8519b9fc0a
29 changed files with 1491 additions and 0 deletions
@@ -0,0 +1,16 @@
+{ inputs, config, lib, pkgs, ... }:
+{
+
+  boot.loader.grub = {
+    enable = true;
+    efiSupport = true;
+    device = "nodev";
+    useOSProber = true;
+  };
+  #boot.efi.canTouchEfiVariables = true;
+
+  boot.kernelParams = [
+    "systemd.mask=dev-tpm0.device"
+    "systemd.mask=dev-tpmrm0.device"
+  ];
+}
@@ -0,0 +1,47 @@
+{
+  hostname,
+  pkgs,
+  lib,
+  modulesPath,
+  user,
+  config,
+  ...
+}:
+{
+  imports = [
+    # (modulesPath + "/installer/scan/not-detected.nix")
+    #../../hardware/hardware.nix
+  ];
+
+  boot.initrd.availableKernelModules = [
+    "xhci_pci"
+    "nvme"
+    "usb_storage"
+    "sd_mod"
+    "rtsx_usb_sdmmc"
+  ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-intel" ];
+  boot.extraModulePackages = [ ];
+
+  fileSystems."/" = {
+    device = "/dev/disk/by-uuid/69433a14-fbaf-401b-af85-cd1bbf02b4e2";
+    fsType = "ext4";
+  };
+
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/811D-0676";
+    fsType = "vfat";
+    options = [
+      "fmask=0077"
+      "dmask=0077"
+    ];
+  };
+
+  swapDevices = [
+    { device = "/dev/disk/by-uuid/b6c557c2-7682-460b-a5e7-8f6f2f429a3a"; }
+  ];
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+}
@@ -0,0 +1,81 @@
+{ lib, config, pkgs, inputs, ... }:
+
+let
+  username = config.defaultUser or "henrov";
+
+  modulesPath = ./generated/modules;
+  imported = inputs.import-tree modulesPath;
+
+  moduleSwitches = import ../../../assets/system/conf/modules.conf;
+
+  # STEP 1: evaluate all modules
+  evaluatedModules =
+    map (m:
+      if builtins.isFunction m
+      then m { inherit lib config pkgs; }
+      else m
+    ) imported.imports;
+
+  # STEP 2: attach normalized names
+  modulesWithNames =
+    map (m: {
+      name =
+        if m ? _file
+        then lib.removeSuffix ".nix" (builtins.baseNameOf m._file)
+        else "unknown";
+      value = m;
+    }) evaluatedModules;
+
+  # STEP 3: filter enabled modules
+  enabledModules =
+    builtins.filter (m:
+      moduleSwitches.${m.name} or false
+    ) modulesWithNames;
+
+  # STEP 4: extract ONLY Home Manager user attrsets
+  hmUserSets =
+    map (m: m.value._module.args.hmUsers or {}) enabledModules;
+
+  # STEP 5: debug string
+  debugContents =
+    builtins.concatStringsSep "\n"
+      (map (m:
+        let attrCount =
+          if builtins.isAttrs m.value
+          then builtins.length (builtins.attrNames m.value)
+          else 0;
+        in
+          "${m.name} (${builtins.toString attrCount} attrs)"
+      ) enabledModules);
+
+  # STEP 6: FORCE trace (important!)
+  tracedModules =
+    builtins.trace
+      ("==== Enabled modules (" +
+        builtins.toString (builtins.length enabledModules) +
+        ") ====\n" + debugContents)
+      enabledModules;
+
+  # STEP 7: proper debug file in store
+  debugFile = pkgs.writeText "traveldroid-modules-debug.txt" debugContents;
+
+in
+{
+  networking.hostName = "traveldroid";
+  system.stateVersion = "26.05";
+
+  imports = [
+    ./boot.nix
+    ./hardware-configuration.nix
+  ];
+
+  # ✅ Correct merge: ONLY HM user attrsets
+  home-manager.users =
+    lib.mkMerge hmUserSets;
+
+  # Optional: also inside VM
+  environment.etc."traveldroid-modules-debug.txt".text = debugContents;
+
+  # Expose debug file as build output
+  system.build.modulesDebug = debugFile;
+}