From 8f5fc9bc4fff53936e8bba5b2a4de3d362b94f09 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
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 <tv@krebsco.de>
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 <tv@krebsco.de>
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 <stockholm/lib>;
       "ni"
       "prism"
     ];
+    extraConfig = ''
+      LocalDiscovery = yes
+    '';
     tincPackage = pkgs.tinc_pre;
   };
   tv.iptables.input-internet-accept-tcp = singleton "tinc";
-- 
cgit v1.2.3

[cgit] Unable to lock slot /tmp/cgit/61000000.lock: No such file or directory (2)