From 4a3bee7aa8a3218ca8a319695bc66520220ce93d Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Wed, 24 Aug 2016 00:03:38 +0200
Subject: l: import retiolum.nix explicit

---
 lass/1systems/cloudkrebs.nix | 3 +--
 lass/1systems/dishfire.nix   | 2 +-
 lass/1systems/echelon.nix    | 3 +--
 lass/1systems/helios.nix     | 1 +
 lass/1systems/mors.nix       | 1 +
 lass/1systems/prism.nix      | 2 +-
 lass/1systems/shodan.nix     | 1 +
 lass/1systems/uriel.nix      | 2 +-
 8 files changed, 8 insertions(+), 7 deletions(-)

(limited to 'lass/1systems')

diff --git a/lass/1systems/cloudkrebs.nix b/lass/1systems/cloudkrebs.nix
index 5aa35f5a..e65b13d0 100644
--- a/lass/1systems/cloudkrebs.nix
+++ b/lass/1systems/cloudkrebs.nix
@@ -7,10 +7,9 @@ let
 in {
   imports = [
     ../.
+    ../2configs/retiolum.nix
     ../2configs/os-templates/CAC-CentOS-7-64bit.nix
-    ../2configs/default.nix
     ../2configs/exim-retiolum.nix
-    ../2configs/retiolum.nix
     ../2configs/git.nix
     ../2configs/realwallpaper.nix
     ../2configs/privoxy-retiolum.nix
diff --git a/lass/1systems/dishfire.nix b/lass/1systems/dishfire.nix
index ec9f5369..9c77f909 100644
--- a/lass/1systems/dishfire.nix
+++ b/lass/1systems/dishfire.nix
@@ -3,8 +3,8 @@
 {
   imports = [
     ../.
+    ../2configs/retiolum.nix
     <nixpkgs/nixos/modules/profiles/qemu-guest.nix>
-    ../2configs/default.nix
     #../2configs/exim-retiolum.nix
     ../2configs/git.nix
     {
diff --git a/lass/1systems/echelon.nix b/lass/1systems/echelon.nix
index 8d944ed4..da886401 100644
--- a/lass/1systems/echelon.nix
+++ b/lass/1systems/echelon.nix
@@ -7,10 +7,9 @@ let
 in {
   imports = [
     ../.
+    ../2configs/retiolum.nix
     ../2configs/os-templates/CAC-CentOS-7-64bit.nix
-    ../2configs/default.nix
     ../2configs/exim-retiolum.nix
-    ../2configs/retiolum.nix
     ../2configs/realwallpaper.nix
     ../2configs/privoxy-retiolum.nix
     ../2configs/git.nix
diff --git a/lass/1systems/helios.nix b/lass/1systems/helios.nix
index 53026a6f..49547607 100644
--- a/lass/1systems/helios.nix
+++ b/lass/1systems/helios.nix
@@ -6,6 +6,7 @@ with config.krebs.lib;
 {
   imports = [
     ../.
+    ../2configs/retiolum.nix
     ../2configs/exim-retiolum.nix
     ../2configs/browsers.nix
     ../2configs/programs.nix
diff --git a/lass/1systems/mors.nix b/lass/1systems/mors.nix
index 92a1b51e..d3878d30 100644
--- a/lass/1systems/mors.nix
+++ b/lass/1systems/mors.nix
@@ -3,6 +3,7 @@
 {
   imports = [
     ../.
+    ../2configs/retiolum.nix
     ../2configs/hw/tp-x220.nix
     ../2configs/baseX.nix
     ../2configs/exim-retiolum.nix
diff --git a/lass/1systems/prism.nix b/lass/1systems/prism.nix
index 812cdb84..3c553842 100644
--- a/lass/1systems/prism.nix
+++ b/lass/1systems/prism.nix
@@ -12,7 +12,7 @@ let
 in {
   imports = [
     ../.
-    ../2configs/default.nix
+    ../2configs/retiolum.nix
     ../2configs/exim-smarthost.nix
     ../2configs/downloading.nix
     ../2configs/ts3.nix
diff --git a/lass/1systems/shodan.nix b/lass/1systems/shodan.nix
index 96d64bda..af98c696 100644
--- a/lass/1systems/shodan.nix
+++ b/lass/1systems/shodan.nix
@@ -4,6 +4,7 @@ with builtins;
 {
   imports = [
     ../.
+    ../2configs/retiolum.nix
     ../2configs/hw/tp-x220.nix
     ../2configs/baseX.nix
     ../2configs/git.nix
diff --git a/lass/1systems/uriel.nix b/lass/1systems/uriel.nix
index 6b56419d..16c39280 100644
--- a/lass/1systems/uriel.nix
+++ b/lass/1systems/uriel.nix
@@ -4,6 +4,7 @@ with builtins;
 {
   imports = [
     ../.
+    ../2configs/retiolum.nix
     ../2configs/baseX.nix
     ../2configs/exim-retiolum.nix
     ../2configs/browsers.nix
@@ -12,7 +13,6 @@ with builtins;
     ../2configs/bird.nix
     ../2configs/git.nix
     ../2configs/chromium-patched.nix
-    ../2configs/retiolum.nix
     ../2configs/bitlbee.nix
     ../2configs/weechat.nix
     ../2configs/skype.nix
-- 
cgit v1.2.3