Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: jotrk/etc.vim
base: afc96c7f8e
...
head fork: jotrk/etc.vim
compare: a3345b4c33
Checking mergeability… Don't worry, you can still create the pull request.
  • 17 commits
  • 10 files changed
  • 0 commit comments
  • 1 contributor
View
1  .gitmodules
@@ -51,6 +51,7 @@
[submodule "submodules/Command-T"]
path = submodules/Command-T
url = https://github.com/wincent/Command-T.git
+ ignore = untracked
[submodule "submodules/vim-repeat"]
path = submodules/vim-repeat
url = https://github.com/tpope/vim-repeat.git
View
2  .vimrc
@@ -8,8 +8,10 @@ let myscripts = [ '00-pathogen.vim'
\ , '50-NERDCommenter.vim'
\ , '50-NERDTree.vim'
\ , '50-a.vim'
+ \ , '50-buftabs.vim'
\ , '50-colorscheme.vim'
\ , '50-fugitive.vim'
+ \ , '50-ghcmod.vim'
\ , '50-neocomplcache.vim'
\ , '50-surround.vim'
\ , '50-syntastic.vim'
2  submodules/vim-fugitive
@@ -1 +1 @@
-Subproject commit 476fbd09508a3de1eddb76d74089392c5254aa53
+Subproject commit 8fa462aacd1260d00c75e86d89903c4702a4ca2c
View
3  vimrc.d/10-common-let.vim
@@ -6,5 +6,6 @@ let v:fcs_choice = "ask"
let g:netrw_liststyle=3
let g:netrw_sort_sequence = '[\/]$,\<core\%(\.\d\+\)\=,\.[a-np-z]$,\.hs$
- \ ,\.x10$,\.h$,\.c$,\.cpp$,*,\.o$,\.class$,\.obj$,\.info$,\.swp$
+ \ ,\.x10$,\.h$,\.c$,\.cpp$,\.java$
+ \ ,*,\.o$,\.class$,\.obj$,\.info$,\.swp$
\ ,\.bak$,\~$'
View
6 vimrc.d/10-common-set.vim
@@ -83,6 +83,12 @@ set sidescrolloff=5
" Default height for a preview window. (Fugitive uses preview window too)
set previewheight=20
+" A list of file patterns. A file that matches with one of these
+" patterns is ignored when completing file or directory names, and
+" influences the result of |expand()|, |glob()| and |globpath()| unless
+" a flag is passed to disable this.
+set wildignore=*.o,*.obj,*.hi,*.class,.git,submodules/**
+
" Suffixes that get lower priority when doing tab completion for filenames.
" These are files we are not likely to want to edit or read.
set suffixes=.bak,~,.swp,.o,.info,.aux,.log,.dvi,.bbl,.blg,.brf
View
15 vimrc.d/50-NERDTree.vim
@@ -1,5 +1,20 @@
let g:NERDTreeQuitOnOpen = 1
+" Default: ['\/$', '*', '\.swp$', '\.bak$', '\~$']
+let g:NERDTreeSortOrder = [ '\/$'
+ \ , '\.hs$'
+ \ , '\.java$'
+ \ , '\.\(h\(\|pp\|h\)\|H\)$', '\.\(c\(\|pp\|c\)\|C\)$'
+ \ , '*'
+ \ , '\.o$'
+ \ , '\.obj$'
+ \ , '\.class$'
+ \ , '\.info$'
+ \ , '\.swp$'
+ \ , '\.bak$'
+ \ , '\~$'
+ \ ]
+
autocmd BufLeave * if &ft == 'nerdtree' | :close | endif
nnoremap <silent> <Leader>nt :NERDTreeToggle<CR>
View
3  vimrc.d/50-buftabs.vim
@@ -0,0 +1,3 @@
+" Define this variable to make buftabs only print the filename of each buffer,
+" omitting the preceding directory name.
+let g:buftabs_only_basename=1
View
1  vimrc.d/50-ghcmod.vim
@@ -0,0 +1 @@
+let g:ghcmod_ghc_options = ['-i${HOME}/.xmonad/lib', '-ilib']
View
4 vimrc.d/50-surround.vim
@@ -1,3 +1,3 @@
" free mapping of s and restore default behaviour
-silent! unmap s
-silent! map s s
+" https://github.com/tpope/vim-surround/issues/61#issuecomment-5768565
+xnoremap s s
View
8 vimrc.d/50-syntastic.vim
@@ -5,7 +5,7 @@ function SyntasticAutoCmd()
endif
endfunction
-autocmd VimEnter * call SyntasticAutoCmd()
+" autocmd VimEnter * call SyntasticAutoCmd()
" Use this option to tell syntastic to automatically open and/or close the
" |location-list| (see |syntastic-error-window|).
@@ -15,3 +15,9 @@ autocmd VimEnter * call SyntasticAutoCmd()
" When set to 2 the error window will be automatically closed when no errors
" are detected, but not opened automatically.
let g:syntastic_auto_loc_list=1
+
+" undocumented variable for haskell syntax checker
+" options are passed to ghc-mod, run 'ghc-mod help'
+let g:syntastic_haskell_checker_args =
+ \ '--hlintOpt="--language=XmlSyntax"
+ \ --ghcOpt="-i${HOME}/.xmonad/lib"'

No commit comments for this range

Something went wrong with that request. Please try again.