summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlassulus <lass@aidsballs.de>2016-08-24 00:03:38 +0200
committerlassulus <lass@aidsballs.de>2016-08-24 00:03:38 +0200
commit4a3bee7aa8a3218ca8a319695bc66520220ce93d (patch)
treeafb7647cd31821f6836fd2200c5dfdd5bc71d5da
parentcdaa911344c96610ee327716f576c1eb061a9277 (diff)
l: import retiolum.nix explicit
-rw-r--r--lass/1systems/cloudkrebs.nix3
-rw-r--r--lass/1systems/dishfire.nix2
-rw-r--r--lass/1systems/echelon.nix3
-rw-r--r--lass/1systems/helios.nix1
-rw-r--r--lass/1systems/mors.nix1
-rw-r--r--lass/1systems/prism.nix2
-rw-r--r--lass/1systems/shodan.nix1
-rw-r--r--lass/1systems/uriel.nix2
-rw-r--r--lass/2configs/default.nix1
9 files changed, 8 insertions, 8 deletions
diff --git a/lass/1systems/cloudkrebs.nix b/lass/1systems/cloudkrebs.nix
index 5aa35f5a7..e65b13d00 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 ec9f53694..9c77f909d 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 8d944ed40..da8864011 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 53026a6fb..49547607a 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 92a1b51e9..d3878d305 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 812cdb844..3c5538424 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 96d64bda3..af98c6968 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 6b56419d7..16c39280d 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
diff --git a/lass/2configs/default.nix b/lass/2configs/default.nix
index dbb2a853a..cc848c39e 100644
--- a/lass/2configs/default.nix
+++ b/lass/2configs/default.nix
@@ -8,7 +8,6 @@ with config.krebs.lib;
../2configs/gc.nix
../2configs/mc.nix
../2configs/nixpkgs.nix
- ../2configs/retiolum.nix
../2configs/vim.nix
../2configs/zsh.nix
./backups.nix