diff options
Diffstat (limited to 'tv')
| -rw-r--r-- | tv/1systems/wu.nix | 6 | ||||
| -rw-r--r-- | tv/1systems/xu.nix | 17 | ||||
| -rw-r--r-- | tv/1systems/zu.nix | 18 | ||||
| -rw-r--r-- | tv/2configs/default.nix | 3 | ||||
| -rw-r--r-- | tv/2configs/exim-smarthost.nix | 2 | ||||
| -rw-r--r-- | tv/2configs/vim.nix | 20 | ||||
| -rw-r--r-- | tv/3modules/iptables.nix | 6 |
7 files changed, 20 insertions, 52 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..d17e41351 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 ]; } @@ -152,6 +154,7 @@ with import <stockholm/lib>; { environment.systemPackages = [ pkgs.get + pkgs.krebspaste pkgs.krebszones pkgs.nix-prefetch-scripts pkgs.push 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 diff --git a/tv/2configs/vim.nix b/tv/2configs/vim.nix index 1ffafe9c9..8b83b0503 100644 --- a/tv/2configs/vim.nix +++ b/tv/2configs/vim.nix @@ -297,14 +297,18 @@ let { alldirs = attrValues dirs ++ map dirOf (attrValues files); in unique (sort lessThan alldirs); - vim = pkgs.writeDashBin "vim" '' - set -efu - (umask 0077; exec ${pkgs.coreutils}/bin/mkdir -p ${toString mkdirs}) - if test $# = 0 && test -e "$PWD/.ctrlpignore"; then - set -- +CtrlP - fi - exec ${pkgs.vim}/bin/vim "$@" - ''; + vim = pkgs.concat "vim" [ + pkgs.vim_configurable + (pkgs.writeDashBin "vim" '' + set -efu + (umask 0077; exec ${pkgs.coreutils}/bin/mkdir -p ${toString mkdirs}) + if test $# = 0 && test -e "$PWD/.ctrlpignore"; then + set -- +CtrlP + fi + # vim-orgmode needs Python, thus vim_configurable instead of just vim + exec ${pkgs.vim_configurable}/bin/vim "$@" + '') + ]; vimrc = pkgs.writeText "vimrc" '' set nocompatible diff --git a/tv/3modules/iptables.nix b/tv/3modules/iptables.nix index 803ed6fbf..56861dc74 100644 --- a/tv/3modules/iptables.nix +++ b/tv/3modules/iptables.nix @@ -57,8 +57,8 @@ let { networking.firewall.enable = false; systemd.services.tv-iptables = { - description = "tv-iptables"; - wantedBy = [ "network-pre.target" ]; + wantedBy = [ "sysinit.target" ]; + wants = [ "network-pre.target" ]; before = [ "network-pre.target" ]; after = [ "systemd-modules-load.service" ]; @@ -79,6 +79,8 @@ let { ip6tables-restore < ${rules 6} ''; }; + + unitConfig.DefaultDependencies = false; }; }; |