s: always import 2configs (formerly base.nix)

2016-08-04 22:58:59 +02:00 · 2016-08-04 22:58:59 +02:00 · ad00352682
commit ad00352682
parent 7e55508eaf
6 changed files with 1 additions and 4 deletions
--- 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";
--- 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 = [
--- 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
--- 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
--- a/shared/2configs/default.nix
+++ b/shared/2configs/default.nix
--- a/shared/default.nix
+++ b/shared/default.nix
@ -2,6 +2,7 @@ _:
 {
  imports = [
    ../krebs
+    ./2configs
    ./3modules
  ];
 }