updates
This commit is contained in:
parent
2112edc40b
commit
97ea55df7d
6 changed files with 25 additions and 5 deletions
|
@ -192,8 +192,8 @@ let g:explDetailedHelp=1
|
||||||
"" Backup
|
"" Backup
|
||||||
set backup
|
set backup
|
||||||
set backupcopy=yes
|
set backupcopy=yes
|
||||||
set backupdir=~/tmp,/var/tmp,/tmp"
|
set backupdir=~/tmp/nvim/,~/tmp,/var/tmp,/tmp"
|
||||||
set directory=~/tmp,/var/tmp,/tmp"
|
set directory=~/tmp/nvim/,~/tmp,/var/tmp,/tmp"
|
||||||
let myvar = strftime("%y%m%d-%H%M")
|
let myvar = strftime("%y%m%d-%H%M")
|
||||||
let myvar = "set backupext=_". myvar
|
let myvar = "set backupext=_". myvar
|
||||||
execute myvar
|
execute myvar
|
||||||
|
|
|
@ -5,6 +5,7 @@ $status\
|
||||||
$cmd_duration\
|
$cmd_duration\
|
||||||
$jobs\
|
$jobs\
|
||||||
$kubernetes\
|
$kubernetes\
|
||||||
|
$gcloud\
|
||||||
"""
|
"""
|
||||||
# $git_branch\
|
# $git_branch\
|
||||||
# $git_commit\
|
# $git_commit\
|
||||||
|
@ -69,6 +70,11 @@ truncation_length = 1
|
||||||
truncate_to_repo = false
|
truncate_to_repo = false
|
||||||
style = "bold"
|
style = "bold"
|
||||||
|
|
||||||
|
[gcloud]
|
||||||
|
# format = "☁$active"
|
||||||
|
format = '#\[fg=#212121\]▕#\[bg=#0D47A1,fg=#80DEEA\] ☁$active'
|
||||||
|
style = ""
|
||||||
|
|
||||||
[git_branch]
|
[git_branch]
|
||||||
format = '#\[fg=#212121]\▕#\[bg=green,fg=#f7f7f7\] $symbol$branch '
|
format = '#\[fg=#212121]\▕#\[bg=green,fg=#f7f7f7\] $symbol$branch '
|
||||||
style = ""
|
style = ""
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
[core]
|
[core]
|
||||||
excludesfile = "~/.gitignore"
|
excludesfile = "~/.gitignore"
|
||||||
editor = nvim
|
pager = delta --line-numbers -s
|
||||||
pager = delta
|
|
||||||
|
|
||||||
[user]
|
[user]
|
||||||
useConfigOnly = true
|
useConfigOnly = true
|
||||||
|
@ -27,6 +26,10 @@ co = checkout
|
||||||
st = status -sb
|
st = status -sb
|
||||||
pullr = pull --rebase
|
pullr = pull --rebase
|
||||||
wc = whatchanged --abbrev-commit --date=relative --date-order --pretty='format:%Cgreen%h %Cblue%ar %Credby %an%Creset -- %s' -n 45
|
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'
|
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
|
lla = log --graph --date=relative --topo-order --pretty='format:%Cgreen%h %Cblue%ar %Credby %an%Creset -- %s' --all
|
||||||
|
|
|
@ -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-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 -n M-` last-window
|
||||||
bind C-o last-window
|
bind C-o last-window
|
||||||
|
bind o send-keys C-o
|
||||||
bind r source-file ~/.tmux.conf
|
bind r source-file ~/.tmux.conf
|
||||||
bind -n C-Right next-window
|
bind -n C-Right next-window
|
||||||
bind -n C-Left previous-window
|
bind -n C-Left previous-window
|
||||||
|
|
3
.vault
3
.vault
|
@ -1 +1,2 @@
|
||||||
token_helper = "/home/dln/bin/vault-token-helper"
|
token_helper = "/home/dln/bin/vault-token-helper"
|
||||||
|
|
||||||
|
|
9
.zshrc
9
.zshrc
|
@ -123,6 +123,10 @@ alias ve='env EDITOR= vgrep -s'
|
||||||
alias xc='xclip -selection clipboard'
|
alias xc='xclip -selection clipboard'
|
||||||
|
|
||||||
|
|
||||||
|
if [[ "$HOST" == "porky" ]]; then
|
||||||
|
alias ssh="env TERM=xterm-256color ssh"
|
||||||
|
fi
|
||||||
|
|
||||||
## vim
|
## vim
|
||||||
export EDITOR=nvim
|
export EDITOR=nvim
|
||||||
export NVIM_LISTEN_ADDRESS=/tmp/nvimsocket
|
export NVIM_LISTEN_ADDRESS=/tmp/nvimsocket
|
||||||
|
@ -152,6 +156,11 @@ export FLUX_FORWARD_NAMESPACE=flux
|
||||||
|
|
||||||
## Google Cloud
|
## Google Cloud
|
||||||
[ -f /opt/google-cloud-sdk/completion.zsh.inc ] && source /opt/google-cloud-sdk/completion.zsh.inc
|
[ -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
|
## Golang
|
||||||
export PATH=$HOME/go/bin:$PATH
|
export PATH=$HOME/go/bin:$PATH
|
||||||
|
|
Loading…
Reference in a new issue