diff options
author | tv <tv@krebsco.de> | 2017-09-05 23:00:23 +0200 |
---|---|---|
committer | tv <tv@krebsco.de> | 2017-09-05 23:00:23 +0200 |
commit | 1436781119f92cbf431db5e817fba765b24d922a (patch) | |
tree | f8ee298cdddd02beab384b047cc1a76bd1bd26c1 /lass/1systems/echelon/config.nix | |
parent | 77e9bd83e2208d1d732ef505e0e996a2440d5d7c (diff) | |
parent | 71d3f53f2bf767cfbb6e941438431d6083f304b9 (diff) |
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'lass/1systems/echelon/config.nix')
-rw-r--r-- | lass/1systems/echelon/config.nix | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/lass/1systems/echelon/config.nix b/lass/1systems/echelon/config.nix index 77958267d..6f96883bf 100644 --- a/lass/1systems/echelon/config.nix +++ b/lass/1systems/echelon/config.nix @@ -9,12 +9,8 @@ in { <stockholm/lass/2configs/retiolum.nix> <stockholm/lass/2configs/os-templates/CAC-CentOS-7-64bit.nix> <stockholm/lass/2configs/exim-retiolum.nix> - <stockholm/lass/2configs/realwallpaper.nix> <stockholm/lass/2configs/privoxy-retiolum.nix> <stockholm/lass/2configs/git.nix> - <stockholm/lass/2configs/go.nix> - <stockholm/lass/2configs/ircd.nix> - <stockholm/lass/2configs/newsbot-js.nix> { networking.interfaces.enp2s1.ip4 = [ { |