summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Richter <makefu@syntax-fehler.de>2015-08-16 11:47:56 +0000
committerFelix Richter <makefu@syntax-fehler.de>2015-08-16 11:47:56 +0000
commit6109ae141fd83d28e2bafea8e3911133b655d188 (patch)
tree19a49c3c48469a9db5c3d3883cb63d04d2acc457
parent41e7978af2dbe8ac2195012ac05c11db4644b8af (diff)
parent125d34a68f87b6a45ff9e56e4a50e8db04d2b1d8 (diff)
Merge remote-tracking branch 'cloudkrebs/master'
-rw-r--r--lass/2configs/base.nix2
-rw-r--r--lass/2configs/retiolum.nix1
2 files changed, 0 insertions, 3 deletions
diff --git a/lass/2configs/base.nix b/lass/2configs/base.nix
index 8379f14e4..095c7660c 100644
--- a/lass/2configs/base.nix
+++ b/lass/2configs/base.nix
@@ -58,8 +58,6 @@ with lib;
'';
environment.systemPackages = with pkgs; [
- nmap
-
git
most
rxvt_unicode.terminfo
diff --git a/lass/2configs/retiolum.nix b/lass/2configs/retiolum.nix
index b8a9cec72..2d583a88a 100644
--- a/lass/2configs/retiolum.nix
+++ b/lass/2configs/retiolum.nix
@@ -3,7 +3,6 @@
{
imports = [
../3modules/iptables.nix
- ../../tv/2configs/exim-retiolum.nix
];
lass.iptables = {