cnst/cnix
1
0
Fork 0
Code Issues Pull Requests Activity

Merge pull request 'bunk things' (#8) from bunk into main

Browse Source 
Reviewed-on: #8
This commit was merged in pull request #8.
This commit is contained in:
cnst
2025-10-28 19:47:07 +01:00
parent 545888878e 300eb66afc
commit 322136e4f3
2 changed files with 25 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
hosts/bunk/default.nix
View File

@@ -38,17 +38,11 @@ in
./settings.nix ./settings.nix
]; ];
boot.initrd.luks.devices."luks-0ad53967-bb38-4485-be75-ca55ae4c3b68".device = "/dev/disk/by-uuid/0ad53967-bb38-4485-be75-ca55ae4c3b68";
networking.hostName = "bunk"; networking.hostName = "bunk";
swapDevices = [
{
device = "/var/lib/swapfile";
size = 32 * 1024;
}
];
environment.variables.NH_FLAKE = "/home/cnst/.nix-config"; environment.variables.NH_FLAKE = "/home/cnst/.nix-config";
# https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
system.stateVersion = lib.mkDefault "23.11"; system.stateVersion = lib.mkDefault "25.05";
} }

58
hosts/bunk/hardware-configuration.nix
View File

@@ -1,47 +1,35 @@
# Do not modify this file! It was generated by ‘nixos-generate-config’ # Do not modify this file! It was generated by ‘nixos-generate-config’
# and may be overwritten by future invocations. Please make changes # and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead. # to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }:
{ {
config, imports =
lib, [ (modulesPath + "/installer/scan/not-detected.nix")
modulesPath, ];
...
}: boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "usb_storage" "sd_mod" ];
{ boot.initrd.kernelModules = [ ];
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; boot.kernelModules = [ "kvm-amd" ];
boot = { boot.extraModulePackages = [ ];
initrd = {
availableKernelModules = [ fileSystems."/" =
"nvme" { device = "/dev/disk/by-uuid/d15672b5-dc97-4f99-9ad2-70f9ddf20447";
"xhci_pci" fsType = "btrfs";
"ahci" options = [ "subvol=@" ];
"usbhid"
"usb_storage"
"sd_mod"
];
kernelModules = [ "amdgpu" ];
}; };
kernelModules = [ "kvm-amd" ]; boot.initrd.luks.devices."luks-2f0dfe96-bc63-4f38-b190-3d9fa45dc560".device = "/dev/disk/by-uuid/2f0dfe96-bc63-4f38-b190-3d9fa45dc560";
extraModulePackages = [ ];
};
fileSystems."/" = { fileSystems."/boot" =
device = "/dev/disk/by-uuid/da41c89a-7ab8-4697-9a14-0d115b97cc2e"; { device = "/dev/disk/by-uuid/F3FC-3CDF";
fsType = "ext4"; fsType = "vfat";
}; options = [ "fmask=0077" "dmask=0077" ];
};
boot.initrd.luks.devices."luks-e75ac560-748f-4071-bbe7-479678400be3".device = swapDevices =
"/dev/disk/by-uuid/e75ac560-748f-4071-bbe7-479678400be3"; [ { device = "/dev/disk/by-uuid/e6464248-0d1e-4950-bf48-4cebeabaf871"; }
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/7E84-D168";
fsType = "vfat";
options = [
"fmask=0022"
"dmask=0022"
]; ];
};
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking # 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 # (the default) this is the recommended approach. When using systemd-networkd it's