summaryrefslogtreecommitdiffstats
path: root/makefu/2configs/fs
diff options
context:
space:
mode:
authorlassulus <lass@aidsballs.de>2016-10-20 21:19:26 +0200
committerlassulus <lass@aidsballs.de>2016-10-20 21:19:26 +0200
commit5cfe3f414097a16dfa84cd52739689e08b7fa0b3 (patch)
tree81ef0820be1d91961f18f2e75e2d9172bf865093 /makefu/2configs/fs
parent51a9fb2dccf6996e1f4fe6f795076ebc6bc71d25 (diff)
parentf47bab7f710b7c8a282c3a3c38affc8a0bc30cc9 (diff)
Merge remote-tracking branch 'cd/master'
Diffstat (limited to 'makefu/2configs/fs')
-rw-r--r--makefu/2configs/fs/cac-boot-partition.nix2
-rw-r--r--makefu/2configs/fs/sda-crypto-root-home.nix2
-rw-r--r--makefu/2configs/fs/sda-crypto-root.nix2
-rw-r--r--makefu/2configs/fs/vm-single-partition.nix2
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