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

Merge remote-tracking branch 'pnp/master'

Browse source
This commit is contained in:
lassulus 2015-10-17 15:59:53 +02:00
parent 5668898216 1cfdb0b786
commit 8b406e29b4
2 changed files with 9 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
2configs/base.nix
View file

@ -51,9 +51,7 @@ with lib;
"d /tmp 1777 root root - -"
];
environment.extraInit = ''
EDITOR=vim
'';
environment.variables.EDITOR = mkForce "vim";
environment.systemPackages = with pkgs; [
jq

26
2configs/fs/sda-crypto-root-home.nix
View file

@ -3,37 +3,23 @@
# ssd #
# sda: bootloader grub2
# sda1: boot ext4 (label nixboot)
# sda2: cryptoluks -> lvm:
# sda2: cryptoluks ->
# lvm:
# / (main-root)
# /home (main-home)
with lib;
{
boot = {
loader.grub.enable =true;
loader.grub.version =2;
loader.grub.device = "/dev/sda";
initrd.luks.devices = [ { name = "main"; device = "/dev/sda2"; allowDiscards=true; }];
initrd.luks.cryptoModules = ["aes" "sha512" "sha1" "xts" ];
initrd.availableKernelModules = ["xhci_hcd" "ehci_pci" "ahci" "usb_storage" ];
};
imports = [
./sda-crypto-root.nix # configures crypto + boot
];
fileSystems = {
"/" = {
device = "/dev/mapper/main-root";
fsType = "ext4";
options="defaults,discard";
};
# TODO: just import sda-crypto-root, add this device
"/".device = lib.mkForce "/dev/mapper/main-root";
"/home" = {
device = "/dev/mapper/main-home";
fsType = "ext4";
options="defaults,discard";
};
"/boot" = {
device = "/dev/disk/by-label/nixboot";
fsType = "ext4";
options="defaults,discard";
};
};
}