jsw/NiksOS
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Formatting and code cleanup

Browse source
This commit is contained in:
Jurn Wubben 2025-05-24 14:42:31 +02:00
parent 2692526aaf
commit 05a6997b68
8 changed files with 59 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

37
hosts/lapserv/hardware-configuration.nix
View file

@ -12,33 +12,28 @@
(modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "sd_mod"];
boot.initrd.kernelModules = [];
boot.kernelModules = ["kvm-intel"];
boot.extraModulePackages = [];
fileSystems."/" = {
device = "/dev/disk/by-uuid/33b7e681-d92a-40db-a172-b797591a1e2e";
fsType = "ext4";
boot = {
initrd.availableKernelModules = ["xhci_pci" "ahci" "sd_mod"];
initrd.kernelModules = [];
kernelModules = ["kvm-intel"];
extraModulePackages = [];
};
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/0BEA-7525";
fsType = "vfat";
options = ["fmask=0022" "dmask=0022"];
};
fileSystems = {
"/" = {
device = "/dev/disk/by-uuid/33b7e681-d92a-40db-a172-b797591a1e2e";
fsType = "ext4";
};
"/boot" = {
device = "/dev/disk/by-uuid/0BEA-7525";
fsType = "vfat";
options = ["fmask=0022" "dmask=0022"];
};
};
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.enp2s0.useDHCP = lib.mkDefault true;
# networking.interfaces.tailscale0.useDHCP = lib.mkDefault true;
# networking.interfaces.wlo1.useDHCP = lib.mkDefault true;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
}

29
hosts/laptop/hardware-configuration.nix
View file

@ -12,22 +12,25 @@
(modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "thunderbolt" "usb_storage" "sd_mod"];
boot.initrd.kernelModules = [];
boot.kernelModules = ["kvm-amd"];
boot.extraModulePackages = [];
fileSystems."/" = {
device = "/dev/disk/by-uuid/59540469-ecb9-4a68-829b-4cd3ad6e95c3";
fsType = "ext4";
boot = {
initrd.availableKernelModules = ["nvme" "xhci_pci" "thunderbolt" "usb_storage" "sd_mod"];
initrd.kernelModules = [];
kernelModules = ["kvm-amd"];
extraModulePackages = [];
};
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/83C9-84B1";
fsType = "vfat";
options = ["fmask=0077" "dmask=0077"];
};
fileSystems = {
"/" = {
device = "/dev/disk/by-uuid/59540469-ecb9-4a68-829b-4cd3ad6e95c3";
fsType = "ext4";
};
"/boot" = {
device = "/dev/disk/by-uuid/83C9-84B1";
fsType = "vfat";
options = ["fmask=0077" "dmask=0077"];
};
};
swapDevices = [
{device = "/dev/disk/by-uuid/65190d84-4e34-4905-a317-d750591933e2";}
];

8
hosts/laptop/virt.nix
View file

@ -1,8 +1,10 @@
{
programs.virt-manager.enable = true;
users.groups.libvirtd.members = ["jsw"];
virtualisation.libvirtd.enable = true;
virtualisation.spiceUSBRedirection.enable = true;
virtualisation.podman.enable = true;
virtualisation = {
libvirtd.enable = true;
spiceUSBRedirection.enable = true;
podman.enable = true;
};
}

31
hosts/minimal/hardware-configuration.nix
View file

@ -7,26 +7,27 @@
}: {
imports = [(modulesPath + "/profiles/qemu-guest.nix")];
boot.initrd.availableKernelModules = ["xhci_pci" "virtio_pci" "virtio_scsi" "usbhid"];
boot.initrd.kernelModules = [];
boot.kernelModules = [];
boot.extraModulePackages = [];
fileSystems."/" = {
device = "/dev/disk/by-label/NIXROOT";
fsType = "btrfs";
options = ["noatime" "discard" "compress=zstd"];
boot = {
initrd.availableKernelModules = ["xhci_pci" "virtio_pci" "virtio_scsi" "usbhid"];
initrd.kernelModules = [];
kernelModules = [];
extraModulePackages = [];
};
fileSystems."/boot" = {
device = "/dev/disk/by-label/NIXBOOT";
fsType = "vfat";
};
fileSystems = {
"/" = {
device = "/dev/disk/by-label/NIXROOT";
fsType = "btrfs";
options = ["noatime" "discard" "compress=zstd"];
};
"/boot" = {
device = "/dev/disk/by-label/NIXBOOT";
fsType = "vfat";
};
};
swapDevices = [];
networking.useDHCP = lib.mkDefault true;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
}