Regenerated
This commit is contained in:
@@ -1,16 +0,0 @@
|
||||
{ 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"
|
||||
];
|
||||
}
|
||||
@@ -1,47 +0,0 @@
|
||||
{
|
||||
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;
|
||||
}
|
||||
@@ -1,70 +0,0 @@
|
||||
{ lib, config, 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 first
|
||||
evaluatedModules =
|
||||
map (m:
|
||||
if builtins.isFunction m
|
||||
then m { inherit lib config; }
|
||||
else m
|
||||
) imported.imports;
|
||||
|
||||
# STEP 2: attach names safely, stripping .nix
|
||||
modulesWithNames =
|
||||
map (m: {
|
||||
name =
|
||||
if m ? _file
|
||||
then builtins.replaceSuffix ".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 final module values
|
||||
moduleList = map (m: m.value) enabledModules;
|
||||
|
||||
in
|
||||
{
|
||||
networking.hostName = "traveldroid";
|
||||
system.stateVersion = "26.05";
|
||||
|
||||
imports = [
|
||||
./boot.nix
|
||||
./hardware-configuration.nix
|
||||
];
|
||||
|
||||
home-manager.users =
|
||||
lib.mkMerge moduleList;
|
||||
|
||||
# Logging to screen
|
||||
# Print number of enabled modules and each module's attribute count
|
||||
tracing1 = builtins.trace
|
||||
(builtins.concatStringsSep "\n"
|
||||
(map (m: "${m.name} (${builtins.toString (builtins.length (builtins.attrNames m.value))} attrs)") enabledModules))
|
||||
true;
|
||||
|
||||
tracing2 = builtins.trace
|
||||
(toString (builtins.length enabledModules) + " modules enabled: " + builtins.concatStringsSep ", " (map (m: m.name) enabledModules))
|
||||
true;
|
||||
|
||||
# logging to file
|
||||
let
|
||||
debugFile = "/tmp/traveldroid-modules-debug.txt";
|
||||
debugContents = builtins.concatStringsSep "\n"
|
||||
(map (m: "${m.name} (${builtins.toString (builtins.length (builtins.attrNames m.value))} attrs)") enabledModules);
|
||||
in
|
||||
{
|
||||
# Write a file during the build
|
||||
environment.etc."traveldroid-modules-debug.txt".text = debugContents;
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user