Merge remote-tracking branch 'ni/master'

1 files changed, 3 insertions, 11 deletions

diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix
index b59311092..834a89083 100644
--- a/tv/2configs/default.nix
+++ b/tv/2configs/default.nix
@@ -22,16 +22,6 @@ in {
     ./vim.nix
     ./xdg.nix
     {
-      # stockholm dependencies
-      environment.systemPackages = with pkgs; [
-        git
-        gnumake
-        hashPassword
-        populate
-        whatsupnix
-      ];
-    }
-    {
       users = {
         defaultUserShell = "/run/current-system/sw/bin/bash";
         mutableUsers = false;
@@ -47,7 +37,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
       '';
@@ -142,6 +132,8 @@ in {
     {
       environment.systemPackages = [
         pkgs.get
+        pkgs.git
+        pkgs.hashPassword
         pkgs.htop
         pkgs.kpaste
         pkgs.krebspaste