summaryrefslogtreecommitdiffstats
path: root/tv/2configs/default.nix
diff options
context:
space:
mode:
authorlassulus <lassulus@lassul.us>2017-08-01 13:46:49 +0200
committerlassulus <lassulus@lassul.us>2017-08-01 13:46:49 +0200
commitef128bdd0fea2442bbf9775fccd3eb4ca71bfdcc (patch)
tree0f7aea47e8e73d24bb03de4f4c7e831b38c86f00 /tv/2configs/default.nix
parentb95e15654d66607a416b2ba0e87a5d9dd0fe09ed (diff)
parente19b506f36c8848ece02d7796a91ff0634191609 (diff)
Merge remote-tracking branch 'ni/master'
Diffstat (limited to 'tv/2configs/default.nix')
-rw-r--r--tv/2configs/default.nix14
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