diff options
| author | makefu <github@syntax-fehler.de> | 2017-01-25 23:23:29 +0100 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2017-01-25 23:23:29 +0100 |
| commit | bf405736962fd20df738f84665e5fc7f8d74e72d (patch) | |
| tree | ae01054fe88089d6476b3c1b1952066fd6c79092 /lass/2configs/default.nix | |
| parent | 7e1bd2729e11e5c63749c69093359de0bb3329b2 (diff) | |
| parent | 89c5b22129d3cb875d16a3171a4e3ab3bee9cb0a (diff) | |
Merge remote-tracking branch 'lass/master'
Diffstat (limited to 'lass/2configs/default.nix')
| -rw-r--r-- | lass/2configs/default.nix | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/lass/2configs/default.nix b/lass/2configs/default.nix index 6fea97728..911b7738a 100644 --- a/lass/2configs/default.nix +++ b/lass/2configs/default.nix @@ -9,7 +9,6 @@ with import <stockholm/lib>; ../2configs/mc.nix ../2configs/nixpkgs.nix ../2configs/vim.nix - ../2configs/zsh.nix ./backups.nix { users.extraUsers = @@ -56,6 +55,12 @@ with import <stockholm/lib>; SSL_CERT_FILE = ca-bundle; }; }) + { + #for sshuttle + environment.systemPackages = [ + pkgs.pythonPackages.python + ]; + } ]; networking.hostName = config.krebs.build.host.name; @@ -86,8 +91,6 @@ with import <stockholm/lib>; #why is this on in the first place? services.nscd.enable = false; - boot.tmpOnTmpfs = true; - # see tmpfiles.d(5) systemd.tmpfiles.rules = [ "d /tmp 1777 root root - -" ]; @@ -156,13 +159,17 @@ with import <stockholm/lib>; promptInit = '' if test $UID = 0; then PS1='\[\033[1;31m\]\w\[\033[0m\] ' + PROMPT_COMMAND='echo -ne "\033]0;$$ $USER@$PWD\007"' elif test $UID = 1337; then PS1='\[\033[1;32m\]\w\[\033[0m\] ' + PROMPT_COMMAND='echo -ne "\033]0;$$ $PWD\007"' else PS1='\[\033[1;33m\]\u@\w\[\033[0m\] ' + PROMPT_COMMAND='echo -ne "\033]0;$$ $USER@$PWD\007"' fi if test -n "$SSH_CLIENT"; then PS1='\[\033[35m\]\h'" $PS1" + PROMPT_COMMAND='echo -ne "\033]0;$$ $HOSTNAME $USER@$PWD\007"' fi ''; }; |