From 92e989f69ba14400dc059edd5819a751b19e99da Mon Sep 17 00:00:00 2001
From: lassulus <lass@lassul.us>
Date: Tue, 10 Jan 2017 17:27:07 +0100
Subject: l 2: add sshuttle config

---
 lass/2configs/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'lass/2configs/default.nix')

diff --git a/lass/2configs/default.nix b/lass/2configs/default.nix
index 6fea9772..1cb68a98 100644
--- a/lass/2configs/default.nix
+++ b/lass/2configs/default.nix
@@ -56,6 +56,12 @@ with import <stockholm/lib>;
         SSL_CERT_FILE = ca-bundle;
       };
     })
+    {
+      #for sshuttle
+      environment.systemPackages = [
+        pkgs.pythonPackages.python
+      ];
+    }
   ];
 
   networking.hostName = config.krebs.build.host.name;
-- 
cgit v1.2.3


From 670ec1e19f18072fc660417c02bbf2b96a7d3b28 Mon Sep 17 00:00:00 2001
From: lassulus <lass@lassul.us>
Date: Tue, 17 Jan 2017 15:14:13 +0100
Subject: l 2: set window title for bash

---
 lass/2configs/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'lass/2configs/default.nix')

diff --git a/lass/2configs/default.nix b/lass/2configs/default.nix
index 1cb68a98..24f3bd2d 100644
--- a/lass/2configs/default.nix
+++ b/lass/2configs/default.nix
@@ -162,13 +162,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
     '';
   };
-- 
cgit v1.2.3


From 4a21d12981e8edcd1f6ec0fd5214a62b72a2957c Mon Sep 17 00:00:00 2001
From: lassulus <lass@lassul.us>
Date: Tue, 17 Jan 2017 15:57:24 +0100
Subject: l 2: disable zsh

---
 lass/2configs/default.nix | 1 -
 1 file changed, 1 deletion(-)

(limited to 'lass/2configs/default.nix')

diff --git a/lass/2configs/default.nix b/lass/2configs/default.nix
index 24f3bd2d..033fdd44 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 =
-- 
cgit v1.2.3


From dce67d4a03cc9c9660a7a867d96b67c1de845222 Mon Sep 17 00:00:00 2001
From: lassulus <lass@lassul.us>
Date: Tue, 17 Jan 2017 15:57:38 +0100
Subject: l 2: show shell PID in window title

---
 lass/2configs/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'lass/2configs/default.nix')

diff --git a/lass/2configs/default.nix b/lass/2configs/default.nix
index 033fdd44..63114cdb 100644
--- a/lass/2configs/default.nix
+++ b/lass/2configs/default.nix
@@ -161,17 +161,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"'
+        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"'
+        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"'
+        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"'
+        PROMPT_COMMAND='echo -ne "\033]0;$$ $HOSTNAME $USER@$PWD\007"'
       fi
     '';
   };
-- 
cgit v1.2.3


From 6b910af11a4dabdc9685f72a073b0e2a57c1e5b8 Mon Sep 17 00:00:00 2001
From: lassulus <lass@lassul.us>
Date: Sat, 21 Jan 2017 23:51:24 +0100
Subject: l 2: remove broken tmpfs option

with this option enabled /tmp was not mounted on boot
---
 lass/2configs/default.nix | 2 --
 1 file changed, 2 deletions(-)

(limited to 'lass/2configs/default.nix')

diff --git a/lass/2configs/default.nix b/lass/2configs/default.nix
index 63114cdb..911b7738 100644
--- a/lass/2configs/default.nix
+++ b/lass/2configs/default.nix
@@ -91,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 - -"
   ];
-- 
cgit v1.2.3