l 1 icarus: now installed with init

This commit is contained in:
lassulus 2017-01-21 18:29:49 +01:00
parent c80d283a55
commit bd9dddd97f

View File

@ -14,15 +14,6 @@ with import <stockholm/lib>;
../2configs/fetchWallpaper.nix ../2configs/fetchWallpaper.nix
../2configs/backups.nix ../2configs/backups.nix
../2configs/games.nix ../2configs/games.nix
#{
# users.extraUsers = {
# root = {
# openssh.authorizedKeys.keys = map readFile [
# ../../krebs/Zpubkeys/uriel.ssh.pub
# ];
# };
# };
#}
]; ];
krebs.build.host = config.krebs.hosts.icarus; krebs.build.host = config.krebs.hosts.icarus;
@ -32,19 +23,28 @@ with import <stockholm/lib>;
loader.grub.version = 2; loader.grub.version = 2;
loader.grub.device = "/dev/sda"; loader.grub.device = "/dev/sda";
initrd.luks.devices = [ { name = "luksroot"; device = "/dev/sda2"; } ]; initrd.luks.devices = [ { name = "luksroot"; device = "/dev/sda3"; } ];
initrd.luks.cryptoModules = [ "aes" "sha512" "sha1" "xts" ]; initrd.luks.cryptoModules = [ "aes" "sha512" "sha1" "xts" ];
initrd.availableKernelModules = [ "xhci_hcd" "ehci_pci" "ahci" "usb_storage" ]; initrd.availableKernelModules = [ "xhci_hcd" "ehci_pci" "ahci" "usb_storage" ];
#kernelModules = [ "kvm-intel" "msr" ];
}; };
fileSystems = { fileSystems = {
"/" = { "/" = {
device = "/dev/pool/nix"; device = "/dev/mapper/pool-root";
fsType = "btrfs"; fsType = "btrfs";
options = ["defaults" "noatime" "ssd" "compress=lzo"];
};
"/bku" = {
device = "/dev/mapper/pool-bku";
fsType = "btrfs";
options = ["defaults" "noatime" "ssd" "compress=lzo"];
};
"/home" = {
device = "/dev/mapper/pool-home";
fsType = "btrfs";
options = ["defaults" "noatime" "ssd" "compress=lzo"];
}; };
"/boot" = { "/boot" = {
device = "/dev/sda1"; device = "/dev/sda2";
}; };
"/tmp" = { "/tmp" = {
device = "tmpfs"; device = "tmpfs";