Compare commits

...

2 Commits

Author SHA1 Message Date
5519ad5046 regenerated hardware config on real system 2025-06-11 18:26:14 +00:00
b53c946c39 better? 2025-06-11 18:11:08 +00:00
2 changed files with 7 additions and 54 deletions

View File

@ -6,6 +6,11 @@
boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.canTouchEfiVariables = true;
boot.initrd.kernelModules = [ "overlay" "vmd" ]; boot.initrd.kernelModules = [ "overlay" "vmd" ];
boot.initrd.systemd.tmpfiles.settings."nixdirs" = {
"/nix".d = { mode = "0755"; type = "d"; user = "root"; group = "root";};
"/nix/.ro-store".d = { mode = "0755"; type = "d"; user = "root"; group = "root";};
"/nix/.rw-store".d = { mode = "0755"; type = "d"; user = "root"; group = "root";};
};
boot.zfs.extraPools = ["tank"]; boot.zfs.extraPools = ["tank"];
networking.hostName = "nix-nas"; networking.hostName = "nix-nas";
@ -14,11 +19,13 @@
fileSystems."/" = fileSystems."/" =
{ device = "rpool/root"; { device = "rpool/root";
fsType = "zfs"; fsType = "zfs";
neededForBoot = true;
}; };
fileSystems."/nix" = fileSystems."/nix" =
{ device = "rpool/nix"; { device = "rpool/nix";
fsType = "zfs"; fsType = "zfs";
neededForBoot = true;
}; };
fileSystems."/home" = fileSystems."/home" =

View File

@ -1,54 +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, pkgs, modulesPath, ... }:
{
imports =
[ (modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usb_storage" "sd_mod" "sdhci_pci" ];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ];
# fileSystems."/" =
# { device = "tmpfs";
# fsType = "tmpfs";
# };
fileSystems."/iso" =
{ device = "/dev/disk/by-uuid/1980-01-01-00-00-00-00";
fsType = "iso9660";
};
fileSystems."/nix/.ro-store" =
{ device = "/iso/nix-store.squashfs";
fsType = "squashfs";
options = [ "loop" ];
};
fileSystems."/nix/.rw-store" =
{ device = "tmpfs";
fsType = "tmpfs";
};
fileSystems."/nix/store" =
{ device = "overlay";
fsType = "overlay";
};
swapDevices = [ ];
# 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.enp5s0.useDHCP = lib.mkDefault true;
# networking.interfaces.enp6s0.useDHCP = lib.mkDefault true;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
}