makefu/stockholm
1
0
Fork 0
Code Issues Pull requests Actions1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'ni/master'

Browse source
This commit is contained in:
lassulus 2017-03-09 19:11:27 +01:00
parent c8668be63c f30a7dd975
commit 2578eba9af
5 changed files with 3 additions and 42 deletions

6
tv/1systems/wu.nix
View file

@ -19,12 +19,6 @@ with import <stockholm/lib>;
../2configs/xserver
{
environment.systemPackages = with pkgs; [
# stockholm
gnumake
hashPassword
parallel
# root
cryptsetup

17
tv/1systems/xu.nix
View file

@ -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

18
tv/1systems/zu.nix
View file

@ -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

2
tv/2configs/default.nix
View file

@ -38,6 +38,8 @@ with import <stockholm/lib>;
# stockholm dependencies
environment.systemPackages = with pkgs; [
git
gnumake
hashPassword
populate
];
}

2
tv/2configs/exim-smarthost.nix
View file

@ -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