Config updates

.config/alacritty/alacritty.yml

@@ -30,7 +30,7 @@ font:
     style: Italic
 
   # Point size of the font
-  size: 11.0
+  size: 16.0
   # Offset is the extra space around each character. offset.y can be thought of
   # as modifying the linespacing, and offset.x as modifying the letter spacing.
   offset:
@@ -41,61 +41,62 @@ font:
 render_timer: false
 
 # Colors (Tomorrow Night Bright)
-colors:
-  # Default colors
-  primary:
-    background: '0xfafafa'
-    foreground: '0x1d1d1c'
-
-  # Normal colors
-  normal:
-    black:   '0x212121'
-    red:     '0xb7141e'
-    green:   '0x457b23'
-    yellow:  '0xfc7b08'
-    blue:    '0x134eb2'
-    magenta: '0x550087'
-    cyan:    '0x0e707c'
-    white:   '0xeeeeee'
-
-  # Bright colors
-  bright:
-    black:   '0x424242'
-    red:     '0xe83a3f'
-    green:   '0x7aba39'
-    yellow:  '0xfc8e08'
-    blue:    '0x53a4f3'
-    magenta: '0xa94dbb'
-    cyan:    '0x26bad1'
-    white:   '0xd8d8d8'
-# Colors (Solarized Dark)
 # colors:
 #   # Default colors
 #   primary:
-#     background: '0x002b36'
+#     background: '0xfafafa'
-#     foreground: '0x839496'
+#     foreground: '0x1d1d1c'
 #
 #   # Normal colors
 #   normal:
-#     black:   '0x073642'
+#     black:   '0x212121'
-#     red:     '0xdc322f'
+#     red:     '0xb7141e'
-#     green:   '0x859900'
+#     green:   '0x457b23'
-#     yellow:  '0xb58900'
+#     yellow:  '0xfc7b08'
-#     blue:    '0x268bd2'
+#     blue:    '0x134eb2'
-#     magenta: '0xd33682'
+#     magenta: '0x550087'
-#     cyan:    '0x2aa198'
+#     cyan:    '0x0e707c'
-#     white:   '0xeee8d5'
+#     white:   '0xeeeeee'
 #
 #   # Bright colors
 #   bright:
-#     black:   '0x002b36'
+#     black:   '0x424242'
-#     red:     '0xcb4b16'
+#     red:     '0xe83a3f'
-#     green:   '0x586e75'
+#     green:   '0x7aba39'
-#     yellow:  '0x657b83'
+#     yellow:  '0xfc8e08'
-#     blue:    '0x839496'
+#     blue:    '0x53a4f3'
-#     magenta: '0x6c71c4'
+#     magenta: '0xa94dbb'
-#     cyan:    '0x93a1a1'
+#     cyan:    '0x26bad1'
-#     white:   '0xfdf6e3'
+#     white:   '0xd8d8d8'
+
+# Colors (Solarized Dark)
+colors:
+  # Default colors
+  primary:
+    background: '0x002b36'
+    foreground: '0x839496'
+
+  # Normal colors
+  normal:
+    black:   '0x073642'
+    red:     '0xdc322f'
+    green:   '0x859900'
+    yellow:  '0xb58900'
+    blue:    '0x268bd2'
+    magenta: '0xd33682'
+    cyan:    '0x2aa198'
+    white:   '0xeee8d5'
+
+  # Bright colors
+  bright:
+    black:   '0x002b36'
+    red:     '0xcb4b16'
+    green:   '0x586e75'
+    yellow:  '0x657b83'
+    blue:    '0x839496'
+    magenta: '0x6c71c4'
+    cyan:    '0x93a1a1'
+    white:   '0xfdf6e3'
 
 # Key bindings
 #

.config/nvim/init.vim

@@ -1,37 +1,46 @@
 "" Vundle
-set rtp+=~/.vim/bundle/Vundle.vim
+" set rtp+=~/.vim/bundle/Vundle.vim
-call vundle#begin()
+call plug#begin('~/.local/share/nvim/plugged')
 
 " Plugins
-Plugin 'VundleVim/Vundle.vim'
+Plug 'VundleVim/Vundle.vim'
-Plugin 'airblade/vim-gitgutter'
+Plug 'airblade/vim-gitgutter'
-Plugin 'b4b4r07/vim-hcl'
+Plug 'b4b4r07/vim-hcl'
-Plugin 'cespare/vim-toml'
+Plug 'cespare/vim-toml'
-Plugin 'chriskempson/base16-vim'
+Plug 'djoshea/vim-autoread'
-Plugin 'ervandew/supertab'
+Plug 'ervandew/supertab'
-Plugin 'fatih/vim-go'
+Plug 'fatih/vim-go'
-Plugin 'godlygeek/tabular'
+Plug 'godlygeek/tabular'
-Plugin 'hashivim/vim-terraform'
+Plug 'hashivim/vim-terraform'
-Plugin 'itchyny/lightline.vim'
+Plug 'junegunn/vim-easy-align'
-Plugin 'joshdick/onedark.vim'
+Plug 'junegunn/fzf'
-Plugin 'junegunn/fzf'
+Plug 'junegunn/fzf.vim'
-Plugin 'junegunn/fzf.vim'
+Plug 'junegunn/goyo.vim'
-Plugin 'Matt-Deacalion/vim-systemd-syntax'
+Plug 'junegunn/gv.vim'
-Plugin 'nanotech/jellybeans.vim'
+Plug 'junegunn/vim-peekaboo'
-Plugin 'NLKNguyen/papercolor-theme'
+Plug 'Matt-Deacalion/vim-systemd-syntax'
-Plugin 'plasticboy/vim-markdown'
+Plug 'NLKNguyen/papercolor-theme'
-Plugin 'rakr/vim-one'
+Plug 'plasticboy/vim-markdown'
-Plugin 'rust-lang/rust.vim'
+Plug 'rakr/vim-one'
-Plugin 'tomtom/tcomment_vim'
+Plug 'roxma/nvim-completion-manager'
-Plugin 'tpope/vim-fugitive'
+Plug 'rust-lang/rust.vim'
-Plugin 'tyrannicaltoucan/vim-quantum'
+Plug 'sebdah/vim-delve'
-Plugin 'Valloric/YouCompleteMe'
+" Plug 'Shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins' }
-Plugin 'w0rp/ale'
+Plug 'Shougo/neosnippet.vim'
+Plug 'Shougo/neosnippet-snippets'
+Plug 'tomtom/tcomment_vim'
+Plug 'tpope/vim-fugitive'
+Plug 'tyrannicaltoucan/vim-quantum'
+Plug 'vim-airline/vim-airline'
+Plug 'vim-airline/vim-airline-themes'
+Plug 'w0rp/ale'
 
-call vundle#end()
+call plug#end()
 
-set timeoutlen=250
+set ttimeout
-set ttimeoutlen=200
+set ttimeoutlen=0
+" set timeoutlen=150
+" set ttimeoutlen=100
 
 filetype on " detect the type of file
 filetype plugin indent on " load filetype plugins
@@ -92,6 +101,9 @@ set wildmenu
 set wildmode=list:longest
 set wildignore=*.swp,*.bak,*.pyc,*.class
 set splitbelow " Preview window
+set splitright
+
+" let mapleader=","
 
 "" Session
 let g:session_autosave = 'no'
@@ -165,7 +177,7 @@ map <silent> ,; :Commits<cr>
 map <silent> ,e :GitFiles<cr>
 map <silent> ,d :Files<cr>
 map <silent> ,f :History<cr>
-map <silent> ,g :BLines<cr>
+" map <silent> ,g :BLines<cr>
 map <silent> ,/ :Ag<cr>
 map <silent> ,m :Marks<cr>
 
@@ -325,7 +337,7 @@ map ,h :echo "hi<" . synIDattr(synID(line("."),col("."),1),"name") . '> trans<'
 \ . synIDattr(synID(line("."),col("."),0),"name") . "> lo<"
 \ . synIDattr(synIDtrans(synID(line("."),col("."),1)),"name") . ">"<CR>
 
-set background=light
+set background=dark
 let g:one_allow_italics=1
 let g:PaperColor_Light_Override = { 'Background' : '#fefe00' }
 
@@ -406,34 +418,61 @@ function! LightLineReadonly()
   return &ft !~? 'help' && &readonly ? '' : ''
 endfunction
 
-set statusline+=%#warningmsg#
+" set statusline+=%#warningmsg#
-set statusline+=%{SyntasticStatuslineFlag()}
+" set statusline+=%{SyntasticStatuslineFlag()}
-set statusline+=%*
+" set statusline+=%*
 
 " Golang
-let g:go_highlight_functions = 1
-let g:go_highlight_methods = 1
-let g:go_highlight_structs = 1
-let g:go_highlight_fields = 1
-let g:go_highlight_interfaces = 1
-let g:go_highlight_operators = 1
-let g:go_highlight_types = 1
 let g:go_highlight_build_constraints = 1  
+let g:go_highlight_extra_types = 1
+let g:go_highlight_fields = 1
+let g:go_highlight_functions = 1
+let g:go_highlight_interfaces = 1
+let g:go_highlight_methods = 1
+let g:go_highlight_operators = 1
+let g:go_highlight_structs = 1
+let g:go_highlight_types = 1
 let g:go_auto_sameids = 1
 let g:go_auto_type_info = 0
+" let g:go_def_mapping_enabled = 0
 let g:go_info_mode = 'guru'
-let g:go_updatetime = 500
+let g:go_updatetime = 20
+let g:go_snippet_engine = "neosnippet"
+
+autocmd FileType go nmap <Leader>i <Plug>(go-info)
+autocmd FileType go nmap <S-k> <Plug>(go-doc)
+autocmd FileType go nmap <Leader>d <Plug>(go-doc-vertical)
+
 
 " ALE
 let g:ale_sign_column_always = 1
 " let g:ale_linters = {'go': ['gometalinter', 'gofmt']}
-let g:ale_linters = {'go': ['go build', 'gofmt', 'golint', 'gometalinter', 'gosimple', 'go vet', 'staticcheck']}
+" let g:ale_linters = {'go': ['go build', 'gofmt', 'golint', 'gometalinter', 'gosimple', 'go vet', 'staticcheck']}
+let g:ale_linters = {'go': ['gofmt', 'golint', 'gometalinter', 'gosimple', 'go vet', 'staticcheck']}
+let g:ale_sign_error = '⤫'
+let g:ale_sign_warning = '⚠'
+let g:airline#extensions#ale#enabled = 1
 
+"" Neosnippet
+" imap <C-k>     <Plug>(neosnippet_expand_or_jump)
+" smap <C-k>     <Plug>(neosnippet_expand_or_jump)
+" xmap <C-k>     <Plug>(neosnippet_expand_target)
+" imap <expr> <CR>  (pumvisible() ?  "\<c-y>\<Plug>(expand_or_nl)" : "\<CR>")
+" imap <expr> <Plug>(expand_or_nl) (cm#completed_is_snippet() ? "\<C-k>":"\<CR>")
+"
+imap <c-j>     <Plug>(neosnippet_expand_or_jump)
+vmap <c-j>     <Plug>(neosnippet_expand_or_jump)
+inoremap <silent> <c-u> <c-r>=cm#sources#neosnippet#trigger_or_popup("\<Plug>(neosnippet_expand_or_jump)")<cr>
+vmap <c-u>     <Plug>(neosnippet_expand_target)
+" expand parameters
+let g:neosnippet#enable_completed_snippet=1
 
 " Hugo
 let g:vim_markdown_frontmatter = 1
 let g:vim_markdown_toml_frontmatter = 1
 
+
+"" Git
 let g:gitgutter_override_sign_column_highlight = 0
 let g:gitgutter_sign_added = '🞥'
 let g:gitgutter_sign_modified = '▲'
@@ -441,16 +480,19 @@ let g:gitgutter_sign_removed = '🞬'
 let g:gitgutter_sign_removed_first_line = '🞬'
 let g:gitgutter_sign_modified_removed = '🞬'
 
+"" Airline
+" let g:airline#extensions#tabline#enabled = 1
+let g:airline_theme='distinguished'
+
+"" Terminal
+
 let $NVIM_TUI_ENABLE_TRUE_COLOR=1
 set termguicolors
 let &t_8f = "<Esc>[38;2;%lu;%lu;%lum"
 let &t_8b = "<Esc>[48;2;%lu;%lu;%lum"
-" let base16colorspace=256
 
 " color dln-light
-" color jellybeans
+color dln-dark
-" color one
-color base16-tomorrow
 
 " highlight LineNr ctermfg=31 ctermbg=234 cterm=italic
 " highlight CursorLine ctermfg=159 ctermbg=24
@@ -462,5 +504,5 @@ highlight GitGutterChange ctermbg=234 ctermfg=220
 highlight GitGutterDelete ctermbg=234 ctermfg=124
 highlight GitGutterChangeDelete ctermbg=234 ctermfg=88
 
-map ,m :color dln<CR>
+map ,l :color dln-dark<CR>
 

.config/redshift.conf

@@ -1,8 +1,8 @@
 [redshift]
-temp-day=5800
+temp-day=3900
-temp-night=3700
+temp-night=3400
 brightness-day=0.99
-brightness-night=0.5
+brightness-night=0.95
 location-provider=manual
 transition=0
 

.gitconfig

@@ -135,3 +135,4 @@ diff-chunk = magenta default bold
 	stripLeadingSymbols = true
 [hub]
 	protocol = git
+[http]

.oh-my-zsh

@@ -1 +1 @@
-Subproject commit d848c94804918138375041a9f800f401bec12068
+Subproject commit e273cf004e1ff0510aee61416885f3003bcd15d9

.tmux.conf

@@ -33,6 +33,7 @@ set -g set-titles-string "###I : #T"
 #set -g set-titles-string '#H:#S.#I.#P #W #T' # window number,program name, active(or not)
 
 # Key bindings
+bind -n M-Tab last-pane
 bind -n M-1 select-window -t 1
 bind -n M-- select-window -t 2
 bind -n M-2 select-window -t 2
@@ -70,9 +71,10 @@ bind C-s set-option -g status
 bind s split-window -h
 bind S split-window -v
 bind q kill-pane
-bind Tab select-pane -D
+bind Tab last-pane
 bind C-p select-pane -U
 bind K confirm kill-server
+bind C-k clear-history
 
 # Colors (MonoLight)
 set -g status-fg "#cccccc"
@@ -118,6 +120,6 @@ selectw -t 1
 
 run-shell ~/src/github.com/tmux-plugins/tmux-battery/battery.tmux
 
-source /usr/lib/python3.6/site-packages/powerline/bindings/tmux/powerline.conf
+# source /usr/lib/python3.6/site-packages/powerline/bindings/tmux/powerline.conf
 
 # vim:set ft=tmux:

.xinitrc

@@ -7,7 +7,7 @@ if [ -d /etc/X11/xinit/xinitrc.d ] ; then
 fi
 
 . $HOME/.bashrc
-xsetroot -solid \#78909C
+xsetroot -solid \#202020
 xmodmap $HOME/.Xmodmap
 feh --bg-fill $HOME/Images/desktop.jpg || true
 setxkbmap -option ctrl:nocaps,grp:switch,grp_led:scroll us,se

.zshrc

@@ -2,7 +2,7 @@
 # export PATH=$HOME/bin:/usr/local/bin:$PATH
 
 # Path to your oh-my-zsh installation.
-  export ZSH=/home/dln/.oh-my-zsh
+  # export ZSH=/home/dln/.oh-my-zsh
 
 # Set name of the theme to load. Optionally, if you set this to "random"
 # it'll load a random theme each time that oh-my-zsh is loaded.
@@ -51,11 +51,64 @@ ZSH_THEME="robbyrussell"
 # Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/
 # Example format: plugins=(rails git textmate ruby lighthouse)
 # Add wisely, as too many plugins slow down shell startup.
-plugins=(git git-extras history-substring-search)
+# plugins=(git git-extras history-substring-search vault)
+#
+# source $ZSH/oh-my-zsh.sh
+# source ~/.oh-my-zsh/plugins/zsh-titles/titles.plugin.zsh
 
-source $ZSH/oh-my-zsh.sh
+source "${HOME}/.zgen/zgen.zsh"
 
-source ~/.oh-my-zsh/plugins/zsh-titles/titles.plugin.zsh
+function short_pwd {
+  echo $PWD | sed "s:${HOME}:~:" | sed "s:/\(.\)[^/]*:/\1:g" | sed "s:/[^/]*$:/$(basename $PWD):"
+}
+
+function _dln_prompt_left {
+  _pw="$(short_pwd)"
+  echo -e "%{\e[38;5;246m%}$_pw "
+}
+
+function _dln_prompt_right {
+  _tmux_win=`tmux display-message -p "#I"`
+  echo -e " %{\e[38;5;16;48;5;30m%} ${_tmux_win} %{\e[0m%}"
+}
+
+export PROMPT_LEAN_COLOR1=78
+export PROMPT_LEAN_COLOR2=67
+export PROMPT_LEAN_TMUX=''
+export PROMPT_LEAN_PATH_PERCENT=50
+export PROMPT_LEAN_LEFT=_dln_prompt_left
+# export PROMPT_LEAN_RIGHT=_dln_prompt_right
+
+# if the init scipt doesn't exist
+if ! zgen saved; then
+
+  zgen oh-my-zsh
+  zgen oh-my-zsh plugins/command-not-found
+  zgen oh-my-zsh plugins/git
+  zgen oh-my-zsh plugins/git-extras
+  zgen oh-my-zsh plugins/history-substring-search
+
+  zgen load uvaes/fzf-marks
+  zgen load miekg/lean
+
+  zgen save
+fi
+
+function prompt_command {
+  banner="$USER@$HOST"
+  ((prompt_x = $(tput cols) - $(expr length ${banner}) - 3))
+  tput sc
+  tput cup 0 ${prompt_x}
+  if [ "$USER" = "root" ]; then
+    echo -ne " \e[38;5;228;48;5;160m ${banner} \e[0m"
+  else
+    echo -ne " \e[38;5;195;48;5;33m ${banner} \e[0m"
+  fi
+  tput rc
+  #tmux rename-window `basename $PWD`
+  tmux rename-window $(short_pwd) 2>/dev/null
+  eval $(tmux switch-client \; show-environment -s 2>/dev/null)
+}
 
 # User configuration
 
@@ -101,22 +154,34 @@ cd_func ()
 }
 alias cd=cd_func
 
+## vim
+export NVIM_LISTEN_ADDRESS=/tmp/nvimsocket
+
+e ()
+{
+  tmux select-window -t1 
+  nvr --remote $(readlink -f "$@")
+}
 
 ## Powerline
-. /usr/lib/python3.6/site-packages/powerline/bindings/zsh/powerline.zsh
+# . /usr/lib/python3.6/site-packages/powerline/bindings/zsh/powerline.zsh
 
 ## fzf
 export FZF_TMUX=1
-export FZF_COMPLETION_TRIGGER="."
+export FZF_COMPLETION_TRIGGER=";"
 . /usr/share/fzf/completion.zsh
 . /usr/share/fzf/key-bindings.zsh
 
 # Kubernetes
-source <(kubectl completion zsh)
+command -v kubectl >/dev/null 2>&1 && source <(kubectl completion zsh)
-[ -f $HOME/bin/kops ] && source <($HOME/bin/kops completion zsh)
+command -v kops >/dev/null 2>&1 && source <(kops completion zsh)
+command -v helm >/dev/null 2>&1 && source <(helm completion zsh)
 
 [ -f /opt/google-cloud-sdk/completion.zsh.inc ] && source /opt/google-cloud-sdk/completion.zsh.inc
 
+# Pager
+command -v pygmentize >/dev/null 2>&1 && export LESSOPEN="|/usr/bin/pygmentize -f terminal16m -O style=native %s"
+
 ## Aliases
 alias ag='ag --pager less'
 alias cdiff='colordiff -u'
@@ -131,6 +196,8 @@ alias tree='tree -C'
 alias upper="tr '[:lower:]' '[:upper:]'"
 alias vimdiff='vimdiff -R'
 alias vim=nvim
+alias xc='xclip -selection clipboard'
+# alias e='nvr --remote'
 
 
 

bin/st

@@ -0,0 +1 @@
+st.dark