added latest changes from setting up x270

1 files changed, 0 insertions, 29 deletions

diff --git a/.vimrc b/.vimrc
index aa70fa9..3a682ca 100644
--- a/.vimrc
+++ b/.vimrc
@@ -11,8 +11,6 @@ Bundle 'tpope/vim-fugitive'
 Bundle 'tpope/vim-surround'
 Bundle 'vim-scripts/multvals.vim'
 Bundle 'altercation/vim-colors-solarized'
-Bundle 'SirVer/ultisnips'
-Bundle 'vim-scripts/taglist.vim'
 Bundle 'vim-scripts/django.vim'
 Bundle 'nelstrom/vim-markdown-folding'
 Bundle 'tpope/vim-markdown'
@@ -24,13 +22,11 @@ Bundle 'reedes/vim-wordy'
 Bundle 'vim-scripts/vim-auto-save'
 Bundle 'tmhedberg/SimpylFold'
 Bundle 'nvie/vim-flake8'
-Bundle 'majutsushi/tagbar'
 Bundle 'francoiscabrol/ranger.vim'
 Bundle 'junegunn/fzf'
 Bundle 'junegunn/fzf.vim'
 Bundle 'chengzeyi/fzf-preview.vim'
 Bundle 'alok/notational-fzf-vim'
-Bundle 'junegunn/goyo.vim'
 call vundle#end()
 filetype plugin indent on
 "}}}
@@ -416,42 +412,17 @@ let g:ycm_key_list_select_completion = ['<C-n>', '<Down>']
 let g:ycm_key_list_previous_completion = ['<C-p>', '<Up>']
 let g:SuperTabDefaultCompletionType = '<C-n>'
 
-" better key bindings for UltiSnipsExpandTrigger
-" let g:UltiSnipsExpandTrigger = "<tab>"
-" let g:UltiSnipsJumpForwardTrigger = "<tab>"
-" let g:UltiSnipsJumpBackwardTrigger = "<s-tab>"
-"
-" goyo / limelight
-
-" Color name (:help cterm-colors) or ANSI code
-let g:limelight_conceal_ctermfg = 'gray'
-let g:limelight_conceal_ctermfg = 240
-"
-" " Color name (:help gui-colors) or RGB color
-let g:limelight_conceal_guifg = 'DarkGray'
-let g:limelight_conceal_guifg = '#777777'
-"
-
-let g:goyo_width = 105
-let g:goyo_height = '99%'
-let g:goyo_linenr=1
 nnoremap <silent> <c-s> :NV<CR>
 let g:markdown_fold_style = 'nested'
 
 nmap <leader>i :%s/
//g
 nmap <leader># :%s/### /###/g
 
-nmap <Leader>o :Utl openLink underCursor edit<CR>
 imap jj <Esc>
 vmap <silent> <leader>r <esc>:'<,'>:w !espeak &> /dev/null <CR>
 
-"wayland hack:
-"xnoremap "+y :!wl-copy <C-r>"<cr><cr>
-"xnoremap "+y y:call system("wl-copy", @")<cr>
-"nnoremap "+p :let @"=substitute(system("wl-paste --no-newline"), '<C-v><C-m>', '', 'g')<cr>p
 nnoremap "*p :let @"=substitute(system("wl-paste --no-newline --primary"), '<C-v><C-m>', '', 'g')<cr>p
 xnoremap <c-c> y:!wl-copy <C-r>"<cr><cr>gv
 vnoremap <c-c> y:!wl-copy <C-r>"<cr><cr>gv
-"set tags+=tags;$HOME