summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--shared/1systems/test-arch.nix1
-rw-r--r--shared/1systems/test-centos6.nix1
-rw-r--r--shared/1systems/test-centos7.nix1
-rw-r--r--shared/1systems/wolf.nix1
-rw-r--r--shared/2configs/default.nix (renamed from shared/2configs/base.nix)0
-rw-r--r--shared/default.nix1
6 files changed, 1 insertions, 4 deletions
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/default.nix
index 492689427..492689427 100644
--- a/shared/2configs/base.nix
+++ b/shared/2configs/default.nix
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
];
}