From 8f5fc9bc4fff53936e8bba5b2a4de3d362b94f09 Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 1 Aug 2017 11:28:25 +0200 Subject: tv sudo: env_keep += XMONAD_SPAWN_WORKSPACE --- tv/2configs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tv/2configs') diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix index b59311092..420548bce 100644 --- a/tv/2configs/default.nix +++ b/tv/2configs/default.nix @@ -47,7 +47,7 @@ in { { security.hideProcessInformation = true; security.sudo.extraConfig = '' - Defaults env_keep+="SSH_CLIENT" + Defaults env_keep+="SSH_CLIENT XMONAD_SPAWN_WORKSPACE" Defaults mailto="${config.krebs.users.tv.mail}" Defaults !lecture ''; -- cgit v1.2.3 From 2f52158dec91a87cddd3e643f29870a6acc233f6 Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 1 Aug 2017 11:30:16 +0200 Subject: tv: drop explicit stockholm deps --- tv/2configs/default.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'tv/2configs') diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix index 420548bce..834a89083 100644 --- a/tv/2configs/default.nix +++ b/tv/2configs/default.nix @@ -21,16 +21,6 @@ in { ./sshd.nix ./vim.nix ./xdg.nix - { - # stockholm dependencies - environment.systemPackages = with pkgs; [ - git - gnumake - hashPassword - populate - whatsupnix - ]; - } { users = { defaultUserShell = "/run/current-system/sw/bin/bash"; @@ -142,6 +132,8 @@ in { { environment.systemPackages = [ pkgs.get + pkgs.git + pkgs.hashPassword pkgs.htop pkgs.kpaste pkgs.krebspaste -- cgit v1.2.3 From e19b506f36c8848ece02d7796a91ff0634191609 Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 1 Aug 2017 12:15:45 +0200 Subject: tv retiolum: LocalDiscovery = yes --- tv/2configs/retiolum.nix | 3 +++ 1 file changed, 3 insertions(+) (limited to 'tv/2configs') diff --git a/tv/2configs/retiolum.nix b/tv/2configs/retiolum.nix index a914dad43..9940b1026 100644 --- a/tv/2configs/retiolum.nix +++ b/tv/2configs/retiolum.nix @@ -10,6 +10,9 @@ with import ; "ni" "prism" ]; + extraConfig = '' + LocalDiscovery = yes + ''; tincPackage = pkgs.tinc_pre; }; tv.iptables.input-internet-accept-tcp = singleton "tinc"; -- cgit v1.2.3 From e749d26c4fd2401b7f8e0293aaf780b4700af3c1 Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 1 Aug 2017 20:11:14 +0200 Subject: tv public_html: add server aliases for gg23 --- tv/2configs/nginx/public_html.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'tv/2configs') diff --git a/tv/2configs/nginx/public_html.nix b/tv/2configs/nginx/public_html.nix index a686d281c..cc7a39891 100644 --- a/tv/2configs/nginx/public_html.nix +++ b/tv/2configs/nginx/public_html.nix @@ -9,6 +9,7 @@ with import ; serverAliases = [ "localhost" "${config.krebs.build.host.name}" + "${config.krebs.build.host.name}.gg23" "${config.krebs.build.host.name}.r" ]; locations."~ ^/~(.+?)(/.*)?\$".extraConfig = '' -- cgit v1.2.3 From 06d2c2d773559c0c059768e1ab8a350ae2a82c0e Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 1 Aug 2017 20:12:04 +0200 Subject: tv vim: colorize search results --- tv/2configs/vim.nix | 2 ++ 1 file changed, 2 insertions(+) (limited to 'tv/2configs') diff --git a/tv/2configs/vim.nix b/tv/2configs/vim.nix index f0b1cf520..85283238d 100644 --- a/tv/2configs/vim.nix +++ b/tv/2configs/vim.nix @@ -70,6 +70,8 @@ let { hi diffSubname ctermfg=207 hi diffAdded ctermfg=010 hi diffRemoved ctermfg=009 + + hi Search cterm=NONE ctermbg=216 ''; }))) ((rtp: rtp // { inherit rtp; }) (pkgs.writeTextFile (let -- cgit v1.2.3 From 5aad878c525c16e98922858bbc85eade10365526 Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 1 Aug 2017 20:13:30 +0200 Subject: tv vim: relaxt sh.extraStart for variable names --- tv/2configs/vim.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tv/2configs') diff --git a/tv/2configs/vim.nix b/tv/2configs/vim.nix index 85283238d..ca4718646 100644 --- a/tv/2configs/vim.nix +++ b/tv/2configs/vim.nix @@ -229,7 +229,7 @@ let { lua = {}; sed.extraStart = ''writeSed[^ \t\r\n]*[ \t\r\n]*"[^"]*"''; sh.extraStart = concatStringsSep ''\|'' [ - ''write\(Ba\|Da\)sh[^ \t\r\n]*[ \t\r\n]*"[^"]*"'' + ''write\(Ba\|Da\)sh[^ \t\r\n]*[ \t\r\n]*\("[^"]*"\|[a-z]\+\)'' ''[a-z]*Phase[ \t\r\n]*='' ]; yaml = {}; -- cgit v1.2.3 From 0b4d3edff8f3e0e33756355f1b3121cf311bafdb Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 1 Aug 2017 22:32:14 +0200 Subject: tv: boot.tmpOnTmpfs = true --- tv/2configs/default.nix | 2 ++ 1 file changed, 2 insertions(+) (limited to 'tv/2configs') diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix index 834a89083..c58525e98 100644 --- a/tv/2configs/default.nix +++ b/tv/2configs/default.nix @@ -4,6 +4,8 @@ with import ; then "buildbot" else "tv"; in { + boot.tmpOnTmpfs = true; + krebs.enable = true; krebs.build.user = config.krebs.users.tv; -- cgit v1.2.3 From f58b49aa82769b4f3eca5ee0e63de407224c7dd9 Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 1 Aug 2017 22:34:14 +0200 Subject: tv config: drop unused "builder" variable --- tv/2configs/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'tv/2configs') diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix index c58525e98..730b055a2 100644 --- a/tv/2configs/default.nix +++ b/tv/2configs/default.nix @@ -1,9 +1,6 @@ with import ; -{ config, lib, pkgs, ... }: let - builder = if getEnv "dummy_secrets" == "true" - then "buildbot" - else "tv"; -in { +{ config, pkgs, ... }: { + boot.tmpOnTmpfs = true; krebs.enable = true; -- cgit v1.2.3