diff options
| author | makefu <github@syntax-fehler.de> | 2016-10-24 14:14:58 +0200 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2016-10-24 14:14:58 +0200 |
| commit | 36cbb3d300eb18330a62ba20e35f80d515f5bc5f (patch) | |
| tree | dedf23acdc5763b59b5853b07dd297b88fb15636 /makefu/2configs/fs | |
| parent | 3fa63a4f312a885d353177db911f8a52ce7a1e1c (diff) | |
| parent | 08c7671fc51270e582e16cbe49aa896f8bff7685 (diff) | |
Merge remote-tracking branch 'cd/master'
Diffstat (limited to 'makefu/2configs/fs')
| -rw-r--r-- | makefu/2configs/fs/cac-boot-partition.nix | 2 | ||||
| -rw-r--r-- | makefu/2configs/fs/sda-crypto-root-home.nix | 2 | ||||
| -rw-r--r-- | makefu/2configs/fs/sda-crypto-root.nix | 2 | ||||
| -rw-r--r-- | makefu/2configs/fs/vm-single-partition.nix | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/makefu/2configs/fs/cac-boot-partition.nix b/makefu/2configs/fs/cac-boot-partition.nix index bf08504d5..3d59a25dd 100644 --- a/makefu/2configs/fs/cac-boot-partition.nix +++ b/makefu/2configs/fs/cac-boot-partition.nix @@ -1,7 +1,7 @@ { config, lib, pkgs, ... }: # vda1 ext4 (label nixos) -> only root partition -with config.krebs.lib; +with import <stockholm/lib>; { boot.loader.grub.enable = true; boot.loader.grub.version = 2; diff --git a/makefu/2configs/fs/sda-crypto-root-home.nix b/makefu/2configs/fs/sda-crypto-root-home.nix index 1ef0d69e9..e790ed6a8 100644 --- a/makefu/2configs/fs/sda-crypto-root-home.nix +++ b/makefu/2configs/fs/sda-crypto-root-home.nix @@ -8,7 +8,7 @@ # / (main-root) # /home (main-home) -with config.krebs.lib; +with import <stockholm/lib>; { imports = [ diff --git a/makefu/2configs/fs/sda-crypto-root.nix b/makefu/2configs/fs/sda-crypto-root.nix index 5c7cdf716..cfa703aaf 100644 --- a/makefu/2configs/fs/sda-crypto-root.nix +++ b/makefu/2configs/fs/sda-crypto-root.nix @@ -4,7 +4,7 @@ # sda1: boot ext4 (label nixboot) - must be unlocked on boot if required: # boot.initrd.luks.devices = [ { name = "luksroot"; device = "/dev/sda2"; allowDiscards=true; }]; # sda2: cryptoluks -> ext4 -with config.krebs.lib; +with import <stockholm/lib>; { boot = { loader.grub.enable = true; diff --git a/makefu/2configs/fs/vm-single-partition.nix b/makefu/2configs/fs/vm-single-partition.nix index 88f209597..26908c357 100644 --- a/makefu/2configs/fs/vm-single-partition.nix +++ b/makefu/2configs/fs/vm-single-partition.nix @@ -1,7 +1,7 @@ { config, lib, pkgs, ... }: # vda1 ext4 (label nixos) -> only root partition -with config.krebs.lib; +with import <stockholm/lib>; { imports = [ ./single-partition-ext4.nix |