Merge branch 'master' of sleepmap.de:config/dotfiles

* 'master' of sleepmap.de:config/dotfiles:
  .ssh/config: Adding hosts apu-access, apu-serve, dvzrv. Fixing User name declaration. Fixing too unspecific ProxyCommand.
  .zsh.before/path.zsh: Adding pyenv python versions to path if available.
  .zsh.after/export.zsh: Expanding check for and setting of locale settings to very special whackOS settings. Exporting pipenv settings to expose them globally. Exporting TTY to GPG_TTY instead of calling tty everytime.
  .gitignore: Adding whackOS specific ignores.

4 files changed, 75 insertions, 15 deletions

diff --git a/.gitignore b/.gitignore
index 1564036..8eb3308 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@
 # Files that might appear on external disk
 .Spotlight-V100
 .Trashes
+.Trash/
 
 # Windows   taken from: https://github.com/github/gitignore/blob/master/Global/Windows.gitignore
 # ----------------------------------------------------------------------------------------------
@@ -33,12 +34,15 @@ Session.vim
 
 # Files/folders that appear in my home
 # ----------------------------------------------------------------------------------------------
+Applications/
 Desktop/
 Documents/
 Downloads/
 Mail/
+Movies/
 Music/
 Pictures/
+Public/
 Videos/
 backup/
 bin/pass2offlineimapc
diff --git a/.ssh/config b/.ssh/config
index 983447c..8978c42 100644
--- a/.ssh/config
+++ b/.ssh/config
@@ -16,7 +16,7 @@ Host greblab
 Host gchristina
   Hostname christina
   Port 22
-  user dave
+  User dave
   ForwardAgent yes
   IdentityFile ~/.ssh/id_ed25519
   IdentitiesOnly yes
@@ -39,6 +39,17 @@ Host apu-access-unlock
   ControlMaster auto
   ControlPath ~/.ssh/socket-%r@%h:%p
 
+Host apu-access
+  HostName apu-access
+  Port 22
+  User dave
+  ServerAliveInterval 120
+  Compression yes
+  IdentityFile ~/.ssh/id_rsa
+  IdentitiesOnly yes
+  ControlMaster auto
+  ControlPath ~/.ssh/socket-%r@%h:%p
+
 Host apu-serve-unlock
   HostName apu-serve-unlock
   Port 22
@@ -50,6 +61,28 @@ Host apu-serve-unlock
   ControlMaster auto
   ControlPath ~/.ssh/socket-%r@%h:%p
 
+Host apu-serve
+  HostName apu-serve
+  Port 22
+  User dave
+  ServerAliveInterval 120
+  Compression yes
+  IdentityFile ~/.ssh/id_ed25519
+  IdentitiesOnly yes
+  ControlMaster auto
+  ControlPath ~/.ssh/socket-%r@%h:%p
+
+Host dvzrv
+  HostName dvzrv
+  Port 22
+  User dave
+  ServerAliveInterval 120
+  Compression yes
+  IdentityFile ~/.ssh/id_ed25519
+  IdentitiesOnly yes
+  ControlMaster auto
+  ControlPath ~/.ssh/socket-%r@%h:%p
+
 Host pitheunlord
   HostName pitheunlord
   Port 22
@@ -79,7 +112,7 @@ Host gpitheunlord
 Host gdvzrv
   Hostname dvzrv
   Port 22
-  user dave
+  User dave
   ForwardAgent yes
   IdentityFile ~/.ssh/id_ed25519
   IdentitiesOnly yes
@@ -88,12 +121,12 @@ Host gdvzrv
   ForwardX11Trusted yes
   ControlMaster auto
   ControlPath ~/.ssh/socket-%r@%h:%p
-  ProxyCommand ssh sleepmap.de -W %h:%p
+  ProxyCommand ssh dave@sleepmap.de -W %h:%p
 
 Host gtrvlr
   Hostname trvlr
   Port 22
-  user dave
+  User dave
   ForwardAgent yes
   IdentityFile ~/.ssh/id_ed25519
   IdentitiesOnly yes
@@ -107,7 +140,7 @@ Host gtrvlr
 Host gpitheunlord
   Hostname pitheunlord
   Port 22
-  user dave
+  User dave
   ForwardAgent yes
   IdentityFile ~/.ssh/id_ed25519
   IdentitiesOnly yes
@@ -136,7 +169,7 @@ Host bicrophone
 Host marx
   Hostname marx
   Port 22
-  user dave
+  User dave
   ForwardAgent yes
   IdentityFile ~/.ssh/id_ed25519
   IdentitiesOnly yes
@@ -150,7 +183,7 @@ Host marx
 Host aktpi
   Hostname aktpi
   Port 22
-  user dave
+  User dave
   ForwardAgent yes
   IdentityFile ~/.ssh/id_ed25519
   IdentitiesOnly yes
diff --git a/.zsh.after/export.zsh b/.zsh.after/export.zsh
index 54d78ab..89ba7dc 100644
--- a/.zsh.after/export.zsh
+++ b/.zsh.after/export.zsh
@@ -8,15 +8,26 @@ fi
 
 
 available_locale=$(locale -a|tr '\n' ' ')
-if test "${available_locale#*en_DK.utf8}" != $available_locale; then
+if [ "${available_locale#*en_DK.utf8}" != "$available_locale" ]; then
+    export LC_TIME="en_DK.UTF-8"
+elif [ "${available_locale#*en_DK.UTF-8}" != "$available_locale" ]; then
     export LC_TIME="en_DK.UTF-8"
 fi
-if test "${available_locale#*de_DE.utf8}" != $available_locale; then
+if [ "${available_locale#*de_DE.utf8}" != "$available_locale" ]; then
+    export LC_MONETARY="de_DE.UTF-8"
+elif [ "${available_locale#*de_DE.UTF-8}" != "$available_locale" ]; then
     export LC_MONETARY="de_DE.UTF-8"
 fi
-if test "${available_locale#*en_US.utf8}" != $available_locale; then
+if [ "${available_locale#*en_US.utf8}" != "$available_locale" ]; then
+    export LANG="en_US.UTF-8"
+elif [ "${available_locale#*en_US.UTF-8}" != "$available_locale" ]; then
     export LANG="en_US.UTF-8"
 fi
+if [ "${available_locale#*en_US.utf8}" != "$available_locale" ] ; then
+    export LC_CTYPE="en_US.UTF-8"
+elif [ "${available_locale#*en_US.UTF-8}" != "$available_locale" ]; then
+    export LC_CTYPE="en_US.UTF-8"
+fi
 
 # keyboard exports for sway
 export XKB_DEFAULT_LAYOUT=de
@@ -49,8 +60,18 @@ export _JAVA_OPTIONS='-Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndF
 # non-reparenting windows
 export _JAVA_AWT_WM_NONREPARENTING=1
 
+# pipenv environment variables:
+# - disabling fancy shell stuff
+# - creating virtualenv within each project
+# - moving cache dir to build volume
+export PIPENV_NOSPIN="true"
+export PIPENV_COLORBLIND="true"
+export PIPENV_HIDE_EMOJIS="true"
+export PIPENV_VENV_IN_PROJECT="true"
+#export PIPENV_CACHE_DIR="$HOME/.cache/pipenv"
+
 # GnuPG
-export GPG_TTY=$(tty)
+export GPG_TTY=$TTY
 export GPG_AGENT_INFO=""
 
 # ssh-agent
diff --git a/.zsh.before/path.zsh b/.zsh.before/path.zsh
index 52238b3..146943d 100644
--- a/.zsh.before/path.zsh
+++ b/.zsh.before/path.zsh
@@ -1,7 +1,6 @@
-# Prepend $HOME/bin and append /usr/sbin to PATH (for Debilian)
-PATH="$HOME/bin:$PATH:/usr/sbin"
-if [[ -d "$HOME/.pyenv/shims" ]]; then
-  PATH="$HOME/.pyenv/shims:$PATH"
+# prepend pyenv based python, in case there's any
+if [ -d "$HOME/.local/bin" ] && [ -d "$HOME/.pyenv/shims" ]; then
+  PATH="$HOME/.local/bin:$HOME/.pyenv/shims:$PATH"
 fi
 
 ## RASPBERRY PI
@@ -9,3 +8,6 @@ if [[ "$HOST" == *pitheunlord* ]]; then
   PATH=$PATH:"/opt/vc/bin:/opt/vc/sbin"
 fi
 
+# Prepend $HOME/bin and append /usr/sbin to PATH (for Debilian)
+PATH="$HOME/bin:$PATH:/usr/sbin"
+