Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
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: jalcine/vimrc
base: 4147203b03
...
head fork: jalcine/vimrc
compare: 3370fec9ad
  • 5 commits
  • 9 files changed
  • 0 commit comments
  • 1 contributor
View
12 home/.vim/autoload/jalcine/autogroups.vim
@@ -3,7 +3,7 @@
" Description: My auto-groups and auto-commands for Vim.
" Last Modified: February 01, 2014
-function! jalcine#autogroups#set()
+func! jalcine#autogroups#set()
" Update appropriate files when I update them.
augroup autosourcecfg
au!
@@ -47,14 +47,14 @@ func! jalcine#autogroups#bind_konsole()
augroup END
endfunction
-
-function! jalcine#autogroups#reload()
+func! jalcine#autogroups#reload()
let cs = g:colors_name
echomsg "[jalcine.vim] Resourcing primary configuration..."
source $MYVIMRC
echomsg "[jalcine.vim] Resourcing jalcine.vim..."
source $HOME/.vim/autoload/jalcine.vim
for file_path in glob('$HOME/.vim/autoload/jalcine/*.vim', 0, 1)
+ echomsg "[jalcine.vim] Resourcing '" . file_path . "'..."
exec('source ' . file_path)
endfor
@@ -62,9 +62,9 @@ function! jalcine#autogroups#reload()
call jalcine#roll_out()
exec('colorscheme '. cs)
echomsg "[jalcine.vim] Configuration sourced."
-endfunction
+endfunc
-function! s:load_current_buffer()
+func! s:load_current_buffer()
if &ft == 'vim'
source %
echomsg "[jalcine.vim] Loaded local Vim configuration."
@@ -73,7 +73,7 @@ function! s:load_current_buffer()
endif
endfunction
-function! jalcine#autogroups#reload_tmux()
+func! jalcine#autogroups#reload_tmux()
call system('tmux source-file '. expand('%:p'))
call system("tmux display-message '[jalcine.vim] Configuration of tmux " .
\ "reloaded using ". expand('%:p') . ".'")
View
16 home/.vim/autoload/jalcine/colors.vim
@@ -2,7 +2,6 @@
" Author: Jacky Alciné <me@jalcine.me>
" Description: Controls logic for coloring.
" Last Modified: 2014-01-31 03:20:54 EST
-" This is the color matrix. Wake up, Neo.
func! jalcine#colors#rotate()
let zi = index(keys(g:coloring), g:coloring_current)
@@ -19,15 +18,16 @@ func! jalcine#colors#apply(the_profile)
let color_opts = g:coloring[a:the_profile]
silent exec('colorscheme ' . color_opts.colorscheme)
call airline#switch_theme(color_opts.airline)
+ let g:coloring_current = a:the_profile
" Do some work to the color themes to make it look nicer. Most themes don't
" do this.
hi Folded ctermbg=NONE
hi Number ctermbg=NONE
hi SignColumn ctermbg=NONE
- hi Error ctermfg=15 ctermbg=NONE
hi VertSplit ctermbg=NONE
- let g:coloring_current = a:the_profile
+ hi Comment ctermbg=NONE
+ hi LineNr ctermbg=NONE
endfunc
function! jalcine#colors#detect()
@@ -39,10 +39,14 @@ function! jalcine#colors#detect()
endif
endfunction
-function! jalcine#colors#complete(ArgLead, CmdLine, CursorPos)
- return keys(g:coloring)
+function! s:complete_colors(ArgLead, CmdLine, CursorPos)
+ let l:keys = sort(keys(g:coloring))
+ if !empty(a:ArgLead)
+ call filter(l:keys, 'stridx(v:val,"' . a:CmdLine . '")')
+ endif
+ return l:keys
endfunction
" Add a lil' command.
-command! -nargs=1 -complete=customlist,jalcine#colors#complete ApplyColoring
+command! -nargs=1 -complete=customlist,s:complete_colors ApplyColoring
\ :call jalcine#colors#apply("<args>")
View
61 home/.vim/autoload/jalcine/mappings.vim
@@ -3,7 +3,21 @@
" Description: Definitions of mappings in the application.
" Last Modified: 2014-01-31 02:29:05 EST
-function! jalcine#mappings#apply(level)
+func! s:VimuxRepl()
+ call VimuxSendText(@v)
+ call VimuxSendKeys("<Enter>")
+endfunction
+
+func! s:build_current_project()
+ if cmake#util#has_project()
+ call cmake#commands#build_current()
+ else
+ " TODO Add more kinds of projects in the future.
+ make()
+ endif
+endfunc
+
+func! jalcine#mappings#apply(level)
if a:level == 'general'
call jalcine#mappings#apply_general()
elseif a:level == 'plugin'
@@ -14,7 +28,7 @@ endfunction
call unite#filters#matcher_default#use(['matcher_fuzzy'])
call unite#filters#sorter_default#use(['sorter_length'])
-function! jalcine#mappings#invoke_unite(scope)
+func! jalcine#mappings#invoke_unite(scope)
let sources=g:jalcine_unite_sources
let options=g:jalcine_unite_options
@@ -43,6 +57,8 @@ function! jalcine#mappings#invoke_unite(scope)
\ 'rails/heroku rails/view rails/stylesheet rails/schema rails/rake'
elseif a:scope == 'tags'
let sources = 'tag tag/file tag/include'
+ elseif a:scope == 'tmux'
+ let sources = 'tmux/panes tmux/sessions tmux/windows'
elseif a:scope == 'files'
let sources = 'file_rec/async:! directory_rec/async:!'
endif
@@ -50,16 +66,16 @@ function! jalcine#mappings#invoke_unite(scope)
exec(':Unite ' . options . ' ' . sources)
endfunction
-function! jalcine#mappings#define_for_unite()
- imap <buffer> <C-k> <Plug>(unite_select_previous_line)
- imap <buffer> <C-j> <Plug>(unite_select_next_line)
- imap <buffer> <C-i> <Plug>(unite_toggle_auto_preview)
- imap <silent><buffer><expr> <C-x> unite#do_action('split')
- imap <silent><buffer><expr> <C-v> unite#do_action('vsplit')
- imap <silent><buffer><expr> <C-t> unite#do_action('tabopen')
+func! jalcine#mappings#define_for_unite()
+ imap <buffer> <C-k> <Plug>(unite_select_previous_line)
+ imap <buffer> <C-j> <Plug>(unite_select_next_line)
+ imap <buffer> <C-i> <Plug>(unite_toggle_auto_preview)
+ imap <silent><buffer><expr> <C-x> :call unite#do_action('split')<CR>
+ imap <silent><buffer><expr> <C-v> :call unite#do_action('vsplit')<CR>
+ imap <silent><buffer><expr> <C-t> :call unite#do_action('tabopen')<CR>
endfunction
-function! jalcine#mappings#apply_plugin()
+func! jalcine#mappings#apply_plugin()
" Reload the configuration.
nnoremap <F5> :call jalcine#autogroups#reload()<cr>
@@ -69,12 +85,14 @@ function! jalcine#mappings#apply_plugin()
" Make it easy to get to things I'd use more than once.
nnoremap <silent><F6> :TagbarToggle<CR>
nnoremap <silent><F7> :NERDTreeToggle<CR>
+ nnoremap <silent><F8> :call s:build_current_project()<CR>
" INVOKE UNITE.
nnoremap <silent><leader>p :call jalcine#mappings#invoke_unite('general')<CR>
nnoremap <silent><leader>pr :call jalcine#mappings#invoke_unite('rails')<CR>
nnoremap <silent><leader>pt :call jalcine#mappings#invoke_unite('tags')<CR>
nnoremap <silent><leader>pf :call jalcine#mappings#invoke_unite('files')<CR>
+ nnoremap <silent><leader>px :call jalcine#mappings#invoke_unite('tmux')<CR>
"{{{ Tabularize
vnoremap <leader>a: :Tabularize /:<CR>
@@ -86,12 +104,14 @@ function! jalcine#mappings#apply_plugin()
"}}}
"{{{ Vimux
- nnoremap <Leader>to :VimuxOpenPane<CR>
- nnoremap <Leader>tp :VimuxPromptCommand<CR>
- nnoremap <Leader>tt :VimuxRunLastCommand<CR>
- nnoremap <Leader>tc :VimuxCloseRunner<CR>
- vnoremap <Leader>ts "vy :call s:VimuxRepl()<CR>
- nnoremap <Leader>ts vip<LocalLeader>ts<CR>
+ nnoremap <leader>to :VimuxOpenPane<CR>
+ nnoremap <leader>tp :VimuxPromptCommand<CR>
+ nnoremap <leader>tt :VimuxRunLastCommand<CR>
+ nnoremap <leader>tc :VimuxCloseRunner<CR>
+ vnoremap <leader>ts "vy :call s:VimuxRepl()<CR>
+ nnoremap <leader>ts vip<LocalLeader>ts<CR>
+ nnoremap <leader>t<Up> :VimuxScrollUpInspect<CR>
+ nnoremap <leader>t<Down> :VimuxScrollDownInspect<CR>
" Git helpers
nnoremap <leader>gc :Git commit<space>
@@ -103,15 +123,9 @@ function! jalcine#mappings#apply_plugin()
nnoremap <leader>grmc :Git rm --cached %<CR>
nnoremap <leader>gab :Git add %<cr>
nnoremap <leader>ga :Git add<space>
-
-endfunction
-
-function! s:VimuxRepl()
- call VimuxSendText(@v)
- call VimuxSendKeys("<Enter>")
endfunction
-function! jalcine#mappings#apply_general()
+func! jalcine#mappings#apply_general()
" One less key to press to enter the Vim shell.
nnoremap ; :
@@ -167,6 +181,7 @@ function! jalcine#mappings#apply_general()
nnoremap <leader>co <ESC>:cwindow<CR>
nnoremap <leader>cf <ESC>:cfirst<CR>
nnoremap <leader>cl <ESC>:clast<CR>
+ nnoremap <leader>cx <ESC>:cclose<CR>
" Rewrite 'vhe' to 'vert help'.
cnoremap vhe vert help
View
99 home/.vim/autoload/jalcine/plugins.vim
@@ -3,14 +3,14 @@
" Description: Logic to control the use of plug-ins in Vim.
" Last Modified: 2013-01-31 02:46:56 EST
-function! jalcine#plugins#setup()
+func! jalcine#plugins#setup()
call jalcine#plugins#prep()
call jalcine#plugins#load()
call jalcine#plugins#set_options()
call jalcine#mappings#apply('plugin')
endfunction
-function! jalcine#plugins#prep()
+func! jalcine#plugins#prep()
" Grabbed something: https://web.archive.org/web/20130127003932/http://www.erikzaadi.com/2012/03/19/auto-installing-vundle-from-your-vimrc/
" Setting up Vundle - the vim plugin bundler
let iCanHazVundle=1
@@ -23,13 +23,13 @@ function! jalcine#plugins#prep()
call jalcine#plugins#load()
:BundleInstall!
echo "[jalcine.vim] Building native extensions..\n"
- silent !cd $HOME/.vim/bundle/YouCompleteMe && ./install.sh --clang-completer --omnisharp-completer
+ silent !cd $HOME/.vim/bundle/YouCompleteMe && ./install.sh --clang-completer --omnisharp-completer --system-libclang
silent !cd $HOME/.vim/bundle/vimproc.vim && make
echo "[jalcine.vim] Thanks for flying Vim, come again.\n"
endif
endfunction
-function! jalcine#plugins#load()
+func! jalcine#plugins#load()
" No more.
filetype off
@@ -153,7 +153,7 @@ function! jalcine#plugins#load()
syntax on
endfunction
-function! jalcine#plugins#set_options()
+func! jalcine#plugins#set_options()
"{{{ User Info
let g:author='Jacky Alciné'
let g:email='me@jalcine.me'
@@ -163,7 +163,8 @@ function! jalcine#plugins#set_options()
let g:used_javascript_libs='underscore,backbone,jquery'
let g:snips_author=g:author
- let g:cmake_use_vimux=0
+ let g:cmake_use_vimux=1
+ let g:cmake_use_dispatch=1
let g:cmake_build_shared_libs=1
let g:cmake_set_makeprg=1
let g:cmake_inject_flags={
@@ -174,6 +175,7 @@ function! jalcine#plugins#set_options()
"{{{ Airline config
let g:airline_detect_modified=1
let g:airline_powerline_fonts=1
+ let g:airline_detect_iminsert=1
let g:airline#extensions#hunks#non_zero_only=1
let g:airline#extensions#tabline#enabled=1
let g:airline#extensions#tabline#tab_nr_type=1
@@ -181,26 +183,41 @@ function! jalcine#plugins#set_options()
let g:airline#extensions#branch#enabled=1
let g:airline#extensions#branch#empty_message=''
let g:airline#extensions#whitespace#enabled=0
+ let g:airline_exclude_preview=1
+ let g:airline_mode_map={
+ \ '__' : '-',
+ \ 'n' : 'N',
+ \ 'i' : 'I',
+ \ 'R' : 'R',
+ \ 'c' : 'C',
+ \ 'v' : 'V',
+ \ 'V' : 'V',
+ \ '' : 'V',
+ \ 's' : 'S',
+ \ 'S' : 'S',
+ \ '' : 'S'
+ \ }
"{{{ YouCompleteMe
let g:ycm_collect_identifiers_from_tags_files=1
- let g:ycm_autoclose_preview_window_after_completion=1
- let g:ycm_autoclose_preview_window_after_insertion=1
- let g:ycm_global_ycm_extra_conf = '$HOME/.ycm_extra_conf.py'
+ let g:ycm_autoclose_preview_window_after_completion=0
+ let g:ycm_autoclose_preview_window_after_insertion=0
+ let g:ycm_global_ycm_extra_conf='$HOME/.ycm_extra_conf.py'
let g:ycm_confirm_extra_conf=0
let g:ycm_seed_identifiers_with_syntax=1
let g:ycm_server_use_vim_stdout=0
let g:ycm_use_utlisnips_completer=1
- let g:ycm_add_preview_to_completeopt=1
- let g:ycm_semantic_triggers = {
- \ 'c' : [ '->', '.', '(', ',', '='],
- \ 'cpp,objcpp' : [ '->', '.', '::', '(',',', '=', '+'],
- \ 'perl' : [ '->', '(', '::', ','],
- \ 'php' : [ '->', '::', '(', '='],
- \ 'cs,java,javascript,d,vim,python,perl6,scala,vb,elixir,go' : [ '.', '(', '=', '/', '+'],
- \ 'ruby' : [ '.', '::', '(', '{', '=', '+', '-', '/'],
- \ 'lua' : [ '.', ':'],
- \ 'erlang' : [ ':'],
+ let g:ycm_cache_omnifunc=0
+ let g:ycm_complete_in_strings=1
+ let g:ycm_add_preview_to_completeopt=0
+ let g:ycm_semantic_triggers= {
+ \ 'c' : [ '->', '.', '(', ',', '='],
+ \ 'cpp,objcpp' : [ '->', '.', ':: ', '(',',', '=', '+'],
+ \ 'perl' : [ '->', '(', ':: ', ','],
+ \ 'php' : [ '->', '::', '(', '='],
+ \ 'ruby' : [ '.', '::', '(', '{', '=', '+', '-', '/'],
+ \ 'lua' : [ '.', ':'],
+ \ 'erlang' : [ ':'],
\ }
"{{{ Syntastic options
@@ -237,7 +254,7 @@ function! jalcine#plugins#set_options()
\ '--hidden -g ""'
endif
let g:unite_prompt='➤ '
- let g:jalcine_unite_options='-buffer-name=VIM ' .
+ let g:jalcine_unite_options='-buffer-name=jalcine ' .
\ '-immediately -complete -unique'
let g:jalcine_unite_sources='file_rec/async:! file_mru:! buffer ' .
\ 'tag tag/file tag/include:! ' .
@@ -277,11 +294,11 @@ function! jalcine#plugins#set_options()
let g:UltiSnipsExpandTrigger="<C-l>"
let g:UltiSnipsJumpForwardTrigger="<C-j>"
let g:UltiSnipsJumpBackwardTrigger="<C-k>"
- let g:UltiSnipsSnippetDirectories=["UltiSnips", "snippets"]
+ "let g:UltiSnipsSnippetDirectories=["UltiSnips"]
"{{{ Android
- let g:android_default_package_path = "me.jalcine"
- let g:android_default_project_path = "$HOME/Development/Projects"
+ let g:android_default_package_path="me.jalcine"
+ let g:android_default_project_path="$HOME/Development/Projects"
"{{{ GitHub configuration
let g:github_user=g:username
@@ -313,7 +330,7 @@ function! jalcine#plugins#set_options()
"{{{ Tagbar
let g:tagbar_compact=1
let g:tagbar_autoshowtag=1
- let g:tagbar_type_markdown = {
+ let g:tagbar_type_markdown={
\ 'ctagstype' : 'markdown',
\ 'kinds' : [
\ 'h:Heading_L1',
@@ -321,23 +338,7 @@ function! jalcine#plugins#set_options()
\ 'k:Heading_L3'
\ ]
\ }
- let g:tagbar_type_cpp = {
- \ 'kinds' : [
- \ 'd:macros:1:0',
- \ 'p:prototypes:1:0',
- \ 'g:enums',
- \ 'e:enumerators:0:0',
- \ 't:typedefs:0:0',
- \ 'n:namespaces',
- \ 'c:classes',
- \ 's:structs',
- \ 'u:unions',
- \ 'f:function!s',
- \ 'm:members:0:0',
- \ 'v:variables:0:0',
- \ ],
- \ }
- let g:tagbar_type_coffee = {
+ let g:tagbar_type_coffee={
\ 'ctagsbin' : 'coffeetags',
\ 'ctagsargs' : '',
\ 'kinds' : [
@@ -350,10 +351,8 @@ function! jalcine#plugins#set_options()
\ 'o' : 'object',
\ }
\ }
-
let g:extradite_showhash=1
-
- let g:rails_projections = {
+ let g:rails_projections={
\ "app/uploaders/*_uploader.rb": {
\ "command": "uploader",
\ "template":
@@ -368,7 +367,7 @@ function! jalcine#plugins#set_options()
\ "features/support/env.rb": {"command": "support"}}
"{{{ Signify
- let g:signify_vcs_list = ['git','hg','svn','bzr']
+ let g:signify_vcs_list=['git','hg','svn','bzr']
let g:signify_sign_overwrite=1
let g:signify_line_highlight=0
let g:signify_update_on_focusgained=1
@@ -380,7 +379,7 @@ function! jalcine#plugins#set_options()
let g:signify_cursorhold_insert=0
"}}}
- let g:coloring = {
+ let g:coloring={
\ 'Tomorrow' : {
\ 'colorscheme' : 'Tomorrow-Night',
\ 'airline' : 'tomorrow'
@@ -425,13 +424,17 @@ function! jalcine#plugins#set_options()
\ 'colorscheme' : 'badwolf',
\ 'airline' : 'badwolf'
\ },
+ \ 'Understated' : {
+ \ 'colorscheme' : 'understated',
+ \ 'airline' : 'understated'
+ \ },
\ 'Obsidian' : {
\ 'colorscheme' : 'obsidian',
\ 'airline' : 'laederon'
\ },
\ 'Defacto' : {
- \ 'colorscheme' : 'xoria256',
- \ 'airline' : 'ubaryd'
+ \ 'colorscheme' : 'forneus',
+ \ 'airline' : 'murmur'
\ }
\ }
endfunction
View
6 home/.vim/autoload/jalcine/tags.vim
@@ -1,6 +0,0 @@
-" File: plugins/tags.vim
-" Author: Jacky Alciné <me@jalcine.me>
-" Description: Making tags be more awesome to me in Vim.
-" Last Modified: 2014-01-31 03:02:22 EST
-
-
View
15 home/.vim/dict.custom.utf8-8.add
@@ -21,7 +21,6 @@ Change's
CoffeeScript
HAML
refactor
-magellan
Dolla
dolla
kapish
@@ -29,13 +28,10 @@ weechat
IRC
vcprompt
diff
-whatchanged
vim
facebook
jQuery
jquery
-#ittykate39/!
-#ittykate39/!
Vundle
gplus
linkedin
@@ -43,7 +39,6 @@ isnt
desktop
desktop
web
-conslidate
blog
jpg
ActionController
@@ -66,3 +61,13 @@ autogroups
app
Symfony
blogosphere
+px
+Choqok
+blogging
+Shortspeak
+KDE
+API
+kde
+APIs
+KDE4
+Qt4
View
BIN  home/.vim/dict.custom.utf8-8.add.spl
Binary file not shown
View
13 home/.vim/syntax/astylerc.vim
@@ -0,0 +1,13 @@
+if exists("b:current_syntax")
+ finish
+endif
+
+syn case match
+
+hi def link aStyleOption Keyword
+hi def link aStyleComment Comment
+
+syn keyword aStyleOption indent-switches= indent-cases= pad-oper= pad-paren=
+syn keyword aStyleOption pad-header convert-tabs delete-empty-lines align-pointer
+syn keyword aStyleOption add-one-line-brackets add-brackets
+syn region aStyleComment start="#" end="$"
View
2  home/.vimrc
@@ -119,7 +119,7 @@ set foldcolumn=1
" Sets the minimum amount of lines needed to
" automatically initialize folding.
-set foldminlines=8
+set foldminlines=3
" Set the title in the terminal.
set title

No commit comments for this range

Something went wrong with that request. Please try again.