From 88557ac9be2959432614c3e9fcd05e043dd2e0fa Mon Sep 17 00:00:00 2001 From: Luke Smith Date: Tue, 15 Jan 2019 09:11:59 -0500 Subject: plugin location --- .config/nvim/init.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.config/nvim/init.vim') diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim index b462bbd..e71979d 100644 --- a/.config/nvim/init.vim +++ b/.config/nvim/init.vim @@ -6,7 +6,7 @@ let mapleader =" " -call plug#begin('~/.vim/plugged') +call plug#begin('~/.config/nvim/plugged') Plug 'junegunn/goyo.vim' Plug 'PotatoesMaster/i3-vim-syntax' Plug 'jreybert/vimagit' -- cgit v1.3.1 From 4c658cf8b33337d50dcc44ea939751317c118455 Mon Sep 17 00:00:00 2001 From: Luke Smith Date: Tue, 15 Jan 2019 12:17:06 -0500 Subject: peachpuff --- .config/nvim/init.vim | 1 + 1 file changed, 1 insertion(+) (limited to '.config/nvim/init.vim') diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim index e71979d..d1cc03e 100644 --- a/.config/nvim/init.vim +++ b/.config/nvim/init.vim @@ -15,6 +15,7 @@ Plug 'vimwiki/vimwiki' call plug#end() " Some basics: + color peachpuff set nocompatible filetype plugin on syntax on -- cgit v1.3.1 From cb2fab9067b39e65cc9b1cc086886724355b8b38 Mon Sep 17 00:00:00 2001 From: Luke Smith Date: Sat, 19 Jan 2019 10:19:10 -0500 Subject: colorscheme fix, , is leader, new plugins --- .config/nvim/init.vim | 46 +++++++++++++++++++--------------------------- 1 file changed, 19 insertions(+), 27 deletions(-) (limited to '.config/nvim/init.vim') diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim index d1cc03e..63e31c4 100644 --- a/.config/nvim/init.vim +++ b/.config/nvim/init.vim @@ -1,21 +1,22 @@ -" _ -" __ _(_)_ __ ___ _ __ ___ -" \ \ / / | '_ ` _ \| '__/ __| -" \ V /| | | | | | | | | (__ -" \_/ |_|_| |_| |_|_| \___| - -let mapleader =" " +let mapleader ="," call plug#begin('~/.config/nvim/plugged') +Plug 'tpope/vim-surround' +Plug 'scrooloose/nerdtree' Plug 'junegunn/goyo.vim' Plug 'PotatoesMaster/i3-vim-syntax' Plug 'jreybert/vimagit' Plug 'LukeSmithxyz/vimling' Plug 'vimwiki/vimwiki' +Plug 'bling/vim-airline' +Plug 'tpope/vim-commentary' call plug#end() +set bg=light +set mouse=a +set nohlsearch +set clipboard=unnamedplus " Some basics: - color peachpuff set nocompatible filetype plugin on syntax on @@ -35,6 +36,10 @@ call plug#end() " Splits open at the bottom and right, which is non-retarded, unlike vim defaults. set splitbelow splitright +" Nerd tree + map :NERDTreeToggle + autocmd bufenter * if (winnr("$") == 1 && exists("b:NERDTree") && b:NERDTree.isTabTree()) | q | endif + " Shortcutting split navigation, saving a keypress: map h map j @@ -52,7 +57,7 @@ call plug#end() nnoremap S :%s//g " Compile document, be it groff/LaTeX/markdown/etc. - map c :w! \| !compiler % + map c :w! \| !compiler % " Open corresponding .pdf/.html or preview map p :!opout % @@ -62,17 +67,11 @@ call plug#end() " Ensure files are read as what I want: let g:vimwiki_ext2syntax = {'.Rmd': 'markdown', '.rmd': 'markdown','.md': 'markdown', '.markdown': 'markdown', '.mdown': 'markdown'} + let g:vimwiki_list = [{'path': '~/vimwiki', 'syntax': 'markdown', 'ext': '.md'}] autocmd BufRead,BufNewFile /tmp/calcurse*,~/.calcurse/notes/* set filetype=markdown autocmd BufRead,BufNewFile *.ms,*.me,*.mom,*.man set filetype=groff autocmd BufRead,BufNewFile *.tex set filetype=tex -" Readmes autowrap text: - autocmd BufRead,BufNewFile *.md set tw=79 - -" Use urlscan to choose and open a url: - :noremap u :w !urlscan -r 'linkhandler {}' - :noremap ,, !urlscan -r 'linkhandler {}' - " Copy selected text to system clipboard (requires gvim/nvim/vim-x11 installed): vnoremap "+y map "+P @@ -86,22 +85,15 @@ call plug#end() autocmd BufWritePre * %s/\s\+$//e " When shortcut files are updated, renew bash and ranger configs with new material: - autocmd BufWritePost ~/.bm* !shortcuts + autocmd BufWritePost ~/.bmdirs,~/.bmfiles !shortcuts " Run xrdb whenever Xdefaults or Xresources are updated. autocmd BufWritePost ~/.Xresources,~/.Xdefaults !xrdb % " Navigating with guides - inoremap /<++>"_c4l - vnoremap /<++>"_c4l - map /<++>"_c4l - - "____ _ _ -"/ ___| _ __ (_)_ __ _ __ ___| |_ ___ -"\___ \| '_ \| | '_ \| '_ \ / _ \ __/ __| - "___) | | | | | |_) | |_) | __/ |_\__ \ -"|____/|_| |_|_| .__/| .__/ \___|\__|___/ - "|_| |_| + inoremap /<++>"_c4l + vnoremap /<++>"_c4l + map /<++>"_c4l """LATEX " Word count: -- cgit v1.3.1 From 4bea307828695bce2c8b9c1fdbf48dba742c9181 Mon Sep 17 00:00:00 2001 From: Luke Smith Date: Sat, 2 Feb 2019 08:20:58 -0500 Subject: vimling bindings manually set --- .config/nvim/init.vim | 7 +++++++ 1 file changed, 7 insertions(+) (limited to '.config/nvim/init.vim') diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim index 63e31c4..e975d38 100644 --- a/.config/nvim/init.vim +++ b/.config/nvim/init.vim @@ -40,6 +40,13 @@ set clipboard=unnamedplus map :NERDTreeToggle autocmd bufenter * if (winnr("$") == 1 && exists("b:NERDTree") && b:NERDTree.isTabTree()) | q | endif +" vimling: + nm d :call ToggleDeadKeys() + imap d :call ToggleDeadKeys()a + nm i :call ToggleIPA() + imap i :call ToggleIPA()a + nm q :call ToggleProse() + " Shortcutting split navigation, saving a keypress: map h map j -- cgit v1.3.1 From 4fd200501eb118796fd3efc6401c044555e6690f Mon Sep 17 00:00:00 2001 From: Luke Smith Date: Sat, 2 Feb 2019 08:21:19 -0500 Subject: only one leader --- .config/nvim/init.vim | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to '.config/nvim/init.vim') diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim index e975d38..25c84ca 100644 --- a/.config/nvim/init.vim +++ b/.config/nvim/init.vim @@ -28,7 +28,7 @@ set clipboard=unnamedplus autocmd FileType * setlocal formatoptions-=c formatoptions-=r formatoptions-=o " Goyo plugin makes text more readable when writing prose: - map f :Goyo \| set linebreak + map f :Goyo \| set bg=light \| set linebreak " Spell-check set to o, 'o' for 'orthography': map o :setlocal spell! spelllang=en_us @@ -104,7 +104,7 @@ set clipboard=unnamedplus """LATEX " Word count: - autocmd FileType tex map o :w !detex \| wc -w + autocmd FileType tex map w :w !detex \| wc -w " Code snippets autocmd FileType tex inoremap ,fr \begin{frame}\frametitle{}<++>\end{frame}<++>6kf}i autocmd FileType tex inoremap ,fi \begin{fitch}\end{fitch}<++>3kA -- cgit v1.3.1 From 7e8ea8e3d49a9ebef3a949dd970080a43d5ab616 Mon Sep 17 00:00:00 2001 From: Luke Smith Date: Sat, 2 Feb 2019 08:21:33 -0500 Subject: goyo maintains good colors --- .config/nvim/init.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.config/nvim/init.vim') diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim index 25c84ca..2833984 100644 --- a/.config/nvim/init.vim +++ b/.config/nvim/init.vim @@ -86,7 +86,7 @@ set clipboard=unnamedplus " Enable Goyo by default for mutt writting " Goyo's width will be the line limit in mutt. autocmd BufRead,BufNewFile /tmp/neomutt* let g:goyo_width=80 - autocmd BufRead,BufNewFile /tmp/neomutt* :Goyo + autocmd BufRead,BufNewFile /tmp/neomutt* :Goyo \| set bg=light " Automatically deletes all trailing whitespace on save. autocmd BufWritePre * %s/\s\+$//e -- cgit v1.3.1