From 17fcf842da1e5ab6e571e1c80f2013986de7150c Mon Sep 17 00:00:00 2001 From: Barak Michener Date: Fri, 15 Dec 2017 14:42:06 -0800 Subject: [PATCH 1/5] add ssh-agent --- .config/systemd/user/default.target.wants/ssh-agent.service | 1 + .config/systemd/user/ssh-agent.service | 10 ++++++++++ .zprofile | 1 + 3 files changed, 12 insertions(+) create mode 120000 .config/systemd/user/default.target.wants/ssh-agent.service create mode 100644 .config/systemd/user/ssh-agent.service diff --git a/.config/systemd/user/default.target.wants/ssh-agent.service b/.config/systemd/user/default.target.wants/ssh-agent.service new file mode 120000 index 0000000..8c9a931 --- /dev/null +++ b/.config/systemd/user/default.target.wants/ssh-agent.service @@ -0,0 +1 @@ +/home/barak/.config/systemd/user/ssh-agent.service \ No newline at end of file diff --git a/.config/systemd/user/ssh-agent.service b/.config/systemd/user/ssh-agent.service new file mode 100644 index 0000000..87d6c04 --- /dev/null +++ b/.config/systemd/user/ssh-agent.service @@ -0,0 +1,10 @@ +[Unit] +Description=SSH key agent + +[Service] +Type=forking +Environment=SSH_AUTH_SOCK=%t/ssh-agent.socket +ExecStart=/usr/bin/ssh-agent -a $SSH_AUTH_SOCK + +[Install] +WantedBy=default.target diff --git a/.zprofile b/.zprofile index 3beeed0..7296da2 100644 --- a/.zprofile +++ b/.zprofile @@ -37,3 +37,4 @@ ENV=$HOME/.zshrc; export ENV #alias ls='ls -FG' #alias la='ls -FGal' #source ~/.zshrc +export SSH_AUTH_SOCK="$XDG_RUNTIME_DIR/ssh-agent.socket" From c13357b07843fc3cf486b55551d95789f16ea1f3 Mon Sep 17 00:00:00 2001 From: Barak Michener Date: Fri, 15 Dec 2017 14:42:28 -0800 Subject: [PATCH 2/5] add easyalign to vim --- .vimrc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.vimrc b/.vimrc index 9d99a88..cb0f6cd 100644 --- a/.vimrc +++ b/.vimrc @@ -133,6 +133,8 @@ Plug 'sheerun/vim-polyglot' "Plug 'rust-lang/rust.vim' "Plug 'hashivim/vim-terraform' "Plug 'HerringtonDarkholme/yats.vim' +Plug 'tpope/vim-fireplace' +Plug 'junegunn/vim-easy-align' call plug#end() From 16bd00efb6d33ce477585b0e0af21a05b4a89109 Mon Sep 17 00:00:00 2001 From: Barak Michener Date: Thu, 21 Dec 2017 11:37:07 -0800 Subject: [PATCH 3/5] switch to denite and platinum searcher (pt) --- .vimrc | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/.vimrc b/.vimrc index 9d99a88..04af627 100644 --- a/.vimrc +++ b/.vimrc @@ -126,6 +126,7 @@ Plug 'whonore/coquille', {'branch': 'pathogen-bundle', 'for': 'coq'} Plug 'mhartington/nvim-typescript' Plug 'sheerun/vim-polyglot' +Plug 'Shougo/denite.nvim' "Plug 'vim-scripts/fish-syntax' "Plug 'kchmck/vim-coffee-script' "Plug 'rodjek/vim-puppet' @@ -608,10 +609,14 @@ nnoremap ss :SyntasticSetLoclist nnoremap fn :lnext " Prev quickfix. nnoremap fp :lprev -" Ack (grep) for the word under the cursor. -nnoremap aw :exe 'Ack ' . expand('') -" Ack prompt. -nnoremap ac :Ack +nnoremap aw :DeniteCursorWord -buffer-name=search-buffer grep +call denite#custom#var('grep', 'command', ['pt']) +call denite#custom#var('grep', 'default_opts', + \ ['--nogroup', '--nocolor', '--smart-case']) +call denite#custom#var('grep', 'recursive_opts', []) +call denite#custom#var('grep', 'pattern_opt', []) +call denite#custom#var('grep', 'separator', ['--']) +call denite#custom#var('grep', 'final_opts', []) " For C++ -- A is a great plugin which allows you to jump from the c file to the " header and vice-versa. Mneumonic here is headerheader. nnoremap hh :A From 40b70b98d8a243399798e799c6c8a85a2362f4cf Mon Sep 17 00:00:00 2001 From: Barak Michener Date: Thu, 21 Dec 2017 12:22:50 -0800 Subject: [PATCH 4/5] update vimrc colors for new ack --- .vim/colors/baraknew.vim | 5 +++++ .vimrc | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.vim/colors/baraknew.vim b/.vim/colors/baraknew.vim index 803aebe..03df230 100644 --- a/.vim/colors/baraknew.vim +++ b/.vim/colors/baraknew.vim @@ -414,3 +414,8 @@ hi CANCELED guifg=red guibg=NONE ctermfg=red ctermbg=NONE hi STARTED guifg=yellow guibg=NONE ctermfg=yellow ctermbg=NONE hi NEXT guifg=cyan guibg=NONE ctermfg=cyan ctermbg=NONE hi DONE guifg=green guibg=NONE ctermfg=green ctermbg=NONE + +" For denite.nvim +" + +hi deniteMatchedChar guifg=#FFFFFF guibg=#5F87FF ctermfg=15 ctermbg=27 diff --git a/.vimrc b/.vimrc index 9ed5fe9..04f5d8a 100644 --- a/.vimrc +++ b/.vimrc @@ -611,7 +611,7 @@ nnoremap ss :SyntasticSetLoclist nnoremap fn :lnext " Prev quickfix. nnoremap fp :lprev -nnoremap aw :DeniteCursorWord -buffer-name=search-buffer grep +nnoremap aw :DeniteCursorWord -mode=normal -buffer-name=search-buffer grep call denite#custom#var('grep', 'command', ['pt']) call denite#custom#var('grep', 'default_opts', \ ['--nogroup', '--nocolor', '--smart-case']) @@ -619,6 +619,7 @@ call denite#custom#var('grep', 'recursive_opts', []) call denite#custom#var('grep', 'pattern_opt', []) call denite#custom#var('grep', 'separator', ['--']) call denite#custom#var('grep', 'final_opts', []) +call denite#custom#option('search-buffer', 'highlight_matched_char', 'deniteMatchedChar') " For C++ -- A is a great plugin which allows you to jump from the c file to the " header and vice-versa. Mneumonic here is headerheader. nnoremap hh :A From ee43fabed22971d39b174a7a65b9ae539ff22e38 Mon Sep 17 00:00:00 2001 From: Barak Michener Date: Mon, 25 Dec 2017 11:55:40 -0800 Subject: [PATCH 5/5] denite maps --- .vimrc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.vimrc b/.vimrc index 04f5d8a..e829aa8 100644 --- a/.vimrc +++ b/.vimrc @@ -612,6 +612,7 @@ nnoremap fn :lnext " Prev quickfix. nnoremap fp :lprev nnoremap aw :DeniteCursorWord -mode=normal -buffer-name=search-buffer grep +call denite#custom#map('insert', '', '') call denite#custom#var('grep', 'command', ['pt']) call denite#custom#var('grep', 'default_opts', \ ['--nogroup', '--nocolor', '--smart-case']) @@ -620,6 +621,7 @@ call denite#custom#var('grep', 'pattern_opt', []) call denite#custom#var('grep', 'separator', ['--']) call denite#custom#var('grep', 'final_opts', []) call denite#custom#option('search-buffer', 'highlight_matched_char', 'deniteMatchedChar') +nnoremap g :Denite -buffer-name=search-buffer grep " For C++ -- A is a great plugin which allows you to jump from the c file to the " header and vice-versa. Mneumonic here is headerheader. nnoremap hh :A