fleaz/nixos-config
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

cray: Reinstall on new hardware

Browse source
This commit is contained in:
fleaz 2022-02-14 21:50:52 +01:00
parent e319b48849
commit 8c5b5bf0f4
2 changed files with 48 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
machines/cray/configuration.nix
View file

@ -7,6 +7,10 @@
, ... , ...
}: }:
let
home-manager = (import ./nix/sources.nix).home-manager;
secretsFile = "/root.key";
in
{ {
imports = [ imports = [
# Include the results of the hardware scan. # Include the results of the hardware scan.
@ -15,8 +19,28 @@
]; ];
# Use the systemd-boot EFI boot loader. # Use the systemd-boot EFI boot loader.
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.canTouchEfiVariables = true;
boot.loader.efi.efiSysMountPoint = "/boot/efi";
nix.useSandbox = false;
boot.loader.systemd-boot.enable = false;
boot.loader.grub = {
enable = true;
version = 2;
device = "nodev";
efiSupport = true;
enableCryptodisk = true;
configurationLimit = 5;
};
# enable passing of keyfile between grub and initrd
boot.initrd.luks.devices."cryptroot" = {
fallbackToPassword = true;
keyFile = secretsFile;
};
# copy the secret into the additional initramfs. `null` means same path
boot.initrd.secrets."${secretsFile}" = null;
# for nvidia drivers # for nvidia drivers
#nixpkgs.config.allowUnfree = true; #nixpkgs.config.allowUnfree = true;
@ -25,14 +49,16 @@
# Set your time zone. # Set your time zone.
time.timeZone = "Europe/Berlin"; time.timeZone = "Europe/Berlin";
time.hardwareClockInLocalTime = true; #Be compatible with Windows
# The global useDHCP flag is deprecated, therefore explicitly set to false here. # The global useDHCP flag is deprecated, therefore explicitly set to false here.
# Per-interface useDHCP will be mandatory in the future, so this generated config # Per-interface useDHCP will be mandatory in the future, so this generated config
# replicates the default behaviour. # replicates the default behaviour.
networking.useDHCP = false; networking.useDHCP = false;
networking.hostName = "cray"; # Define your hostname. networking.hostName = "cray"; # Define your hostname.
networking.interfaces.eno1.useDHCP = true; networking.interfaces.enp4s0.useDHCP = true;
networking.interfaces.eno1.wakeOnLan.enable = true; networking.interfaces.enp4s0.wakeOnLan.enable = true;
# Enable CUPS # Enable CUPS
services.printing.enable = true; services.printing.enable = true;

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

@ -4,23 +4,21 @@
{ config, lib, pkgs, modulesPath, ... }: { config, lib, pkgs, modulesPath, ... }:
{ {
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; imports =
[ (modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
[ "xhci_pci" "ehci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ]; boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
fileSystems."/" = { fileSystems."/" =
device = "/dev/disk/by-uuid/1d2ce540-2fce-4621-8a4d-e05e09369bc3"; { device = "/dev/disk/by-uuid/60e06bf9-f4c4-4555-879b-23ade6599704";
fsType = "ext4"; fsType = "ext4";
}; };
fileSystems."/boot" = { boot.initrd.luks.devices."cryptroot".device = "/dev/disk/by-uuid/2e85528d-0086-4835-9fc7-0e7a847d90bd";
device = "/dev/disk/by-uuid/782C-3B0B";
fsType = "vfat";
};
fileSystems."/mnt/pool" = { fileSystems."/mnt/pool" = {
device = "//BART/Pool/"; device = "//BART/Pool/";
@ -33,10 +31,16 @@
in in
[ "${automount_opts},credentials=/etc/nixos/smb-secrets" ]; [ "${automount_opts},credentials=/etc/nixos/smb-secrets" ];
}; };
fileSystems."/boot/efi" =
{ device = "/dev/disk/by-uuid/274B-0F7C";
fsType = "vfat";
};
swapDevices = swapDevices = [{
[{ device = "/dev/disk/by-uuid/6a0a9641-00c5-490e-abcc-9efeaeaca1f8"; }]; device = "/dev/disk/by-partuuid/c5586d55-aca1-4771-9695-1232ba83d3f6";
randomEncryption = true;
hardware.cpu.intel.updateMicrocode = }];
lib.mkDefault config.hardware.enableRedistributableFirmware;
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
} }