From 490cee4a2f941efa5a45c0ba87daa5cc35636cc3 Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 7 Mar 2017 23:18:49 +0100 Subject: xu,zu: drop redundant "im" --- tv/1systems/xu.nix | 12 ------------ tv/1systems/zu.nix | 12 ------------ 2 files changed, 24 deletions(-) (limited to 'tv') diff --git a/tv/1systems/xu.nix b/tv/1systems/xu.nix index 4b8fe8da2..2bab0f4b0 100644 --- a/tv/1systems/xu.nix +++ b/tv/1systems/xu.nix @@ -25,18 +25,6 @@ with import ; 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..cabe7f6a5 100644 --- a/tv/1systems/zu.nix +++ b/tv/1systems/zu.nix @@ -30,18 +30,6 @@ with import ; 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 -- cgit v1.2.3 From c432c6646159569088452cc4caea1d3820ebe0f7 Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 7 Mar 2017 23:24:31 +0100 Subject: tv: stockholm dependencies are default --- tv/1systems/wu.nix | 6 ------ tv/1systems/xu.nix | 5 ----- tv/1systems/zu.nix | 6 ------ tv/2configs/default.nix | 2 ++ 4 files changed, 2 insertions(+), 17 deletions(-) (limited to 'tv') 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 ; ../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 2bab0f4b0..8cf6146b5 100644 --- a/tv/1systems/xu.nix +++ b/tv/1systems/xu.nix @@ -20,11 +20,6 @@ with import ; { environment.systemPackages = with pkgs; [ - # stockholm - gnumake - hashPassword - #haskellPackages.lentil - parallel # root cryptsetup diff --git a/tv/1systems/zu.nix b/tv/1systems/zu.nix index cabe7f6a5..b1b2d58ce 100644 --- a/tv/1systems/zu.nix +++ b/tv/1systems/zu.nix @@ -25,12 +25,6 @@ with import ; { environment.systemPackages = with pkgs; [ - # stockholm - gnumake - hashPassword - haskellPackages.lentil - parallel - # 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 dependencies environment.systemPackages = with pkgs; [ git + gnumake + hashPassword populate ]; } -- cgit v1.2.3 From e4225f826cfba6faf9c582c0e043dc58864a56a5 Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 9 Mar 2017 16:54:58 +0100 Subject: tv exim-smarthost: relay_from_hosts += ip6.addr --- tv/2configs/exim-smarthost.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tv') 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 ; "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 -- cgit v1.2.3 From df2ee4e726a784548faf8a9957bd0444c5cd0f71 Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 14 Mar 2017 20:57:21 +0100 Subject: * iptables: fix ordering refs nixpkgs fb46df8a9a4102e265f4b14af48a5df90d5b06c3 --- tv/3modules/iptables.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'tv') 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; }; }; -- cgit v1.2.3 From 22daf39ce8a48d960019ca11bf1616883a104373 Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 14 Mar 2017 23:15:23 +0100 Subject: tv: add krebspaste --- tv/2configs/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'tv') diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix index 4c10b2a28..d17e41351 100644 --- a/tv/2configs/default.nix +++ b/tv/2configs/default.nix @@ -154,6 +154,7 @@ with import ; { environment.systemPackages = [ pkgs.get + pkgs.krebspaste pkgs.krebszones pkgs.nix-prefetch-scripts pkgs.push -- cgit v1.2.3 From 75040367ffe94c6c19973ccc1dd5efe24afac78d Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 15 Mar 2017 02:10:31 +0100 Subject: tv vim: use concat --- tv/2configs/vim.nix | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) (limited to 'tv') 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 -- cgit v1.2.3