Merge remote-tracking branch 'uriel/master'

1 files changed, 7 insertions, 4 deletions

diff --git a/makefu/1systems/tsp.nix b/makefu/1systems/tsp.nix
index 388ded068..887778c8f 100644
--- a/makefu/1systems/tsp.nix
+++ b/makefu/1systems/tsp.nix
@@ -11,17 +11,20 @@
       ../2configs/tinc-basic-retiolum.nix
       ../2configs/sda-crypto-root.nix
       # hardware specifics are in here
-      ../2configs/tp-x200.nix
+      ../2configs/tp-x200.nix #< imports tp-x2x0.nix
 
       ../2configs/disable_v6.nix
       ../2configs/rad1o.nix
+
+      ../2configs/zsh-user.nix
+      ../2configs/exim-retiolum.nix
     ];
   # not working in vm
   krebs.build.host = config.krebs.hosts.tsp;
   krebs.build.user = config.krebs.users.makefu;
   krebs.build.target = "root@tsp";
 
-  krebs.exim-retiolum.enable = true;
+
   networking.firewall.allowedTCPPorts = [
     25
   ];
@@ -31,8 +34,8 @@
       #url = https://github.com/NixOS/nixpkgs;
       # rev=$(curl https://nixos.org/channels/nixos-unstable/git-revision -L)
       url = https://github.com/makefu/nixpkgs;
-      rev = "8b8b65da24f13f9317504e8bcba476f9161613fe";
+      #rev = "8b8b65da24f13f9317504e8bcba476f9161613fe";
+      rev = "f5fe787f778b872c6b2221598501c9310cb83915";
     };
   };
-
 }