more tidying in hosts/hades

This commit is contained in:
serenity-F 2024-12-12 02:58:08 +10:00
parent 3a442ee18d
commit be56ab7910
3 changed files with 32 additions and 17 deletions

View file

@ -4,7 +4,6 @@
imports = [
## Host specific config files
./hardware-configuration.nix
./modules
## Shared 'core' config options

View file

@ -5,6 +5,7 @@
imports = [
## Selected host modules for import
./hardware.nix # hardware configuration
./network.nix # network configuration
#./extra.nix # configuration.nix substitute
./zfs.nix # zfs configuration

View file

@ -1,35 +1,50 @@
# 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, ... }:
{ config, lib, modulesPath, ... }:
{
imports =
[ (modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ ];
boot.extraModulePackages = [ ];
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
boot = {
initrd = {
availableKernelModules =
[ "xhci_pci" "ehci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
kernelModules = [ "dm-snapshot" ];
fileSystems."/" =
{ device = "/dev/disk/by-uuid/efa84ce5-ecd1-46c6-8207-5434919d9f72";
fsType = "ext4";
};
boot.initrd.luks.devices."luks-f9de3a25-6f75-4e75-b885-160b58634006".device = "/dev/disk/by-uuid/f9de3a25-6f75-4e75-b885-160b58634006";
kernelModules = [ "kvm-intel" ];
swapDevices = [ ];
extraModulePackages = [ ];
};
fileSystems."/" = {
device = "/dev/disk/by-uuid/ad648423-7aa4-4f0f-b157-2f6b458130f7";
fsType = "ext4";
};
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/552D-851F";
fsType = "vfat";
options = [ "fmask=0022" "dmask=0022" ];
};
swapDevices =
[{ device = "/dev/disk/by-uuid/b7ccf8c3-3641-4035-b91f-f7e54c6dd380"; }];
# 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.wlp8s0.useDHCP = lib.mkDefault true;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
hardware.cpu.intel.updateMicrocode =
lib.mkDefault config.hardware.enableRedistributableFirmware;
}