Merge remote-tracking branch 'onondaga/master'

4 files changed, 23 insertions, 10 deletions

diff --git a/nin/1systems/hiawatha.nix b/nin/1systems/hiawatha/config.nix
index 12f2718bc..0e48b41c2 100644
--- a/nin/1systems/hiawatha.nix
+++ b/nin/1systems/hiawatha/config.nix
@@ -8,13 +8,13 @@ with lib;
 
 {
   imports = [
-    ../.
+    <stockholm/nin>
     <nixpkgs/nixos/modules/installer/scan/not-detected.nix>
-    ../2configs/copyq.nix
-    ../2configs/games.nix
-    ../2configs/git.nix
-    ../2configs/retiolum.nix
-    ../2configs/termite.nix
+    #../2configs/copyq.nix
+    <stockholm/nin/2configs/games.nix>
+    <stockholm/nin/2configs/git.nix>
+    <stockholm/nin/2configs/retiolum.nix>
+    <stockholm/nin/2configs/termite.nix>
   ];
 
   krebs.build.host = config.krebs.hosts.hiawatha;
@@ -33,6 +33,11 @@ with lib;
       fsType = "tmpfs";
     };
 
+  fileSystems."/home" =
+    { device = "/dev/fam/home";
+    };
+
+
   fileSystems."/boot" =
     { device = "/dev/disk/by-uuid/2f319b08-2560-401d-b53c-2abd28f1a010";
       fsType = "ext2";
diff --git a/nin/1systems/hiawatha/source.nix b/nin/1systems/hiawatha/source.nix
new file mode 100644
index 000000000..a4b366b9c
--- /dev/null
+++ b/nin/1systems/hiawatha/source.nix
@@ -0,0 +1,4 @@
+import <stockholm/nin/source.nix> {
+  name = "hiawatha";
+  secure = true;
+}
diff --git a/nin/1systems/onondaga.nix b/nin/1systems/onondaga/config.nix
index 576847032..242d67c26 100644
--- a/nin/1systems/onondaga.nix
+++ b/nin/1systems/onondaga/config.nix
@@ -6,11 +6,11 @@
 
 {
   imports = [
-    ../.
+    <stockholm/nin>
     <nixpkgs/nixos/modules/profiles/qemu-guest.nix>
-    ../2configs/retiolum.nix
-    ../2configs/weechat.nix
-    ../2configs/git.nix
+    <stockholm/nin/2configs/retiolum.nix>
+    <stockholm/nin/2configs/weechat.nix>
+    <stockholm/nin/2configs/git.nix>
   ];
 
   krebs.build.host = config.krebs.hosts.onondaga;
diff --git a/nin/1systems/onondaga/source.nix b/nin/1systems/onondaga/source.nix
new file mode 100644
index 000000000..60d020222
--- /dev/null
+++ b/nin/1systems/onondaga/source.nix
@@ -0,0 +1,4 @@
+import <stockholm/nin/source.nix> {
+  name = "onondaga";
+  secure = true;
+}