Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge remote-tracking branch 'peitto/master'

  • Loading branch information...
commit 98cb352e07671adf1b681aa5a79a6f5e439730d2 2 parents 4500384 + 98be560
@MasseR authored
View
5 .gitignore
@@ -2,8 +2,7 @@
*.swp
*.swo
.netrwhist
-[?25l[?25h[?1049h[?1h=[?25h[?25h[?25l"tags/" Illegal file name~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ]2; (~/.vim) - VIM]1;tags[?25h[?25lType :quit<Enter> to exit Vim[?25h[?25l[?25h[?25l[?25h[?25l[?25h[?25l[?25h[?1l>[?1049lVim: Error reading input, exiting...
-Vim: Finished.
-]2;urxvt]1;urxvttags/
*.swp
view/
+bundle/**
+~bundle/vundle
View
23 .gitmodules
@@ -9,7 +9,7 @@
url = http://github.com/scrooloose/nerdtree.git
[submodule "bundle/surround"]
path = bundle/surround
- url = http://github.com/tpope/vim-surround.git
+ url = https://github.com/tpope/vim-surround.git
[submodule "bundle/OmniCppComplete"]
path = bundle/OmniCppComplete
url = http://github.com/MasterKey/OmniCppComplete.git
@@ -34,9 +34,6 @@
[submodule "bundle/matchit"]
path = bundle/matchit
url = https://github.com/javanthropus/vim-matchit.git
-[submodule "bundle/snipmate"]
- path = bundle/snipmate
- url = git@github.com:MasseR/snipmate.vim.git
[submodule "bundle/VimClojure"]
path = bundle/VimClojure
url = https://github.com/vim-scripts/VimClojure.git
@@ -67,3 +64,21 @@
[submodule "bundle/Vimchant"]
path = bundle/Vimchant
url = https://github.com/vim-scripts/Vimchant.git
+[submodule "bundle/snipmate"]
+ path = bundle/snipmate
+ url = https://github.com/avelino/snipmate.vim.git
+[submodule "bundle/neocomplcache"]
+ path = bundle/neocomplcache
+ url = https://github.com/Shougo/neocomplcache.git
+[submodule "bundle/ctrlp"]
+ path = bundle/ctrlp
+ url = https://github.com/kien/ctrlp.vim.git
+[submodule "bundle/localrc"]
+ path = bundle/localrc
+ url = https://github.com/vim-scripts/localrc.vim.git
+[submodule "bundle/tcomment"]
+ path = bundle/tcomment
+ url = https://github.com/tomtom/tcomment_vim.git
+[submodule "bundle/xmledit"]
+ path = bundle/xmledit
+ url = https://github.com/sukima/xmledit.git
View
2  gvimrc
@@ -4,5 +4,5 @@ colorscheme zenburn
set guioptions-=m " No menu
set guioptions-=T " No toolbar
" Inconsolata font for gvim
-set guifont=Inconsolata\ Medium\ 9
+set guifont=Inconsolata\ Medium\ 13
inoremap <C-space> <C-x><C-o>
View
49 haskellmode.config
@@ -1,14 +1,19 @@
--- 7.0.3
+-- 7.4.1
AlternativeLayoutRule
AlternativeLayoutRuleTransitional
Arrows
BangPatterns
+CApiFFI
CPP
ConstrainedClassMethods
+ConstraintKinds
+DataKinds
DatatypeContexts
+DefaultSignatures
DeriveDataTypeable
DeriveFoldable
DeriveFunctor
+DeriveGeneric
DeriveTraversable
DisambiguateRecordFields
DoAndIfThenElse
@@ -21,36 +26,42 @@ FlexibleContexts
FlexibleInstances
ForeignFunctionInterface
FunctionalDependencies
+GADTSyntax
GADTs
GHCForeignImportPrim
GeneralizedNewtypeDeriving
-Generics
Haskell2010
Haskell98
ImplicitParams
ImplicitPrelude
ImpredicativeTypes
IncoherentInstances
+InterruptibleFFI
KindSignatures
LiberalTypeSynonyms
MagicHash
+MonadComprehensions
MonoLocalBinds
MonoPatBinds
MonomorphismRestriction
MultiParamTypeClasses
NPlusKPatterns
NamedFieldPuns
-NewQualifiedOperators
NoAlternativeLayoutRule
NoAlternativeLayoutRuleTransitional
NoArrows
NoBangPatterns
+NoCApiFFI
NoCPP
NoConstrainedClassMethods
+NoConstraintKinds
+NoDataKinds
NoDatatypeContexts
+NoDefaultSignatures
NoDeriveDataTypeable
NoDeriveFoldable
NoDeriveFunctor
+NoDeriveGeneric
NoDeriveTraversable
NoDisambiguateRecordFields
NoDoAndIfThenElse
@@ -63,31 +74,34 @@ NoFlexibleContexts
NoFlexibleInstances
NoForeignFunctionInterface
NoFunctionalDependencies
+NoGADTSyntax
NoGADTs
NoGHCForeignImportPrim
NoGeneralizedNewtypeDeriving
-NoGenerics
NoImplicitParams
NoImplicitPrelude
NoImpredicativeTypes
NoIncoherentInstances
+NoInterruptibleFFI
NoKindSignatures
NoLiberalTypeSynonyms
NoMagicHash
+NoMonadComprehensions
NoMonoLocalBinds
NoMonoPatBinds
NoMonomorphismRestriction
NoMultiParamTypeClasses
NoNPlusKPatterns
NoNamedFieldPuns
-NoNewQualifiedOperators
+NoNondecreasingIndentation
NoOverlappingInstances
NoOverloadedStrings
-NoPArr
NoPackageImports
+NoParallelArrays
NoParallelListComp
NoPatternGuards
NoPatternSignatures
+NoPolyKinds
NoPolymorphicComponents
NoPostfixOperators
NoQuasiQuotes
@@ -97,10 +111,12 @@ NoRebindableSyntax
NoRecordPuns
NoRecordWildCards
NoRecursiveDo
+NoRelaxedLayout
NoRelaxedPolyRec
NoScopedTypeVariables
NoStandaloneDeriving
NoTemplateHaskell
+NoTraditionalRecordSyntax
NoTransformListComp
NoTupleSections
NoTypeFamilies
@@ -111,13 +127,15 @@ NoUndecidableInstances
NoUnicodeSyntax
NoUnliftedFFITypes
NoViewPatterns
+NondecreasingIndentation
OverlappingInstances
OverloadedStrings
-PArr
PackageImports
+ParallelArrays
ParallelListComp
PatternGuards
PatternSignatures
+PolyKinds
PolymorphicComponents
PostfixOperators
QuasiQuotes
@@ -127,11 +145,15 @@ RebindableSyntax
RecordPuns
RecordWildCards
RecursiveDo
+RelaxedLayout
RelaxedPolyRec
+Safe
ScopedTypeVariables
StandaloneDeriving
TemplateHaskell
+TraditionalRecordSyntax
TransformListComp
+Trustworthy
TupleSections
TypeFamilies
TypeOperators
@@ -140,21 +162,21 @@ UnboxedTuples
UndecidableInstances
UnicodeSyntax
UnliftedFFITypes
+Unsafe
ViewPatterns
--
--fasm-mangling
-fdo-lambda-eta-expansion
-fembed-manifest
-fgen-manifest
+-fghci-history
-fghci-sandbox
+-fhelpful-errors
-fignore-interface-pragmas
-fimplicit-import-qualified
--fmethod-sharing
-fno-break-on-error
-fno-break-on-exception
-fno-building-cabal-package
-fno-case-merge
--fno-convert-to-zipper-and-back
-fno-cse
-fno-dicts-cheap
-fno-do-eta-reduction
@@ -170,9 +192,11 @@ ViewPatterns
-fno-ignore-asserts
-fno-liberate-case
-fno-new-codegen
+-fno-pedantic-bottoms
-fno-print-bind-result
-fno-print-evld-with-show
-fno-print-explicit-foralls
+-fno-prof-cafs
-fno-regs-graph
-fno-regs-iterative
-fno-rewrite-rules
@@ -188,23 +212,28 @@ ViewPatterns
-fno-warn-dodgy-exports
-fno-warn-dodgy-imports
-fno-warn-hi-shadowing
+-fno-warn-identities
-fno-warn-implicit-prelude
-fno-warn-incomplete-patterns
-fno-warn-incomplete-record-updates
+-fno-warn-incomplete-uni-patterns
-fno-warn-missing-import-lists
-fno-warn-missing-local-sigs
-fno-warn-missing-signatures
-fno-warn-monomorphism-restriction
-fno-warn-name-shadowing
-fno-warn-orphans
+-fno-warn-safe
-fno-warn-tabs
-fno-warn-type-defaults
+-fno-warn-unsafe
-fno-warn-unused-binds
-fno-warn-unused-do-bind
-fno-warn-unused-imports
-fno-warn-unused-matches
-fomit-interface-pragmas
-fprint-bind-contents
+-fprof-count-entries
-fshared-implib
-fwarn-alternative-layout-rule-transitional
-fwarn-deprecated-flags
View
51 vimrc
@@ -2,9 +2,14 @@
set hidden " For lustyexplorer
" Pathogen requires restarting the filetype plugins
filetype off
-call pathogen#runtime_append_all_bundles()
+" call pathogen#runtime_append_all_bundles()
+
let s:source=globpath(&rtp, "vimrc_example.vim")
+
+" Init vundle
+execute ":source " . globpath(&rtp, "vundlerc")
+
execute ":source " . s:source
unlet s:source
filetype on
@@ -150,7 +155,7 @@ set wildmenu
" Backups
set backup
-set statusline=%<\ %n:%f\ %m%r%y%=%-35.(line:\ %l\ of\ %L,\ col:\ %c%V\ (%P)%)
+set statusline=%<\ %n:%f\ %m%r\ #%b\ %y%=%-35.(line:\ %l\ of\ %L,\ col:\ %c%V\ (%P)%)
set laststatus=2
set backupdir=~/.backup/
@@ -180,7 +185,7 @@ noremap <F2> :GundoToggle<cr>
set guioptions-=m " No menu
set guioptions-=T " No toolbar
" Inconsolata font for gvim
-set guifont=Inconsolata\ Medium\ 9
+set guifont=Inconsolata\ Medium\ 11
" Read project settings
if filereadable(".project.vim")
@@ -193,11 +198,47 @@ autocmd InsertLeave,WinLeave * if exists('w:last_fdm') | let &l:foldmethod=w:las
" Tags handling
" Provide a default for complete tag writing and partial updating
-let g:completetags = "ctags -R ."
-let g:partialtags = "ctags --append % tags"
+let g:completetags = "ctags-exuberant --exclude=Session.vim -R ."
+let g:partialtags = "ctags-exuberant --exclude=Session.vim --append % tags"
autocmd BufNewFile *.* :let b:completetags = g:completetags
autocmd BufNewFile *.* :let b:partialtags = g:partialtags
autocmd BufReadPre *.* :let b:completetags = g:completetags
autocmd BufReadPre *.* :let b:partialtags = g:partialtags
+autocmd BufWritePost *.* :let b:partialtags = g:partialtags
autocmd BufWritePost *.* :silent :execute ":!" . b:partialtags
noremap <F3> :execute ":!" . b:completetags <cr>
+
+" Cscope handling.
+" Enable this only for java for now
+let g:completecscope = "find . -iname '*.java' >> cscope.files && cscope -b"
+let g:partialcscope = "cscope -b"
+let g:cscope_cmd = ""
+autocmd BufWritePost *.java :silent :execute ":!" . g:partialcscope . " && " . b:partialtags
+noremap <F4> :execute ":!" . g:completecscope <cr>
+
+
+" My attempt to simplify some operations. Creating mappings for some common
+" operations
+
+" Text layout mappings
+
+" New items separated by commas to new lines
+noremap <leader>,r mx:s/,/,\r/g<cr>='x
+
+" Inlinexml to formatted xml
+noremap <leader>>< mx:%s/> *</>\r</g<cr>gg=G'x
+
+
+function! RestoreSession()
+ if filereadable("Session.vim")
+ source Session.vim
+ endif
+endfunction
+
+autocmd VimLeave * :mksession!
+
+let g:EclimCompletionMethod = 'omnifunc'
+source ~/.vim/defaultneocomplsettings.vim
+
+" CtrlP config
+let g:ctrlp_cmd = "CtrlPBufTag"
View
34 vundlerc
@@ -0,0 +1,34 @@
+" vim: ft=vim
+set rtp+=~/.vim/bundle/vundle/
+call vundle#rc()
+
+Bundle 'gmarik/vundle'
+Bundle 'sukima/xmledit'
+Bundle 'kien/ctrlp.vim'
+Bundle 'tpope/vim-fugitive'
+Bundle 'sjl/gundo.vim'
+Bundle 'chrisbra/histwin.vim'
+Bundle 'pbrisbin/html-template-syntax'
+Bundle 'pangloss/vim-javascript'
+Bundle 'thinca/vim-localrc'
+Bundle 'sjbach/lusty'
+Bundle 'Shougo/neocomplcache'
+Bundle 'scrooloose/nerdtree'
+Bundle 'MarcWeber/vim-addon-mw-utils'
+Bundle 'tomtom/tlib_vim'
+Bundle 'garbas/vim-snipmate'
+Bundle 'honza/vim-snippets'
+Bundle 'tpope/vim-surround'
+Bundle 'kchmck/vim-coffee-script'
+Bundle 'kablamo/VimDebug'
+Bundle 'jimenezrick/vimerl'
+Bundle 'tomtom/tcomment_vim'
+Bundle 'scrooloose/syntastic'
+
+
+Bundle 'dbext.vim'
+Bundle 'po.vim'
+Bundle 'sessionman.vim'
+Bundle 'slimv.vim'
+Bundle 'Vimchant'
+Bundle 'VimClojure'
Please sign in to comment.
Something went wrong with that request. Please try again.