From 97ea55df7d86700c27f465f7cf0e831be9e2832c Mon Sep 17 00:00:00 2001
From: Daniel Lundin <daniel@arity.se>
Date: Sun, 3 Jan 2021 13:16:07 +0100
Subject: [PATCH] updates

---
 .config/nvim/init.vim      | 4 ++--
 .config/starship-tmux.toml | 6 ++++++
 .gitconfig                 | 7 +++++--
 .tmux.conf                 | 1 +
 .vault                     | 3 ++-
 .zshrc                     | 9 +++++++++
 6 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
index b2ad1b7..ec96d3d 100644
--- a/.config/nvim/init.vim
+++ b/.config/nvim/init.vim
@@ -192,8 +192,8 @@ let g:explDetailedHelp=1
 "" Backup
 set backup
 set backupcopy=yes
-set backupdir=~/tmp,/var/tmp,/tmp"
-set directory=~/tmp,/var/tmp,/tmp"
+set backupdir=~/tmp/nvim/,~/tmp,/var/tmp,/tmp"
+set directory=~/tmp/nvim/,~/tmp,/var/tmp,/tmp"
 let myvar = strftime("%y%m%d-%H%M")
 let myvar = "set backupext=_". myvar
 execute myvar
diff --git a/.config/starship-tmux.toml b/.config/starship-tmux.toml
index d943c77..97a5f6a 100644
--- a/.config/starship-tmux.toml
+++ b/.config/starship-tmux.toml
@@ -5,6 +5,7 @@ $status\
 $cmd_duration\
 $jobs\
 $kubernetes\
+$gcloud\
 """
 # $git_branch\
 # $git_commit\
@@ -69,6 +70,11 @@ truncation_length = 1
 truncate_to_repo = false
 style = "bold"
 
+[gcloud]
+# format = "☁$active"
+format = '#\[fg=#212121\]▕#\[bg=#0D47A1,fg=#80DEEA\] ☁$active'
+style = ""
+
 [git_branch]
 format = '#\[fg=#212121]\▕#\[bg=green,fg=#f7f7f7\] $symbol$branch '
 style = ""
diff --git a/.gitconfig b/.gitconfig
index d3a16cd..8be291c 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,7 +1,6 @@
 [core]
 excludesfile = "~/.gitignore"
-editor = nvim
-pager = delta
+	pager = delta --line-numbers -s
 
 [user]
 useConfigOnly = true
@@ -27,6 +26,10 @@ co = checkout
 st = status -sb
 pullr = pull --rebase
 wc = whatchanged --abbrev-commit --date=relative --date-order --pretty='format:%Cgreen%h %Cblue%ar %Credby %an%Creset -- %s' -n 45
+f = fuzzy status
+fd = fuzzy diff
+fl = fuzzy log
+fs = fuzzy status
 
 ll = log --graph --date=relative --topo-order --pretty='format:%C(yellow)%h%C(yellow)%d %Cblue%ar %Cgreenby %an%Creset -- %s'
 lla = log --graph --date=relative --topo-order --pretty='format:%Cgreen%h %Cblue%ar %Credby %an%Creset -- %s' --all
diff --git a/.tmux.conf b/.tmux.conf
index 0ca52f6..67a26fd 100644
--- a/.tmux.conf
+++ b/.tmux.conf
@@ -45,6 +45,7 @@ bind -n M-0 select-window -t 10
 bind -n M-m send-keys -t 9 q C-u "clear; tmux clear-history -t 9" C-m C-p C-p C-p C-m
 bind -n M-` last-window
 bind C-o last-window
+bind o send-keys C-o
 bind r source-file ~/.tmux.conf
 bind -n C-Right next-window
 bind -n C-Left previous-window
diff --git a/.vault b/.vault
index dae0c95..025a5fb 100644
--- a/.vault
+++ b/.vault
@@ -1 +1,2 @@
-token_helper = "/home/dln/bin/vault-token-helper"
\ No newline at end of file
+token_helper = "/home/dln/bin/vault-token-helper"
+
diff --git a/.zshrc b/.zshrc
index ee3efa9..2337255 100644
--- a/.zshrc
+++ b/.zshrc
@@ -123,6 +123,10 @@ alias ve='env EDITOR= vgrep -s'
 alias xc='xclip -selection clipboard'
 
 
+if [[ "$HOST" ==  "porky" ]]; then
+  alias ssh="env TERM=xterm-256color ssh"
+fi
+
 ## vim
 export EDITOR=nvim
 export NVIM_LISTEN_ADDRESS=/tmp/nvimsocket
@@ -152,6 +156,11 @@ export FLUX_FORWARD_NAMESPACE=flux
 
 ## Google Cloud
 [ -f /opt/google-cloud-sdk/completion.zsh.inc ] && source /opt/google-cloud-sdk/completion.zsh.inc
+alias gcloud="env TERM=xterm-256color gcloud"
+
+# hack until gcloud works with python 3.9
+export CLOUDSDK_PYTHON=python2
+
 
 ## Golang
 export PATH=$HOME/go/bin:$PATH