From 364b2fb4780afadb59db50b869f59815ba7ba147 Mon Sep 17 00:00:00 2001 From: jon Date: Tue, 1 Jan 2019 09:30:48 -0600 Subject: [PATCH] Switched from vundle to vim-plug. Cleaned up vimrc quite a bit. --- bash/.bashrc | 2 ++ vim/.vim/bundle/jedi-vim | 2 +- vim/.vim/bundle/lightline.vim | 2 +- vim/.vim/bundle/nerdtree | 2 +- vim/.vim/bundle/python-mode | 2 +- vim/.vim/bundle/targets.vim | 2 +- vim/.vim/bundle/vim-fugitive | 2 +- vim/.vimrc | 62 ++++++++--------------------------- x/.Xresources | 6 ++-- 9 files changed, 25 insertions(+), 57 deletions(-) diff --git a/bash/.bashrc b/bash/.bashrc index 1e6f665..ca3aa52 100644 --- a/bash/.bashrc +++ b/bash/.bashrc @@ -54,3 +54,5 @@ export PS1="\[$(tput bold)\]\[$(tput setaf 2)\][\u@\h \W]\\$ \[$(tput sgr0)\]" # fedoras stupid command-not-found shit unset command_not_found_handle + +source /usr/share/fzf/shell/key-bindings.bash diff --git a/vim/.vim/bundle/jedi-vim b/vim/.vim/bundle/jedi-vim index 2f65c63..7f4f2db 160000 --- a/vim/.vim/bundle/jedi-vim +++ b/vim/.vim/bundle/jedi-vim @@ -1 +1 @@ -Subproject commit 2f65c636f83139b9982b1c1c90cb7f34915ad815 +Subproject commit 7f4f2db260e3e693c8b9fc91498f9299c99148c2 diff --git a/vim/.vim/bundle/lightline.vim b/vim/.vim/bundle/lightline.vim index 688240e..1ef44bf 160000 --- a/vim/.vim/bundle/lightline.vim +++ b/vim/.vim/bundle/lightline.vim @@ -1 +1 @@ -Subproject commit 688240e0ef849cdc8457822658cedf10358c75d6 +Subproject commit 1ef44bfa50320347004be77f836e97dc4f54982e diff --git a/vim/.vim/bundle/nerdtree b/vim/.vim/bundle/nerdtree index 370eb5b..72c3656 160000 --- a/vim/.vim/bundle/nerdtree +++ b/vim/.vim/bundle/nerdtree @@ -1 +1 @@ -Subproject commit 370eb5bcb44d7df6cd4512e05d4511fd479497d7 +Subproject commit 72c3656799289d4635520c28e17f737066ce19d6 diff --git a/vim/.vim/bundle/python-mode b/vim/.vim/bundle/python-mode index f7ccee5..2859abb 160000 --- a/vim/.vim/bundle/python-mode +++ b/vim/.vim/bundle/python-mode @@ -1 +1 @@ -Subproject commit f7ccee54743800ef2aab264dafeed3d5a4ec1fbd +Subproject commit 2859abb88ec1e6e58409a4acc903caf466aea43b diff --git a/vim/.vim/bundle/targets.vim b/vim/.vim/bundle/targets.vim index 4a5e9c0..55c9c40 160000 --- a/vim/.vim/bundle/targets.vim +++ b/vim/.vim/bundle/targets.vim @@ -1 +1 @@ -Subproject commit 4a5e9c09ec2ba63c8cd16b433453e41c22efab22 +Subproject commit 55c9c40e47af660677725b68fcfe7e88d9985889 diff --git a/vim/.vim/bundle/vim-fugitive b/vim/.vim/bundle/vim-fugitive index 2564c37..40e8d0b 160000 --- a/vim/.vim/bundle/vim-fugitive +++ b/vim/.vim/bundle/vim-fugitive @@ -1 +1 @@ -Subproject commit 2564c37d0a2ade327d6381fef42d84d9fad1d057 +Subproject commit 40e8d0b9f02b3948df0127055a26e6d6996ff129 diff --git a/vim/.vimrc b/vim/.vimrc index 9cc60ee..9e36b7a 100644 --- a/vim/.vimrc +++ b/vim/.vimrc @@ -32,7 +32,7 @@ set cursorline "set colorcolumn=79 "enable relative line numbers -"set number relativenumber +set number relativenumber "set highlight cursorcolumn cterm=NONE ctermbg=darkred ctermfg=white guibg=darkred guifg=white nnoremap c :set cursorline! cursorcolumn! @@ -44,6 +44,7 @@ nnoremap h (&hls && v:hlsearch ? ':nohls' : ':set hls')." set showmatch set matchtime=2 +" python-syntax let pythong_highlight_all = 1 syntax on @@ -60,17 +61,16 @@ nnoremap nnoremap nnoremap -" use jj to escape insert mode +" map ctrl-p to fzf +nnoremap :Files + +" use jj (et al) to escape insert mode inoremap jj inoremap jk inoremap kj -nnoremap o - " use jk to escape insert mode - using easyescape plugin let g:easyescape_chars = { "j": 1, "k": 1 } -"let g:easyescape_timeout = 100 -cnoremap jk -cnoremap kj +let g:easyescape_timeout = 100 " blank lines nnoremap o @@ -80,21 +80,16 @@ nnoremap l :ls:b nnoremap :bnext nnoremap :bprev -nnoremap p :CtrlPBuffer nnoremap za " NERDTree, open/close toggle map :NERDTreeToggle "lightline colorscheme -let g:lightline = {'colorscheme': 'jellybeans',} - -"supertab setting -"let g:SuperTabDefaultCompletionType = "context" +let g:lightline = {'colorscheme': 'wombat',} "vim-jedi auto-select first, saves a keystroke let g:jedi#popup_select_first = 0 -let g:SuperTabCrMapping=1 " set the runtime path to include Vundle and initialize set rtp+=~/.vim/bundle/Vundle.vim @@ -102,52 +97,21 @@ call vundle#begin() " " let Vundle manage Vundle, required Plugin 'VundleVim/Vundle.vim' Plugin 'tpope/vim-fugitive' -Plugin 'kien/ctrlp.vim' Plugin 'scrooloose/nerdtree' Plugin 'tmhedberg/SimpylFold' -"Plugin 'vim-scripts/indentpython.vim' +Plugin 'vim-scripts/indentpython.vim' Plugin 'scrooloose/syntastic' -" PEP8 checking plugin -Plugin 'nvie/vim-flake8' +Plugin 'nvie/vim-flake8' " PEP 8 checking plugin Plugin 'itchyny/lightline.vim' -"requires login below -"Plugin 'taohex/lightline-buffer' -"Plugin 'klen/python-mode' -"Plugin 'itchyny/calendar.vim' +Plugin 'klen/python-mode' Plugin 'davidhalter/jedi-vim' Plugin 'tpope/vim-surround' Plugin 'ap/vim-buftabline' Plugin 'wellle/targets.vim' Plugin 'junegunn/goyo.vim' Plugin 'zhou13/vim-easyescape' -Plugin 'ervandew/supertab' +Plugin 'junegunn/fzf.vim' +Plugin 'mcchrish/nnn.vim' call vundle#end() " required filetype plugin indent on " required - -" use lightline-buffer in lightline -let g:lightline = { - \ 'tabline': { - \ 'left': [ [ 'bufferinfo' ], - \ [ 'separator' ], - \ [ 'bufferbefore', 'buffercurrent', 'bufferafter' ], ], - \ 'right': [ [ 'close' ], ], - \ }, - \ 'component_expand': { - \ 'buffercurrent': 'lightline#buffer#buffercurrent', - \ 'bufferbefore': 'lightline#buffer#bufferbefore', - \ 'bufferafter': 'lightline#buffer#bufferafter', - \ }, - \ 'component_type': { - \ 'buffercurrent': 'tabsel', - \ 'bufferbefore': 'raw', - \ 'bufferafter': 'raw', - \ }, - \ 'component_function': { - \ 'bufferinfo': 'lightline#buffer#bufferinfo', - \ }, - \ 'component': { - \ 'separator': '', - \ }, - \ } - diff --git a/x/.Xresources b/x/.Xresources index 005811c..5248656 100644 --- a/x/.Xresources +++ b/x/.Xresources @@ -1,8 +1,8 @@ URxvt*scrollBar: false URxvt.font: xft:Terminus:size=14:antialias=true !URxvt.boldFont: xft:Terminus:bold:size=14:antialias=true -!URxvt*transparent: true -!URxvt*shading: 10 +URxvt*transparent: true +URxvt*shading: 10 URxvt*perl-ext-common: default,matcher URxvt*matcher.button: 1 @@ -50,3 +50,5 @@ URxvt*.termName: rxvt-unicode-256color *.color7: #707880 *.color15: #c5c8c6 +URxvt.inputMethod: ibus +URxvt.preeditType: OverTheSpot