erwin/nixos-config
1
0
Fork 0
Code Issues 1 Pull requests Projects 1 Releases Wiki Activity Actions

loki: Consolidate configuration

Browse source
This commit is contained in:
Erwin Boskma 2023-07-18 10:52:44 +02:00
parent 5bb04df77a
commit 36afbcaa71
Signed by: erwin
SSH key fingerprint: SHA256:9LmFDe1C6jSrEyqxxvX8NtJBmcbB105XoqyUZF092bg
2 changed files with 35 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
machines/loki/configuration.nix
View file

@ -7,7 +7,6 @@
nixos-hardware.nixosModules.common-gpu-amd nixos-hardware.nixosModules.common-gpu-amd
nixos-hardware.nixosModules.common-pc-ssd nixos-hardware.nixosModules.common-pc-ssd
./hardware-configuration.nix
../../users/erwin ../../users/erwin
../../users/root ../../users/root
../../users/builder ../../users/builder
@ -65,8 +64,43 @@
systemd.enable = true; systemd.enable = true;
}; };
fileSystems."/" = {
device = "/dev/disk/by-uuid/42065c7e-d0aa-4de8-a913-014cf59d48ac";
fsType = "ext4";
};
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/4064-A1BE";
fsType = "vfat";
};
fileSystems."/home" = {
device = "/dev/disk/by-uuid/082ec5d2-238e-4713-9c37-31b1cb0fb8c3";
fsType = "ext4";
};
swapDevices = [{ device = "/dev/disk/by-uuid/d93788f7-1b94-4687-8313-055d17f42b7e"; }];
# high-resolution display
# hardware.video.hidpi.enable = lib.mkDefault true;
# Enable firmware
hardware.enableAllFirmware = true;
# i2c support
hardware.i2c.enable = true;
boot = { boot = {
initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ];
initrd.kernelModules = [ ];
kernelPackages = pkgs.linuxPackages_6_3; kernelPackages = pkgs.linuxPackages_6_3;
kernelModules = [ "kvm-amd" "apple-mfi-fastcharge" "zenpower" "nf_nat_ftp" ];
kernelParams = [ "amd_pstate.shared_mem=1" ];
extraModulePackages = [ ] ++
(with config.boot.kernelPackages; [ rtl88x2bu zenpower cpupower ]);
loader = { loader = {
systemd-boot = { systemd-boot = {
enable = true; enable = true;

34
machines/loki/hardware-configuration.nix
View file

@ -1,34 +0,0 @@
{ config, ... }: {
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-amd" "apple-mfi-fastcharge" "zenpower" "nf_nat_ftp" ];
boot.kernelParams = [ "amd_pstate.shared_mem=1" ];
boot.extraModulePackages = [ ] ++
(with config.boot.kernelPackages; [ rtl88x2bu zenpower cpupower ]);
fileSystems."/" = {
device = "/dev/disk/by-uuid/42065c7e-d0aa-4de8-a913-014cf59d48ac";
fsType = "ext4";
};
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/4064-A1BE";
fsType = "vfat";
};
fileSystems."/home" = {
device = "/dev/disk/by-uuid/082ec5d2-238e-4713-9c37-31b1cb0fb8c3";
fsType = "ext4";
};
swapDevices = [{ device = "/dev/disk/by-uuid/d93788f7-1b94-4687-8313-055d17f42b7e"; }];
# high-resolution display
# hardware.video.hidpi.enable = lib.mkDefault true;
# Enable firmware
hardware.enableAllFirmware = true;
# i2c support
hardware.i2c.enable = true;
}