summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--tv/1systems/wu.nix6
-rw-r--r--tv/1systems/xu.nix17
-rw-r--r--tv/1systems/zu.nix18
-rw-r--r--tv/2configs/default.nix2
-rw-r--r--tv/2configs/exim-smarthost.nix2
5 files changed, 3 insertions, 42 deletions
diff --git a/tv/1systems/wu.nix b/tv/1systems/wu.nix
index 4cde8b903..328e71fdc 100644
--- a/tv/1systems/wu.nix
+++ b/tv/1systems/wu.nix
@@ -19,12 +19,6 @@ with import <stockholm/lib>;
../2configs/xserver
{
environment.systemPackages = with pkgs; [
-
- # stockholm
- gnumake
- hashPassword
- parallel
-
# root
cryptsetup
diff --git a/tv/1systems/xu.nix b/tv/1systems/xu.nix
index 4b8fe8da2..8cf6146b5 100644
--- a/tv/1systems/xu.nix
+++ b/tv/1systems/xu.nix
@@ -20,23 +20,6 @@ with import <stockholm/lib>;
{
environment.systemPackages = with pkgs; [
- # stockholm
- gnumake
- hashPassword
- #haskellPackages.lentil
- parallel
- (pkgs.writeBashBin "im" ''
- export PATH=${makeSearchPath "bin" (with pkgs; [
- tmux
- gnugrep
- weechat
- ])}
- if tmux list-sessions -F\#S | grep -q '^im''$'; then
- exec tmux attach -t im
- else
- exec tmux new -s im weechat
- fi
- '')
# root
cryptsetup
diff --git a/tv/1systems/zu.nix b/tv/1systems/zu.nix
index 194ac2928..b1b2d58ce 100644
--- a/tv/1systems/zu.nix
+++ b/tv/1systems/zu.nix
@@ -25,24 +25,6 @@ with import <stockholm/lib>;
{
environment.systemPackages = with pkgs; [
- # stockholm
- gnumake
- hashPassword
- haskellPackages.lentil
- parallel
- (pkgs.writeBashBin "im" ''
- export PATH=${makeSearchPath "bin" (with pkgs; [
- tmux
- gnugrep
- weechat
- ])}
- if tmux list-sessions -F\#S | grep -q '^im''$'; then
- exec tmux attach -t im
- else
- exec tmux new -s im weechat
- fi
- '')
-
# root
cryptsetup
diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix
index e170156a4..4c10b2a28 100644
--- a/tv/2configs/default.nix
+++ b/tv/2configs/default.nix
@@ -38,6 +38,8 @@ with import <stockholm/lib>;
# stockholm dependencies
environment.systemPackages = with pkgs; [
git
+ gnumake
+ hashPassword
populate
];
}
diff --git a/tv/2configs/exim-smarthost.nix b/tv/2configs/exim-smarthost.nix
index cc3bdf95d..816dce78d 100644
--- a/tv/2configs/exim-smarthost.nix
+++ b/tv/2configs/exim-smarthost.nix
@@ -13,7 +13,7 @@ with import <stockholm/lib>;
"shackspace.de"
"viljetic.de"
];
- relay_from_hosts = map (host: host.nets.retiolum.ip4.addr) [
+ relay_from_hosts = concatMap (host: host.nets.retiolum.addrs) [
config.krebs.hosts.nomic
config.krebs.hosts.wu
config.krebs.hosts.xu