diff options
author | tv <tv@shackspace.de> | 2015-10-04 22:28:27 +0200 |
---|---|---|
committer | tv <tv@shackspace.de> | 2015-10-04 22:28:27 +0200 |
commit | 04c0f3935b257ab3cd396a5274f691e982c8dba3 (patch) | |
tree | 6dc76859ba10e4a231b34d14b0ed39cb23585073 /lass/1systems | |
parent | 41df3589f6f3aab31443a486a9d7e82f4e9ff559 (diff) | |
parent | b5977c92b3c3daa8023f4df1070a240617125019 (diff) |
Merge remote-tracking branch 'pnp/master'
Diffstat (limited to 'lass/1systems')
-rw-r--r-- | lass/1systems/cloudkrebs.nix | 2 | ||||
-rw-r--r-- | lass/1systems/echelon.nix | 3 | ||||
-rw-r--r-- | lass/1systems/mors.nix | 2 | ||||
-rw-r--r-- | lass/1systems/uriel.nix | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/lass/1systems/cloudkrebs.nix b/lass/1systems/cloudkrebs.nix index 2a6a70ffd..0aca2146d 100644 --- a/lass/1systems/cloudkrebs.nix +++ b/lass/1systems/cloudkrebs.nix @@ -13,7 +13,7 @@ in { ../2configs/base.nix ../2configs/retiolum.nix ../2configs/fastpoke-pages.nix - ../2configs/new-repos.nix + ../2configs/git.nix ../2configs/realwallpaper.nix { networking.interfaces.enp2s1.ip4 = [ diff --git a/lass/1systems/echelon.nix b/lass/1systems/echelon.nix index 782674cb0..45f7ebd70 100644 --- a/lass/1systems/echelon.nix +++ b/lass/1systems/echelon.nix @@ -11,7 +11,8 @@ in { ../../tv/2configs/CAC-CentOS-7-64bit.nix ../2configs/base.nix ../2configs/retiolum.nix - ../2configs/realwallpaper.nix + ../2configs/realwallpaper-server.nix + ../2configs/privoxy-retiolum.nix { networking.interfaces.enp2s1.ip4 = [ { diff --git a/lass/1systems/mors.nix b/lass/1systems/mors.nix index 414afcbba..5cc03501f 100644 --- a/lass/1systems/mors.nix +++ b/lass/1systems/mors.nix @@ -17,7 +17,7 @@ ../2configs/binary-caches.nix #../2configs/ircd.nix ../2configs/chromium-patched.nix - ../2configs/new-repos.nix + ../2configs/git.nix #../../2configs/tv/synaptics.nix ../2configs/retiolum.nix ../2configs/wordpress.nix diff --git a/lass/1systems/uriel.nix b/lass/1systems/uriel.nix index bd3770b43..62338d054 100644 --- a/lass/1systems/uriel.nix +++ b/lass/1systems/uriel.nix @@ -9,7 +9,7 @@ with builtins; ../2configs/pass.nix ../2configs/urxvt.nix ../2configs/bird.nix - ../2configs/new-repos.nix + ../2configs/git.nix ../2configs/chromium-patched.nix ../2configs/retiolum.nix ../2configs/bitlbee.nix |