Skip to content

Commit

Permalink
chore: solarized, diffopt bug, ft tweaks
Browse files Browse the repository at this point in the history
  • Loading branch information
craigmac committed Apr 22, 2022
1 parent 6f722cf commit 8495d00
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 4 deletions.
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -43,3 +43,6 @@
[submodule "pack/third-party/start/apprentice"]
path = pack/third-party/start/apprentice
url = https://github.com/romainl/apprentice
[submodule "pack/third-party/start/vim-colors-solarized"]
path = pack/third-party/start/vim-colors-solarized
url = https://github.com/altercation/vim-colors-solarized
2 changes: 1 addition & 1 deletion after/ftplugin/bash.vim
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
setlocal noexpandtab
setlocal shiftwidth=2
setlocal shiftwidth=0
setlocal softtabstop=-1
setlocal tabstop=2
setlocal textwidth=80
Expand Down
1 change: 0 additions & 1 deletion after/ftplugin/javascript.vim
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,5 @@ setlocal shiftwidth=2
setlocal softtabstop=2
setlocal expandtab
setlocal foldmethod=indent
setlocal cursorcolumn | " Easy to follow indent levels with vertical line

let b:undo_ftplugin .= '|setlocal shiftwidth< softtabstop< et< fdm< cursorcolumn<'
5 changes: 5 additions & 0 deletions after/ftplugin/zsh.vim
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,8 @@ setlocal tabstop=2
setlocal softtabstop=2
setlocal shiftwidth=2
setlocal expandtab

augroup zsh
autocmd!
autocmd FileType zsh if bufname() ==# '.zshrc' | setlocal fdm=marker | endif
augroup END
1 change: 1 addition & 0 deletions pack/third-party/start/vim-colors-solarized
Submodule vim-colors-solarized added at 528a59
5 changes: 3 additions & 2 deletions vimrc
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,17 @@ syntax on
set encoding=utf-8
scriptencoding utf-8
let mapleader=' '
colorscheme apprentice
colorscheme solarized

" set statusline=%!vim9utils#MyStatusline()
set autoindent smartindent
set autoread
set backspace=indent,eol,start
set belloff=all
set clipboard=unnamed,unnamedplus
set complete-=i
set completeopt=menuone,popup
" BUG: see https://github.com/vim/vim/issues/10250
" if has('patch-8.1.0360') | set diffopt+=algorithm:patience | endif
set display=truncate
set errorformat+=%f | " :cexpr system('cat /tmp/list-o-filenames.txt')
set exrc secure
Expand Down

0 comments on commit 8495d00

Please sign in to comment.