oysteikt/nix-dotfiles
oysteikt
/
nix-dotfiles
2
1
Fork 0
Code Issues Pull Requests Activity

kasei: move hardware-configuration to main config

This commit is contained in:
Oystein Kristoffer Tveit 2023-02-25 18:01:06 +01:00
parent 6b037127e2
commit c215f945e9
Signed by: oysteikt
GPG Key ID: 9F2F7D8250F35146
2 changed files with 28 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
hosts/kasei/configuration.nix
View File

@ -63,6 +63,9 @@
}; };
boot = { boot = {
initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" "sr_mod" ];
initrd.kernelModules = [ ];
kernelModules = [ "kvm-amd" ];
blacklistedKernelModules = ["nouveau"]; blacklistedKernelModules = ["nouveau"];
kernelParams = ["nomodeset"]; kernelParams = ["nomodeset"];
loader = { loader = {
@ -78,29 +81,36 @@
}; };
}; };
networking = { fileSystems = {
hostName = "kasei"; "/" = {
networkmanager.enable = true; device = "/dev/disk/by-uuid/70a0ca95-4ca4-4298-a8c4-e492705cfb93";
interfaces.wlp2s0f0u7u3.useDHCP = true; fsType = "btrfs";
firewall.enable = true;
}; };
services = { "/boot" = {
openssh.enable = true; device = "/dev/disk/by-uuid/D883-A077";
printing.enable = true; fsType = "vfat";
cron = { };
enable = true;
systemCronJobs = [ "/data" = {
# "*/5 * * * * root date >> /tmp/cron.log" device = "/dev/disk/by-label/data1";
]; fsType = "btrfs";
};
"/data/disks/data2" = {
device = "/dev/disk/by-uuid/7afc5f6b-947a-4c86-a5b5-dfefe42899c0";
fsType = "ext4";
}; };
}; };
hardware.bluetooth.enable = true; swapDevices = [ ];
virtualisation = { hardware = {
docker.enable = true; bluetooth.enable = true;
libvirtd.enable = true; cpu.amd.updateMicrocode = true;
enableRedistributableFirmware = true;
keyboard.zsa.enable = true;
logitech.wireless.enable = true;
}; };
} }

38
hosts/kasei/hardware-configuration.nix
View File

@ -1,38 +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 = [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" "sr_mod" ];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-amd" ];
fileSystems."/" =
{ device = "/dev/disk/by-uuid/70a0ca95-4ca4-4298-a8c4-e492705cfb93";
fsType = "btrfs";
};
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/D883-A077";
fsType = "vfat";
};
fileSystems."/data" =
{ device = "/dev/disk/by-label/data1";
fsType = "btrfs";
};
fileSystems."/data/disks/data2" =
{ device = "/dev/disk/by-uuid/7afc5f6b-947a-4c86-a5b5-dfefe42899c0";
fsType = "ext4";
};
swapDevices = [ ];
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
}