summaryrefslogtreecommitdiffstats
path: root/lass/1systems/echelon.nix
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2016-08-24 12:13:58 +0200
committermakefu <github@syntax-fehler.de>2016-08-24 12:13:58 +0200
commit07bea34ab27bc52b8a002335c5590cd29542b32b (patch)
treeb0e90a3d2788a746b0fb9dc5841c8b789decd50a /lass/1systems/echelon.nix
parentaa21de8764eef9f01cd9285590ebbe911a34f9fc (diff)
parent57a413567b71270de4357ae6317dc390abe0b6ea (diff)
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'lass/1systems/echelon.nix')
-rw-r--r--lass/1systems/echelon.nix3
1 files changed, 1 insertions, 2 deletions
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