morten/nixos-config
1
0
Fork 0
mirror of https://github.com/morten-olsen/nixos-config.git synced 2026-02-08 00:36:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
Morten Olsen
2023-11-14 20:32:30 +01:00
parent fbc50c98d2
commit 14ae82222c
9 changed files with 30 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
machines/xps/configuration.nix
View File

@@ -21,19 +21,30 @@
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;
boot.initrd.availableKernelModules = [
"aesni_intel"
"cryptd"
];
# Setup keyfile
boot.initrd.secrets = {
"/crypto_keyfile.bin" = null;
};
# Enable swap on luks
boot.initrd.luks.devices."luks-20428df9-98ee-45a6-9dc1-fcafc0ce86f2".device = "/dev/disk/by-uuid/20428df9-98ee-45a6-9dc1-fcafc0ce86f2";
boot.initrd.luks.devices."luks-20428df9-98ee-45a6-9dc1-fcafc0ce86f2".keyFile = "/crypto_keyfile.bin";
boot.kernelParams = [ "i915.force_probe=9b41" ];
networking.hostName = "alice-xps"; # Define your hostname.
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
system.autoUpgrade = {
enable = true;
};
nix.gc = {
automatic = true;
dates = "weekly";
options = "--delete-older-than 7d";
};
system.stateVersion = "23.05"; # Did you read the comment?
}

13
machines/xps/hardware-configuration.nix
View File

@@ -8,33 +8,30 @@
[ (modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "usbhid" "sd_mod" "rtsx_pci_sdmmc" ];
boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ];
fileSystems."/" =
{ device = "/dev/disk/by-uuid/56f7a61b-1689-42b6-b697-5c88b8e75fc1";
{ device = "/dev/disk/by-uuid/d458bbe6-619d-4080-90a3-524f17014f22";
fsType = "ext4";
};
boot.initrd.luks.devices."luks-f8db07f5-1808-4591-8bbf-81798eb5d4c1".device = "/dev/disk/by-uuid/f8db07f5-1808-4591-8bbf-81798eb5d4c1";
boot.initrd.luks.devices."luks-c6580d84-86a0-4de4-820f-bbdea8109ae4".device = "/dev/disk/by-uuid/c6580d84-86a0-4de4-820f-bbdea8109ae4";
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/90A7-3803";
{ device = "/dev/disk/by-uuid/98D0-6C62";
fsType = "vfat";
};
swapDevices =
[ { device = "/dev/disk/by-uuid/e92ed4b9-8ee0-4d87-9249-f6e4223abbbe"; }
];
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.enp112s0.useDHCP = lib.mkDefault true;
# networking.interfaces.wlp2s0.useDHCP = lib.mkDefault true;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";