Correct etzel nixfmt

This commit is contained in:
Fabian Hauser 2020-05-09 16:48:24 +02:00
parent 22182a634e
commit 2ac9f85c81

View file

@ -5,10 +5,7 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
{ {
imports = [ imports = [ ../hardware/apu1.nix ../role/base ];
../hardware/apu1.nix
../role/base
];
# Use the GRUB 2 boot loader. # Use the GRUB 2 boot loader.
boot.loader.grub.enable = true; boot.loader.grub.enable = true;
@ -19,10 +16,15 @@
# Define on which hard drive you want to install Grub. # Define on which hard drive you want to install Grub.
boot.loader.grub.device = "/dev/sda"; # or "nodev" for efi only boot.loader.grub.device = "/dev/sda"; # or "nodev" for efi only
boot.initrd.luks.devices = { boot.initrd.luks.devices = {
"root" = {device = "/dev/disk/by-uuid/196202a2-ecb2-4c43-9a62-9e58f4d5de95"; keyFile = "/etc/luks.keyfile";}; "root" = {
"swap" = {device = "/dev/disk/by-uuid/a268e9e6-8636-42b1-84bc-0a432e493d0d"; keyFile = "/etc/luks.keyfile";}; device = "/dev/disk/by-uuid/196202a2-ecb2-4c43-9a62-9e58f4d5de95";
keyFile = "/etc/luks.keyfile";
};
"swap" = {
device = "/dev/disk/by-uuid/a268e9e6-8636-42b1-84bc-0a432e493d0d";
keyFile = "/etc/luks.keyfile";
};
}; };
boot.initrd.secrets."/etc/luks.keyfile" = /boot/luks.keyfile; boot.initrd.secrets."/etc/luks.keyfile" = /boot/luks.keyfile;
@ -39,7 +41,6 @@
swapDevices = [{ device = "/dev/mapper/swap"; }]; swapDevices = [{ device = "/dev/mapper/swap"; }];
networking.hostName = "etzel"; # Define your hostname. networking.hostName = "etzel"; # Define your hostname.
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
@ -60,7 +61,6 @@
# Set your time zone. # Set your time zone.
# time.timeZone = "Europe/Amsterdam"; # time.timeZone = "Europe/Amsterdam";
# This value determines the NixOS release from which the default # This value determines the NixOS release from which the default
# settings for stateful data, like file locations and database versions # settings for stateful data, like file locations and database versions
# on your system were taken. Its perfectly fine and recommended to leave # on your system were taken. Its perfectly fine and recommended to leave