Moving forward...
This commit is contained in:
parent
f2fe6c1578
commit
75d3e2cb9f
11 changed files with 47 additions and 38 deletions
|
@ -46,7 +46,6 @@ export GIT_COMMITTER_NAME=$GIT_AUTHOR_NAME
|
||||||
export GIT_PAGER='/usr/share/git/diff-highlight/diff-highlight | less -+F -x8 -nBJXRgiM -h512'
|
export GIT_PAGER='/usr/share/git/diff-highlight/diff-highlight | less -+F -x8 -nBJXRgiM -h512'
|
||||||
|
|
||||||
## Java
|
## Java
|
||||||
export JAVA_HOME=/usr/lib/jvm/java-8-oracle/
|
|
||||||
export IDEA_VM_OPTIONS="$HOME/Dropbox/dotfiles/idea.vmoptions"
|
export IDEA_VM_OPTIONS="$HOME/Dropbox/dotfiles/idea.vmoptions"
|
||||||
export IDEA_JDK=$HOME/lib/jdk-8u5-tuxjdk-b08
|
export IDEA_JDK=$HOME/lib/jdk-8u5-tuxjdk-b08
|
||||||
|
|
||||||
|
|
|
@ -79,7 +79,7 @@ font:
|
||||||
style: Italic
|
style: Italic
|
||||||
|
|
||||||
# Point size of the font
|
# Point size of the font
|
||||||
size: 18
|
size: 10
|
||||||
|
|
||||||
# Offset is the extra space around each character. offset.y can be thought of
|
# 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.
|
# as modifying the linespacing, and offset.x as modifying the letter spacing.
|
||||||
|
@ -234,12 +234,6 @@ cursor_style: Block
|
||||||
# Live config reload (changes require restart)
|
# Live config reload (changes require restart)
|
||||||
live_config_reload: true
|
live_config_reload: true
|
||||||
|
|
||||||
shell:
|
|
||||||
program: /bin/tmux
|
|
||||||
args:
|
|
||||||
- attach
|
|
||||||
- -t0
|
|
||||||
|
|
||||||
# Shell
|
# Shell
|
||||||
#
|
#
|
||||||
# You can set shell.program to the path of your favorite shell, e.g. /bin/fish.
|
# You can set shell.program to the path of your favorite shell, e.g. /bin/fish.
|
||||||
|
|
|
@ -6,11 +6,13 @@ call plug#begin('~/.local/share/nvim/plugged')
|
||||||
Plug 'VundleVim/Vundle.vim'
|
Plug 'VundleVim/Vundle.vim'
|
||||||
Plug 'airblade/vim-gitgutter'
|
Plug 'airblade/vim-gitgutter'
|
||||||
Plug 'b4b4r07/vim-hcl'
|
Plug 'b4b4r07/vim-hcl'
|
||||||
|
Plug 'bazelbuild/vim-bazel'
|
||||||
Plug 'cespare/vim-toml'
|
Plug 'cespare/vim-toml'
|
||||||
Plug 'djoshea/vim-autoread'
|
Plug 'djoshea/vim-autoread'
|
||||||
Plug 'ervandew/supertab'
|
Plug 'ervandew/supertab'
|
||||||
Plug 'fatih/vim-go'
|
Plug 'fatih/vim-go'
|
||||||
Plug 'godlygeek/tabular'
|
Plug 'godlygeek/tabular'
|
||||||
|
Plug 'google/vim-maktaba'
|
||||||
Plug 'hashivim/vim-terraform'
|
Plug 'hashivim/vim-terraform'
|
||||||
Plug 'jremmen/vim-ripgrep'
|
Plug 'jremmen/vim-ripgrep'
|
||||||
Plug 'junegunn/vim-easy-align'
|
Plug 'junegunn/vim-easy-align'
|
||||||
|
@ -23,20 +25,26 @@ Plug 'Matt-Deacalion/vim-systemd-syntax'
|
||||||
Plug 'NLKNguyen/papercolor-theme'
|
Plug 'NLKNguyen/papercolor-theme'
|
||||||
Plug 'plasticboy/vim-markdown'
|
Plug 'plasticboy/vim-markdown'
|
||||||
Plug 'rakr/vim-one'
|
Plug 'rakr/vim-one'
|
||||||
Plug 'roxma/nvim-completion-manager'
|
|
||||||
Plug 'rust-lang/rust.vim'
|
Plug 'rust-lang/rust.vim'
|
||||||
Plug 'sebdah/vim-delve'
|
Plug 'sebdah/vim-delve'
|
||||||
" Plug 'Shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins' }
|
|
||||||
Plug 'Shougo/neosnippet.vim'
|
Plug 'Shougo/neosnippet.vim'
|
||||||
Plug 'Shougo/neosnippet-snippets'
|
Plug 'Shougo/neosnippet-snippets'
|
||||||
Plug 'tomtom/tcomment_vim'
|
Plug 'tomtom/tcomment_vim'
|
||||||
Plug 'tpope/vim-fugitive'
|
Plug 'tpope/vim-fugitive'
|
||||||
Plug 'typeintandem/nvim'
|
|
||||||
Plug 'tyrannicaltoucan/vim-quantum'
|
Plug 'tyrannicaltoucan/vim-quantum'
|
||||||
Plug 'vim-airline/vim-airline'
|
Plug 'vim-airline/vim-airline'
|
||||||
Plug 'vim-airline/vim-airline-themes'
|
Plug 'vim-airline/vim-airline-themes'
|
||||||
Plug 'w0rp/ale'
|
Plug 'w0rp/ale'
|
||||||
|
|
||||||
|
" Autocomplete
|
||||||
|
Plug 'ncm2/ncm2'
|
||||||
|
Plug 'roxma/nvim-yarp'
|
||||||
|
Plug 'ncm2/ncm2-bufword'
|
||||||
|
Plug 'ncm2/ncm2-tmux'
|
||||||
|
Plug 'ncm2/ncm2-path'
|
||||||
|
Plug 'ncm2/ncm2-go'
|
||||||
|
Plug 'ncm2/ncm2-racer'
|
||||||
|
|
||||||
call plug#end()
|
call plug#end()
|
||||||
|
|
||||||
set ttimeout
|
set ttimeout
|
||||||
|
@ -229,6 +237,7 @@ au BufNewFile,BufRead manifest setlocal ft=json
|
||||||
au BufNewFile,BufRead *.aurora set filetype=python
|
au BufNewFile,BufRead *.aurora set filetype=python
|
||||||
au BufNewFile,BufRead *.avdl setlocal ft=avro-idl
|
au BufNewFile,BufRead *.avdl setlocal ft=avro-idl
|
||||||
au BufNewFile,BufRead *.avpr setlocal ft=json
|
au BufNewFile,BufRead *.avpr setlocal ft=json
|
||||||
|
au BufNewFile,BufRead *.bazel setlocal ft=bzl
|
||||||
au BufNewFile,BufRead *.cql set syntax=cql
|
au BufNewFile,BufRead *.cql set syntax=cql
|
||||||
au BufNewFile,BufRead *.go setlocal ft=go
|
au BufNewFile,BufRead *.go setlocal ft=go
|
||||||
au BufNewFile,BufRead *.g setlocal ft=antlr
|
au BufNewFile,BufRead *.g setlocal ft=antlr
|
||||||
|
@ -264,7 +273,6 @@ au FileType python
|
||||||
\ setlocal tabstop=4 softtabstop=4 shiftwidth=4 |
|
\ setlocal tabstop=4 softtabstop=4 shiftwidth=4 |
|
||||||
\ setlocal nosmartindent cinwords=if,elif,else,for,while,try,except,finally,def,class
|
\ setlocal nosmartindent cinwords=if,elif,else,for,while,try,except,finally,def,class
|
||||||
autocmd BufWritePre *.py normal m`:%s/\s\+$//e ``
|
autocmd BufWritePre *.py normal m`:%s/\s\+$//e ``
|
||||||
autocmd FileType python set omnifunc=pythoncomplete#Complete
|
|
||||||
|
|
||||||
" pydoc integration
|
" pydoc integration
|
||||||
let g:pydoc_highlight = 0
|
let g:pydoc_highlight = 0
|
||||||
|
@ -273,10 +281,9 @@ let g:pcs_check_when_saving = 0
|
||||||
let g:pymode_lint = 0
|
let g:pymode_lint = 0
|
||||||
let g:pymode_lint_checker = "pyflakes"
|
let g:pymode_lint_checker = "pyflakes"
|
||||||
|
|
||||||
|
" enable ncm2 for all buffers
|
||||||
" YouCompleteMe
|
autocmd BufEnter * call ncm2#enable_for_buffer()
|
||||||
set completefunc=youcompleteme#Complete
|
set completeopt=noinsert,menuone,noselect
|
||||||
set completeopt=preview,menuone
|
|
||||||
|
|
||||||
" tags
|
" tags
|
||||||
set tags=./tags;/
|
set tags=./tags;/
|
||||||
|
@ -458,7 +465,6 @@ autocmd FileType go nmap <Leader>i <Plug>(go-info)
|
||||||
autocmd FileType go nmap <S-k> <Plug>(go-doc)
|
autocmd FileType go nmap <S-k> <Plug>(go-doc)
|
||||||
autocmd FileType go nmap <Leader>d <Plug>(go-doc-vertical)
|
autocmd FileType go nmap <Leader>d <Plug>(go-doc-vertical)
|
||||||
|
|
||||||
|
|
||||||
" ALE
|
" ALE
|
||||||
let g:ale_sign_column_always = 1
|
let g:ale_sign_column_always = 1
|
||||||
" let g:ale_linters = {'go': ['gofmt']}
|
" let g:ale_linters = {'go': ['gofmt']}
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
[redshift]
|
[redshift]
|
||||||
temp-day=3900
|
temp-day=3900
|
||||||
temp-night=3400
|
temp-night=3000
|
||||||
brightness-day=0.99
|
brightness-day=0.99
|
||||||
brightness-night=0.95
|
brightness-night=0.75
|
||||||
location-provider=manual
|
location-provider=manual
|
||||||
transition=0
|
transition=0
|
||||||
|
|
||||||
|
|
|
@ -1,10 +0,0 @@
|
||||||
[Unit]
|
|
||||||
Description=Daemon that improves powerline performance
|
|
||||||
After=display-manager.service
|
|
||||||
|
|
||||||
[Service]
|
|
||||||
ExecStart=/usr/bin/powerline-daemon --foreground --replace
|
|
||||||
Restart=always
|
|
||||||
|
|
||||||
[Install]
|
|
||||||
WantedBy=default.target
|
|
|
@ -136,3 +136,10 @@ diff-chunk = magenta default bold
|
||||||
[hub]
|
[hub]
|
||||||
protocol = git
|
protocol = git
|
||||||
[http]
|
[http]
|
||||||
|
[http]
|
||||||
|
cookiefile = /home/dln/.gitcookies
|
||||||
|
[filter "lfs"]
|
||||||
|
smudge = git-lfs smudge -- %f
|
||||||
|
process = git-lfs filter-process
|
||||||
|
required = true
|
||||||
|
clean = git-lfs clean -- %f
|
||||||
|
|
|
@ -96,7 +96,7 @@ let s:plug_src = 'https://github.com/junegunn/vim-plug.git'
|
||||||
let s:plug_tab = get(s:, 'plug_tab', -1)
|
let s:plug_tab = get(s:, 'plug_tab', -1)
|
||||||
let s:plug_buf = get(s:, 'plug_buf', -1)
|
let s:plug_buf = get(s:, 'plug_buf', -1)
|
||||||
let s:mac_gui = has('gui_macvim') && has('gui_running')
|
let s:mac_gui = has('gui_macvim') && has('gui_running')
|
||||||
let s:is_win = has('win32') || has('win64')
|
let s:is_win = has('win32')
|
||||||
let s:nvim = has('nvim-0.2') || (has('nvim') && exists('*jobwait') && !s:is_win)
|
let s:nvim = has('nvim-0.2') || (has('nvim') && exists('*jobwait') && !s:is_win)
|
||||||
let s:vim8 = has('patch-8.0.0039') && exists('*job_start')
|
let s:vim8 = has('patch-8.0.0039') && exists('*job_start')
|
||||||
let s:me = resolve(expand('<sfile>:p'))
|
let s:me = resolve(expand('<sfile>:p'))
|
||||||
|
@ -763,6 +763,9 @@ function! s:prepare(...)
|
||||||
execute 'silent! unmap <buffer>' k
|
execute 'silent! unmap <buffer>' k
|
||||||
endfor
|
endfor
|
||||||
setlocal buftype=nofile bufhidden=wipe nobuflisted nolist noswapfile nowrap cursorline modifiable nospell
|
setlocal buftype=nofile bufhidden=wipe nobuflisted nolist noswapfile nowrap cursorline modifiable nospell
|
||||||
|
if exists('+colorcolumn')
|
||||||
|
setlocal colorcolumn=
|
||||||
|
endif
|
||||||
setf vim-plug
|
setf vim-plug
|
||||||
if exists('g:syntax_on')
|
if exists('g:syntax_on')
|
||||||
call s:syntax()
|
call s:syntax()
|
||||||
|
@ -799,7 +802,7 @@ function! s:bang(cmd, ...)
|
||||||
let cmd = a:0 ? s:with_cd(a:cmd, a:1) : a:cmd
|
let cmd = a:0 ? s:with_cd(a:cmd, a:1) : a:cmd
|
||||||
if s:is_win
|
if s:is_win
|
||||||
let batchfile = tempname().'.bat'
|
let batchfile = tempname().'.bat'
|
||||||
call writefile(['@echo off', cmd], batchfile)
|
call writefile(["@echo off\r", cmd . "\r"], batchfile)
|
||||||
let cmd = batchfile
|
let cmd = batchfile
|
||||||
endif
|
endif
|
||||||
let g:_plug_bang = (s:is_win && has('gui_running') ? 'silent ' : '').'!'.escape(cmd, '#!%')
|
let g:_plug_bang = (s:is_win && has('gui_running') ? 'silent ' : '').'!'.escape(cmd, '#!%')
|
||||||
|
@ -908,7 +911,7 @@ function! s:finish(pull)
|
||||||
call add(msgs, "Press 'R' to retry.")
|
call add(msgs, "Press 'R' to retry.")
|
||||||
endif
|
endif
|
||||||
if a:pull && len(s:update.new) < len(filter(getline(5, '$'),
|
if a:pull && len(s:update.new) < len(filter(getline(5, '$'),
|
||||||
\ "v:val =~ '^- ' && stridx(v:val, 'Already up-to-date') < 0"))
|
\ "v:val =~ '^- ' && v:val !~# 'Already up.to.date'"))
|
||||||
call add(msgs, "Press 'D' to see the updated changes.")
|
call add(msgs, "Press 'D' to see the updated changes.")
|
||||||
endif
|
endif
|
||||||
echo join(msgs, ' ')
|
echo join(msgs, ' ')
|
||||||
|
@ -1196,7 +1199,7 @@ function! s:spawn(name, cmd, opts)
|
||||||
let s:jobs[a:name] = job
|
let s:jobs[a:name] = job
|
||||||
let cmd = has_key(a:opts, 'dir') ? s:with_cd(a:cmd, a:opts.dir) : a:cmd
|
let cmd = has_key(a:opts, 'dir') ? s:with_cd(a:cmd, a:opts.dir) : a:cmd
|
||||||
if !empty(job.batchfile)
|
if !empty(job.batchfile)
|
||||||
call writefile(['@echo off', cmd], job.batchfile)
|
call writefile(["@echo off\r", cmd . "\r"], job.batchfile)
|
||||||
let cmd = job.batchfile
|
let cmd = job.batchfile
|
||||||
endif
|
endif
|
||||||
let argv = add(s:is_win ? ['cmd', '/c'] : ['sh', '-c'], cmd)
|
let argv = add(s:is_win ? ['cmd', '/c'] : ['sh', '-c'], cmd)
|
||||||
|
@ -2023,7 +2026,7 @@ function! s:system(cmd, ...)
|
||||||
let cmd = a:0 > 0 ? s:with_cd(a:cmd, a:1) : a:cmd
|
let cmd = a:0 > 0 ? s:with_cd(a:cmd, a:1) : a:cmd
|
||||||
if s:is_win
|
if s:is_win
|
||||||
let batchfile = tempname().'.bat'
|
let batchfile = tempname().'.bat'
|
||||||
call writefile(['@echo off', cmd], batchfile)
|
call writefile(["@echo off\r", cmd . "\r"], batchfile)
|
||||||
let cmd = batchfile
|
let cmd = batchfile
|
||||||
endif
|
endif
|
||||||
return system(s:is_win ? '('.cmd.')' : cmd)
|
return system(s:is_win ? '('.cmd.')' : cmd)
|
||||||
|
@ -2357,7 +2360,7 @@ function! s:preview_commit()
|
||||||
let cmd = 'cd '.s:shellesc(g:plugs[name].dir).' && git show --no-color --pretty=medium '.sha
|
let cmd = 'cd '.s:shellesc(g:plugs[name].dir).' && git show --no-color --pretty=medium '.sha
|
||||||
if s:is_win
|
if s:is_win
|
||||||
let batchfile = tempname().'.bat'
|
let batchfile = tempname().'.bat'
|
||||||
call writefile(['@echo off', cmd], batchfile)
|
call writefile(["@echo off\r", cmd . "\r"], batchfile)
|
||||||
let cmd = batchfile
|
let cmd = batchfile
|
||||||
endif
|
endif
|
||||||
execute 'silent %!' cmd
|
execute 'silent %!' cmd
|
||||||
|
@ -2426,8 +2429,13 @@ function! s:diff()
|
||||||
\ . (cnts[1] ? printf(' %d plugin(s) have pending updates.', cnts[1]) : ''))
|
\ . (cnts[1] ? printf(' %d plugin(s) have pending updates.', cnts[1]) : ''))
|
||||||
|
|
||||||
if cnts[0] || cnts[1]
|
if cnts[0] || cnts[1]
|
||||||
nnoremap <silent> <buffer> <cr> :silent! call <SID>preview_commit()<cr>
|
nnoremap <silent> <buffer> <plug>(plug-preview) :silent! call <SID>preview_commit()<cr>
|
||||||
nnoremap <silent> <buffer> o :silent! call <SID>preview_commit()<cr>
|
if empty(maparg("\<cr>", 'n'))
|
||||||
|
nmap <buffer> <cr> <plug>(plug-preview)
|
||||||
|
endif
|
||||||
|
if empty(maparg('o', 'n'))
|
||||||
|
nmap <buffer> o <plug>(plug-preview)
|
||||||
|
endif
|
||||||
endif
|
endif
|
||||||
if cnts[0]
|
if cnts[0]
|
||||||
nnoremap <silent> <buffer> X :call <SID>revert()<cr>
|
nnoremap <silent> <buffer> X :call <SID>revert()<cr>
|
||||||
|
|
|
@ -1,3 +1,6 @@
|
||||||
|
--glob=!/vendor/
|
||||||
|
--glob=!/.git/
|
||||||
|
--glob=!/.terraform/
|
||||||
--colors=path:fg:100,150,210
|
--colors=path:fg:100,150,210
|
||||||
--colors=match:style:nobold
|
--colors=match:style:nobold
|
||||||
--colors=match:bg:180,150,40
|
--colors=match:bg:180,150,40
|
||||||
|
|
2
.zshrc
2
.zshrc
|
@ -9,6 +9,8 @@
|
||||||
# See https://github.com/robbyrussell/oh-my-zsh/wiki/Themes
|
# See https://github.com/robbyrussell/oh-my-zsh/wiki/Themes
|
||||||
export PATH=$HOME/bin:$PATH:/bin:/sbin:/usr/sbin:/usr/local/sbin
|
export PATH=$HOME/bin:$PATH:/bin:/sbin:/usr/sbin:/usr/local/sbin
|
||||||
|
|
||||||
|
fpath=(~/.zsh/functions $fpath)
|
||||||
|
|
||||||
ZSH_THEME="robbyrussell"
|
ZSH_THEME="robbyrussell"
|
||||||
|
|
||||||
export DIRENV_LOG_FORMAT=
|
export DIRENV_LOG_FORMAT=
|
||||||
|
|
BIN
bin/dwm
BIN
bin/dwm
Binary file not shown.
|
@ -1,5 +1,5 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
# set -ex
|
set -ex
|
||||||
name=toolbox-${USER}
|
name=toolbox-${USER}
|
||||||
image='dlneintr/toolbox:latest'
|
image='dlneintr/toolbox:latest'
|
||||||
labels="app=toolbox,owner=${USER},cookie=0xdeadbeef"
|
labels="app=toolbox,owner=${USER},cookie=0xdeadbeef"
|
||||||
|
|
Loading…
Reference in a new issue