From ad00352682ee3d1e564cd4edf4ea60c45cf2ccb7 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Thu, 4 Aug 2016 22:58:59 +0200
Subject: s: always import 2configs (formerly base.nix)

---
 shared/1systems/test-arch.nix    |  1 -
 shared/1systems/test-centos6.nix |  1 -
 shared/1systems/test-centos7.nix |  1 -
 shared/1systems/wolf.nix         |  1 -
 shared/2configs/base.nix         | 65 ----------------------------------------
 shared/2configs/default.nix      | 65 ++++++++++++++++++++++++++++++++++++++++
 shared/default.nix               |  1 +
 7 files changed, 66 insertions(+), 69 deletions(-)
 delete mode 100644 shared/2configs/base.nix
 create mode 100644 shared/2configs/default.nix

diff --git a/shared/1systems/test-arch.nix b/shared/1systems/test-arch.nix
index 14fc0384b..a13fea425 100644
--- a/shared/1systems/test-arch.nix
+++ b/shared/1systems/test-arch.nix
@@ -3,7 +3,6 @@
 {
   imports = [
     ../.
-    ../2configs/base.nix
     {
       boot.loader.grub = {
         device = "/dev/sda";
diff --git a/shared/1systems/test-centos6.nix b/shared/1systems/test-centos6.nix
index 8add0b7c1..ebcece383 100644
--- a/shared/1systems/test-centos6.nix
+++ b/shared/1systems/test-centos6.nix
@@ -8,7 +8,6 @@ let
 in {
   imports = [
     ../.
-    ../2configs/base.nix
     ../2configs/os-templates/CAC-CentOS-6.5-64bit.nix
     {
       networking.interfaces.enp11s0.ip4 = [
diff --git a/shared/1systems/test-centos7.nix b/shared/1systems/test-centos7.nix
index 65daff509..9ea063c9b 100644
--- a/shared/1systems/test-centos7.nix
+++ b/shared/1systems/test-centos7.nix
@@ -6,7 +6,6 @@ let
 in {
   imports = [
     ../.
-    ../2configs/base.nix
     ../2configs/os-templates/CAC-CentOS-7-64bit.nix
     ../2configs/temp/networking.nix
     ../2configs/temp/dirs.nix
diff --git a/shared/1systems/wolf.nix b/shared/1systems/wolf.nix
index 3818cf2c5..8b0976537 100644
--- a/shared/1systems/wolf.nix
+++ b/shared/1systems/wolf.nix
@@ -7,7 +7,6 @@ in
 {
   imports = [
     ../.
-    ../2configs/base.nix
     <nixpkgs/nixos/modules/profiles/qemu-guest.nix>
     ../2configs/collectd-base.nix
     ../2configs/shack-nix-cacher.nix
diff --git a/shared/2configs/base.nix b/shared/2configs/base.nix
deleted file mode 100644
index 492689427..000000000
--- a/shared/2configs/base.nix
+++ /dev/null
@@ -1,65 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with config.krebs.lib;
-{
-  krebs.enable = true;
-  krebs.tinc.retiolum.enable = true;
-
-  # TODO rename shared user to "krebs"
-  krebs.build.user = mkDefault config.krebs.users.shared;
-  krebs.build.source = let inherit (config.krebs.build) host user; in {
-    nixos-config.symlink = "stockholm/${user.name}/1systems/${host.name}.nix";
-    nixpkgs.git = {
-      url = https://github.com/NixOS/nixpkgs;
-      ref = "63b9785"; # stable @ 2016-06-01
-    };
-    secrets.file = "${getEnv "HOME"}/secrets/krebs/${host.name}";
-    stockholm.file = getEnv "PWD";
-  };
-
-  networking.hostName = config.krebs.build.host.name;
-
-  nix.maxJobs = 1;
-  nix.trustedBinaryCaches = [
-    "https://cache.nixos.org"
-    "http://cache.nixos.org"
-    "http://hydra.nixos.org"
-  ];
-  nix.useChroot = true;
-
-  nixpkgs.config.packageOverrides = pkgs: {
-    nano = pkgs.vim;
-  };
-
-  environment.systemPackages = with pkgs; [
-    git
-    rxvt_unicode.terminfo
-  ];
-
-  programs.ssh.startAgent = false;
-
-  services.openssh = {
-    enable = true;
-    hostKeys = [
-      { type = "ed25519"; path = "/etc/ssh/ssh_host_ed25519_key"; }
-    ];
-  };
-  services.cron.enable = false;
-  services.nscd.enable = false;
-  services.ntp.enable = false;
-
-  users.mutableUsers = false;
-  users.extraUsers.root.openssh.authorizedKeys.keys = [
-    # TODO
-    config.krebs.users.lass.pubkey
-    config.krebs.users.makefu.pubkey
-    # TODO HARDER:
-    config.krebs.users.makefu-omo.pubkey
-    config.krebs.users.tv.pubkey
-  ];
-
-
-  # The NixOS release to be compatible with for stateful data such as databases.
-  system.stateVersion = "15.09";
-
-}
diff --git a/shared/2configs/default.nix b/shared/2configs/default.nix
new file mode 100644
index 000000000..492689427
--- /dev/null
+++ b/shared/2configs/default.nix
@@ -0,0 +1,65 @@
+{ config, lib, pkgs, ... }:
+
+with config.krebs.lib;
+{
+  krebs.enable = true;
+  krebs.tinc.retiolum.enable = true;
+
+  # TODO rename shared user to "krebs"
+  krebs.build.user = mkDefault config.krebs.users.shared;
+  krebs.build.source = let inherit (config.krebs.build) host user; in {
+    nixos-config.symlink = "stockholm/${user.name}/1systems/${host.name}.nix";
+    nixpkgs.git = {
+      url = https://github.com/NixOS/nixpkgs;
+      ref = "63b9785"; # stable @ 2016-06-01
+    };
+    secrets.file = "${getEnv "HOME"}/secrets/krebs/${host.name}";
+    stockholm.file = getEnv "PWD";
+  };
+
+  networking.hostName = config.krebs.build.host.name;
+
+  nix.maxJobs = 1;
+  nix.trustedBinaryCaches = [
+    "https://cache.nixos.org"
+    "http://cache.nixos.org"
+    "http://hydra.nixos.org"
+  ];
+  nix.useChroot = true;
+
+  nixpkgs.config.packageOverrides = pkgs: {
+    nano = pkgs.vim;
+  };
+
+  environment.systemPackages = with pkgs; [
+    git
+    rxvt_unicode.terminfo
+  ];
+
+  programs.ssh.startAgent = false;
+
+  services.openssh = {
+    enable = true;
+    hostKeys = [
+      { type = "ed25519"; path = "/etc/ssh/ssh_host_ed25519_key"; }
+    ];
+  };
+  services.cron.enable = false;
+  services.nscd.enable = false;
+  services.ntp.enable = false;
+
+  users.mutableUsers = false;
+  users.extraUsers.root.openssh.authorizedKeys.keys = [
+    # TODO
+    config.krebs.users.lass.pubkey
+    config.krebs.users.makefu.pubkey
+    # TODO HARDER:
+    config.krebs.users.makefu-omo.pubkey
+    config.krebs.users.tv.pubkey
+  ];
+
+
+  # The NixOS release to be compatible with for stateful data such as databases.
+  system.stateVersion = "15.09";
+
+}
diff --git a/shared/default.nix b/shared/default.nix
index 69b4abaac..320e1a133 100644
--- a/shared/default.nix
+++ b/shared/default.nix
@@ -2,6 +2,7 @@ _:
 {
   imports = [
     ../krebs
+    ./2configs
     ./3modules
   ];
 }
-- 
cgit v1.2.3