Redid my whole nvim config, tweaked the others
This commit is contained in:
parent
17919c6e72
commit
524b1cbcad
8 changed files with 32 additions and 132 deletions
|
|
@ -3,5 +3,5 @@
|
|||
stow -t ~ bash
|
||||
stow -t ~ git
|
||||
stow -t ~ tmux
|
||||
#stow -t ~ nvim
|
||||
#stow -t ~ editorconfig
|
||||
stow -t ~ nvim
|
||||
stow -t ~ editorconfig
|
||||
|
|
|
|||
|
|
@ -1,51 +1,5 @@
|
|||
|
||||
let g:airline_theme="papercolor"
|
||||
let g:airline_symbols_ascii=1
|
||||
|
||||
set termguicolors
|
||||
set background=dark
|
||||
let g:gruvbox_italic=1
|
||||
let g:gruvbox_italicize_strings=1
|
||||
colorscheme gruvbox
|
||||
|
||||
" Override some of the Gruvbox colors since they're broken for Haskell
|
||||
hi! link haskellType GruvboxBlue
|
||||
hi! link haskellIdentifier GruvboxAqua
|
||||
hi! link haskellSeparator GruvboxFg4
|
||||
hi! link haskellDelimiter GruvboxOrange
|
||||
hi! link haskellOperators GruvboxPurple
|
||||
|
||||
hi! link haskellBacktick GruvboxOrange
|
||||
hi! link haskellStatement GruvboxPurple
|
||||
hi! link haskellConditional GruvboxPurple
|
||||
|
||||
hi! link haskellLet GruvboxRed
|
||||
hi! link haskellDefault GruvboxRed
|
||||
hi! link haskellWhere GruvboxRed
|
||||
hi! link haskellBottom GruvboxRedBold
|
||||
hi! link haskellImportKeywords GruvboxPurpleBold
|
||||
hi! link haskellDeclKeyword GruvboxOrange
|
||||
hi! link haskellDecl GruvboxOrange
|
||||
hi! link haskellDeriving GruvboxPurple
|
||||
hi! link haskellAssocType GruvboxAqua
|
||||
|
||||
hi! link haskellNumber GruvboxAqua
|
||||
hi! link haskellPragma GruvboxRedBold
|
||||
|
||||
hi! link haskellTH GruvboxAquaBold
|
||||
hi! link haskellForeignKeywords GruvboxGreen
|
||||
hi! link haskellKeyword GruvboxRed
|
||||
hi! link haskellFloat GruvboxAqua
|
||||
hi! link haskellInfix GruvboxPurple
|
||||
hi! link haskellQuote GruvboxGreenBold
|
||||
hi! link haskellShebang GruvboxYellowBold
|
||||
hi! link haskellLiquid GruvboxPurpleBold
|
||||
hi! link haskellQuasiQuoted GruvboxBlueBold
|
||||
hi! link haskellRecursiveDo GruvboxPurlpe
|
||||
hi! link haskellQuotedType GruvboxRed
|
||||
hi! link haskellPreProc GruvboxFg4
|
||||
hi! link haskellTypeRoles GruvboxRedBold
|
||||
hi! link haskellTypeForall GruvboxRed
|
||||
hi! link haskellPatternKeyword GruvboxBlue
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -4,15 +4,10 @@ source $HOME/.config/nvim/plugs.vim
|
|||
syntax on
|
||||
filetype plugin indent on
|
||||
|
||||
source $HOME/.config/nvim/colors.vim
|
||||
|
||||
" Open NERDTree using a nice shortcut
|
||||
" Nice navigaton shortcuts
|
||||
map <C-n> :NERDTreeToggle<CR>
|
||||
|
||||
" Display buffers in the tab line
|
||||
let g:airline#extensions#tabline#enabled = 1
|
||||
let g:airline#extensions#wordcount#enabled = 1
|
||||
"let g:airline#extensions#wordcount#filetypes = ['all']
|
||||
map <C-f> :Files<CR>
|
||||
map <C-g> :Buffers<CR>
|
||||
|
||||
" Disable mouse input
|
||||
set mouse=
|
||||
|
|
@ -21,59 +16,31 @@ set mouse=
|
|||
set scrolloff=2
|
||||
set sidescrolloff=0
|
||||
|
||||
" Display our current line number and the offset of other lines
|
||||
set nu
|
||||
set relativenumber
|
||||
|
||||
" better searching
|
||||
set hlsearch
|
||||
" Forgive me for I have searched
|
||||
set ignorecase
|
||||
set incsearch
|
||||
set hlsearch
|
||||
|
||||
" Setup good wrapping so we don't wrap for most files and when we do, it's
|
||||
" pretty.
|
||||
" Make pretty reasonable wrapping
|
||||
set nowrap
|
||||
set linebreak " wraps at word boundaries
|
||||
autocmd FileType markdown set wrap
|
||||
autocmd FileType tex set wrap
|
||||
au BufRead,BufNewFile *.wiki set wrap
|
||||
|
||||
" Set tabbing to depth 2 and always use spaces.
|
||||
set tabstop=4
|
||||
set softtabstop=4
|
||||
set shiftwidth=4
|
||||
set expandtab
|
||||
set smarttab
|
||||
set autoindent
|
||||
set smartindent
|
||||
|
||||
let g:vimwiki_list = [ {'path': '~/Code/ntietz/vimwiki'} ]
|
||||
|
||||
set spell
|
||||
set linebreak " wraps at work boundaries
|
||||
autocmd FileType markdown set wrap spell
|
||||
autocmd FileType tex set wrap spell
|
||||
|
||||
" If files are modified just reopen them
|
||||
set autoread
|
||||
set updatetime=100
|
||||
au FileChangedShell * checktime
|
||||
au CursorHold * checktime
|
||||
au CursorHoldI * checktime
|
||||
|
||||
set wildignore +=*/tmp/*,*.pyc,*/__pycache__/*
|
||||
|
||||
nmap <leader>b :Buffers<CR>
|
||||
nmap <leader>f :Files<CR>
|
||||
|
||||
nmap <F8> :TagbarToggle<CR>
|
||||
|
||||
" let g:deoplete#enable_at_startup = 1
|
||||
" let g:deoplete#disable_auto_complete = 1
|
||||
" let g:deoplete#sources#jedi#show_docstring = 1
|
||||
" inoremap <expr><C-n> deoplete#mappings#manual_complete()
|
||||
" inoremap <expr><tab> pumvisible() ? "\<c-n>" : "\<tab>"
|
||||
|
||||
" Turn off polyglot for some langs so they play nice
|
||||
if exists('g:loaded_polyglot')
|
||||
let g:polyglot_disabled = ['go', 'rst', 'tla']
|
||||
endif
|
||||
au BufRead,BufNewFile *.tla setf tla
|
||||
|
||||
set nowrap
|
||||
" I like pretty things
|
||||
source $HOME/.config/nvim/colors.vim
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,48 +1,26 @@
|
|||
call plug#begin('~/local/.shared/nvim/plugged')
|
||||
|
||||
" language support
|
||||
Plug 'fatih/vim-go', { 'do': ':GoUpdateBinaries' }
|
||||
"Plug 'neovimhaskell/haskell-vim'
|
||||
Plug 'sheerun/vim-polyglot' " Automatic syntax highlighting for many languages
|
||||
|
||||
" File navigation
|
||||
Plug 'scrooloose/nerdtree'
|
||||
|
||||
" git utlities
|
||||
Plug 'tpope/vim-fugitive' " Git integration
|
||||
Plug 'airblade/vim-gitgutter' " Shows a diff in the gutter
|
||||
|
||||
" TODO: what is this section called?
|
||||
" TODO: consider switching to powerline
|
||||
Plug 'vim-airline/vim-airline' " Display more contextual information
|
||||
Plug 'vim-airline/vim-airline-themes'
|
||||
|
||||
" vimwiki
|
||||
Plug 'vimwiki/vimwiki'
|
||||
|
||||
" TODO: pull out just the colorscheme I want to remove a dependency
|
||||
" add a ton of colorschemes to pick from
|
||||
Plug 'flazz/vim-colorschemes'
|
||||
" Fuzzy file finding is great
|
||||
Plug 'junegunn/fzf', { 'do': { -> fzf#install() } }
|
||||
Plug 'junegunn/fzf.vim'
|
||||
|
||||
" Better session handling
|
||||
Plug 'tpope/vim-obsession'
|
||||
|
||||
" git utilities
|
||||
Plug 'tpope/vim-fugitive' " whose fault is it
|
||||
|
||||
" Language support
|
||||
Plug 'sheerun/vim-polyglot' " Automatic syntax highlighting for many languages
|
||||
Plug 'ntietz/tla.vim'
|
||||
|
||||
" Use common config to setup tab depth
|
||||
Plug 'editorconfig/editorconfig-vim'
|
||||
|
||||
" Find files in a fuzzy way
|
||||
Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --bin' } " fzf binary
|
||||
Plug 'junegunn/fzf.vim' " fzf vim plugin
|
||||
|
||||
" Auto-completion
|
||||
Plug 'shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins' }
|
||||
Plug 'zchee/deoplete-jedi'
|
||||
|
||||
" Tags
|
||||
Plug 'majutsushi/tagbar'
|
||||
|
||||
" TLA+
|
||||
Plug 'hwayne/tla.vim'
|
||||
" Make things real pretty
|
||||
Plug 'flazz/vim-colorschemes'
|
||||
|
||||
call plug#end()
|
||||
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
|
||||
|
|
@ -3,7 +3,9 @@ bind r source-file ~/.tmux.conf \; display-message "Config reloaded..."
|
|||
|
||||
set -sg escape-time 0
|
||||
|
||||
set -g default-terminal "screen-256color"
|
||||
set -g default-terminal "tmux-256color"
|
||||
|
||||
set-window-option -g mode-keys vi
|
||||
|
||||
# disable automatic window renaming
|
||||
set-window-option -g status-interval 1
|
||||
|
|
@ -13,7 +15,7 @@ set-window-option -g allow-rename off
|
|||
|
||||
# window status
|
||||
setw -g window-status-format "#[bg=colour243,fg=colour233] #I #(basename #{pane_current_path})→#W "
|
||||
setw -g window-status-current-format "#[bg=colour250,fg=colour233,bold] #I #(basename #{pane_current_path})→#W "
|
||||
setw -g window-status-current-format "#[bg=colour248,fg=colour233,bold] #I #(basename #{pane_current_path})→#W "
|
||||
|
||||
# The statusbar
|
||||
set -g status-interval 2
|
||||
|
|
|
|||
Loading…
Reference in a new issue