mirror of https://github.com/bjeanes/dotfiles.git
A few new bundles to experiment with
parent
d0913a35ab
commit
cb9f2db878
|
|
@ -0,0 +1 @@
|
|||
Subproject commit 0b075cf5e6ef05584ef6377e116e8d0fe1f8f788
|
||||
|
|
@ -0,0 +1 @@
|
|||
Subproject commit 890e5b1bbf1cf3e39da0cdd4104aea2a98aeb45a
|
||||
|
|
@ -0,0 +1 @@
|
|||
Subproject commit ba86e07d00f170c81ed2ff10cbb06a253f8e6f8d
|
||||
|
|
@ -0,0 +1 @@
|
|||
Subproject commit 39b8298390a9171c796df077ad3c5f3c0f111c56
|
||||
|
|
@ -0,0 +1 @@
|
|||
Subproject commit 960332efb18f69704e44983a774ef9a18b6efd32
|
||||
|
|
@ -0,0 +1 @@
|
|||
Subproject commit 667a668e114e9ec0e5d4cbcb0962d835b23614c4
|
||||
|
|
@ -0,0 +1 @@
|
|||
Subproject commit 5a06bf807d439f71c47c0f640fefbd46ffe10e18
|
||||
|
|
@ -0,0 +1 @@
|
|||
Subproject commit 7d271ba55820a4becb5028b74f5502b0e3e00641
|
||||
|
|
@ -17,6 +17,7 @@ call vundle#rc()
|
|||
Bundle 'tpope/vim-rake'
|
||||
Bundle 'tpope/vim-rails'
|
||||
Bundle 'tpope/vim-haml'
|
||||
Bundle 'ecomba/vim-ruby-refactoring'
|
||||
|
||||
" temporarily disable due to speed issues
|
||||
" see: https://github.com/tpope/vim-bundler/issues/4
|
||||
|
|
@ -50,9 +51,16 @@ call vundle#rc()
|
|||
|
||||
" Utility {{{
|
||||
|
||||
Bundle "tpope/vim-surround"
|
||||
Bundle 'majutsushi/tagbar'
|
||||
Bundle 'tpope/vim-surround'
|
||||
Bundle 'millermedeiros/vim-statline'
|
||||
Bundle 'Gundo'
|
||||
Bundle 'Lokaltog/vim-easymotion'
|
||||
Bundle 'Raimondi/delimitMate'
|
||||
Bundle 'AutoComplPop'
|
||||
Bundle 'ShowMarks7'
|
||||
|
||||
Bundle "kien/rainbow_parentheses.vim"
|
||||
Bundle 'kien/rainbow_parentheses.vim'
|
||||
autocmd VimEnter * RainbowParenthesesToggle
|
||||
autocmd Syntax * RainbowParenthesesLoadRound
|
||||
autocmd Syntax * RainbowParenthesesLoadSquare
|
||||
|
|
|
|||
|
|
@ -0,0 +1,212 @@
|
|||
" Vim color file
|
||||
"
|
||||
" Author: Tomas Restrepo <tomas@winterdom.com>
|
||||
"
|
||||
" Note: Based on the monokai theme for textmate
|
||||
" by Wimer Hazenberg and its darker variant
|
||||
" by Hamish Stuart Macpherson
|
||||
"
|
||||
" A few additional edits by Mac (http://veryhappythings.github.com)
|
||||
|
||||
hi clear
|
||||
|
||||
set background=dark
|
||||
if version > 580
|
||||
" no guarantees for version 5.8 and below, but this makes it stop
|
||||
" complaining
|
||||
hi clear
|
||||
if exists("syntax_on")
|
||||
syntax reset
|
||||
endif
|
||||
endif
|
||||
let g:colors_name="molokai_mac"
|
||||
|
||||
if exists("g:molokai_original")
|
||||
let s:molokai_original = g:molokai_original
|
||||
else
|
||||
let s:molokai_original = 0
|
||||
endif
|
||||
|
||||
|
||||
hi Boolean guifg=#AE81FF
|
||||
hi Character guifg=#E6DB74
|
||||
hi Number guifg=#AE81FF
|
||||
hi String guifg=#E6DB74
|
||||
hi Conditional guifg=#D06189 gui=bold
|
||||
hi Constant guifg=#AE81FF gui=bold
|
||||
hi Cursor guifg=#000000 guibg=#F8F8F0
|
||||
hi Debug guifg=#BCA3A3 gui=bold
|
||||
hi Define guifg=#66D9EF
|
||||
hi Delimiter guifg=#8F8F8F
|
||||
hi DiffAdd guibg=#13354A
|
||||
hi DiffChange guifg=#89807D guibg=#4C4745
|
||||
hi DiffDelete guifg=#960050 guibg=#1E0010
|
||||
hi DiffText guibg=#4C4745 gui=italic,bold
|
||||
|
||||
hi Directory guifg=#A6E22E gui=bold
|
||||
hi Error guifg=#960050 guibg=#1E0010
|
||||
hi ErrorMsg guifg=#F92672 guibg=#232526 gui=bold
|
||||
hi Exception guifg=#A6E22E gui=bold
|
||||
hi Float guifg=#AE81FF
|
||||
hi FoldColumn guifg=#465457 guibg=#000000
|
||||
hi Folded guifg=#465457 guibg=#000000
|
||||
hi Function guifg=#A6E22E
|
||||
hi Identifier guifg=#FD971F
|
||||
hi Ignore guifg=#808080 guibg=bg
|
||||
hi IncSearch guifg=#C4BE89 guibg=#000000
|
||||
|
||||
hi Keyword guifg=#F977B3 gui=bold
|
||||
hi Label guifg=#E6DB74 gui=none
|
||||
hi Macro guifg=#C4BE89 gui=italic
|
||||
hi SpecialKey guifg=#66D9EF gui=bold
|
||||
|
||||
hi MatchParen guifg=#000000 guibg=#DD770D gui=bold
|
||||
hi ModeMsg guifg=#E6DB74
|
||||
hi MoreMsg guifg=#E6DB74
|
||||
hi Operator guifg=#F92672
|
||||
|
||||
" complete menu
|
||||
hi Pmenu guifg=#66D9EF guibg=#000000
|
||||
hi PmenuSel guibg=#808080
|
||||
hi PmenuSbar guibg=#080808
|
||||
hi PmenuThumb guifg=#66D9EF
|
||||
|
||||
hi PreCondit guifg=#A6E22E gui=bold
|
||||
hi PreProc guifg=#A6E22E
|
||||
hi Question guifg=#66D9EF
|
||||
hi Repeat guifg=#F92672 gui=bold
|
||||
hi Search guifg=#FFFFFF guibg=#455354
|
||||
" marks column
|
||||
hi SignColumn guifg=#A6E22E guibg=#232526
|
||||
hi SpecialChar guifg=#F92672 gui=bold
|
||||
hi SpecialComment guifg=#465457 gui=bold
|
||||
hi Special guifg=#66D9EF guibg=bg gui=italic
|
||||
hi SpecialKey guifg=#888A85 gui=italic
|
||||
if has("spell")
|
||||
hi SpellBad guisp=#FF0000 gui=undercurl
|
||||
hi SpellCap guisp=#7070F0 gui=undercurl
|
||||
hi SpellLocal guisp=#70F0F0 gui=undercurl
|
||||
hi SpellRare guisp=#FFFFFF gui=undercurl
|
||||
endif
|
||||
hi Statement guifg=#E27B9D
|
||||
hi StatusLine guifg=#455354 guibg=fg
|
||||
hi StatusLineNC guifg=#808080 guibg=#080808
|
||||
hi StorageClass guifg=#FD971F gui=italic
|
||||
hi Structure guifg=#66D9EF
|
||||
hi Tag guifg=#F92672 gui=italic
|
||||
hi Title guifg=#ef5939
|
||||
hi Todo guifg=#FFFFFF guibg=bg gui=bold
|
||||
|
||||
hi Typedef guifg=#66D9EF
|
||||
hi Type guifg=#66D9EF gui=none
|
||||
hi Underlined guifg=#808080 gui=underline
|
||||
|
||||
hi VertSplit guifg=#808080 guibg=#080808 gui=bold
|
||||
hi VisualNOS guibg=#403D3D
|
||||
hi Visual guibg=#403D3D
|
||||
hi WarningMsg guifg=#FFFFFF guibg=#333333 gui=bold
|
||||
hi WildMenu guifg=#66D9EF guibg=#000000
|
||||
|
||||
if s:molokai_original == 1
|
||||
hi Normal guifg=#F8F8F2 guibg=#272822
|
||||
hi Comment guifg=#938E77
|
||||
hi CursorLine guibg=#3E3D32
|
||||
hi CursorColumn guibg=#3E3D32
|
||||
hi LineNr guifg=#BCBCBC guibg=#3B3A32
|
||||
hi NonText guifg=#BCBCBC guibg=#3B3A32
|
||||
else
|
||||
hi Normal guifg=#F8F8F2 guibg=#1B1D1E
|
||||
hi Comment guifg=#465457
|
||||
hi CursorLine guibg=#293739
|
||||
hi CursorColumn guibg=#293739
|
||||
hi LineNr guifg=#BCBCBC guibg=#232526
|
||||
hi NonText guifg=#BCBCBC guibg=#232526
|
||||
end
|
||||
|
||||
"
|
||||
" Support for 256-color terminal
|
||||
"
|
||||
if &t_Co > 255
|
||||
hi Boolean ctermfg=135
|
||||
hi Character ctermfg=144
|
||||
hi Number ctermfg=135
|
||||
hi String ctermfg=144
|
||||
hi Conditional ctermfg=161 cterm=bold
|
||||
hi Constant ctermfg=135 cterm=bold
|
||||
hi Cursor ctermfg=16 ctermbg=253
|
||||
hi Debug ctermfg=225 cterm=bold
|
||||
hi Define ctermfg=81
|
||||
hi Delimiter ctermfg=241
|
||||
|
||||
hi DiffAdd ctermbg=24
|
||||
hi DiffChange ctermfg=181 ctermbg=239
|
||||
hi DiffDelete ctermfg=162 ctermbg=53
|
||||
hi DiffText ctermbg=102 cterm=bold
|
||||
|
||||
hi Directory ctermfg=118 cterm=bold
|
||||
hi Error ctermfg=219 ctermbg=89
|
||||
hi ErrorMsg ctermfg=199 ctermbg=16 cterm=bold
|
||||
hi Exception ctermfg=118 cterm=bold
|
||||
hi Float ctermfg=135
|
||||
hi FoldColumn ctermfg=67 ctermbg=16
|
||||
hi Folded ctermfg=67 ctermbg=16
|
||||
hi Function ctermfg=118
|
||||
hi Identifier ctermfg=208
|
||||
hi Ignore ctermfg=244 ctermbg=232
|
||||
hi IncSearch ctermfg=193 ctermbg=16
|
||||
|
||||
hi Keyword ctermfg=161 cterm=bold
|
||||
hi Label ctermfg=229 cterm=none
|
||||
hi Macro ctermfg=193
|
||||
hi SpecialKey ctermfg=81
|
||||
|
||||
hi MatchParen ctermfg=16 ctermbg=208 cterm=bold
|
||||
hi ModeMsg ctermfg=229
|
||||
hi MoreMsg ctermfg=229
|
||||
hi Operator ctermfg=161
|
||||
|
||||
" complete menu
|
||||
hi Pmenu ctermfg=81 ctermbg=16
|
||||
hi PmenuSel ctermbg=244
|
||||
hi PmenuSbar ctermbg=232
|
||||
hi PmenuThumb ctermfg=81
|
||||
|
||||
hi PreCondit ctermfg=118 cterm=bold
|
||||
hi PreProc ctermfg=118
|
||||
hi Question ctermfg=81
|
||||
hi Repeat ctermfg=161 cterm=bold
|
||||
hi Search ctermfg=253 ctermbg=66
|
||||
|
||||
" marks column
|
||||
hi SignColumn ctermfg=118 ctermbg=235
|
||||
hi SpecialChar ctermfg=161 cterm=bold
|
||||
hi SpecialComment ctermfg=245 cterm=bold
|
||||
hi Special ctermfg=81 ctermbg=232
|
||||
hi SpecialKey ctermfg=245
|
||||
|
||||
hi Statement ctermfg=161 cterm=bold
|
||||
hi StatusLine ctermfg=238 ctermbg=253
|
||||
hi StatusLineNC ctermfg=244 ctermbg=232
|
||||
hi StorageClass ctermfg=208
|
||||
hi Structure ctermfg=81
|
||||
hi Tag ctermfg=161
|
||||
hi Title ctermfg=166
|
||||
hi Todo ctermfg=231 ctermbg=232 cterm=bold
|
||||
|
||||
hi Typedef ctermfg=81
|
||||
hi Type ctermfg=81 cterm=none
|
||||
hi Underlined ctermfg=244 cterm=underline
|
||||
|
||||
hi VertSplit ctermfg=244 ctermbg=232 cterm=bold
|
||||
hi VisualNOS ctermbg=238
|
||||
hi Visual ctermbg=235
|
||||
hi WarningMsg ctermfg=231 ctermbg=238 cterm=bold
|
||||
hi WildMenu ctermfg=81 ctermbg=16
|
||||
|
||||
hi Normal ctermfg=252 ctermbg=233
|
||||
hi Comment ctermfg=59
|
||||
hi CursorLine ctermbg=234 cterm=none
|
||||
hi CursorColumn ctermbg=234
|
||||
hi LineNr ctermfg=250 ctermbg=234
|
||||
hi NonText ctermfg=250 ctermbg=234
|
||||
end
|
||||
|
|
@ -0,0 +1,104 @@
|
|||
" Vim syntax file
|
||||
" Language: tmux(1) configuration file
|
||||
" Maintainer: Tiago Cunha <me@tiagocunha.org>
|
||||
" Last Change: $Date: 2010-07-27 18:29:07 $
|
||||
" License: This file is placed in the public domain.
|
||||
|
||||
if version < 600
|
||||
syntax clear
|
||||
elseif exists("b:current_syntax")
|
||||
finish
|
||||
endif
|
||||
|
||||
setlocal iskeyword+=-
|
||||
syntax case match
|
||||
|
||||
syn keyword tmuxAction any current none
|
||||
syn keyword tmuxBoolean off on
|
||||
|
||||
syn keyword tmuxCmds detach[-client] ls list-sessions neww new-window
|
||||
syn keyword tmuxCmds bind[-key] unbind[-key] prev[ious-window] last[-window]
|
||||
syn keyword tmuxCmds lsk list-keys set[-option] renamew rename-window selectw
|
||||
syn keyword tmuxCmds select-window lsw list-windows attach[-session]
|
||||
syn keyword tmuxCmds send-prefix refresh[-client] killw kill-window lsc
|
||||
syn keyword tmuxCmds list-clients linkw link-window unlinkw unlink-window
|
||||
syn keyword tmuxCmds next[-window] send[-keys] swapw swap-window
|
||||
syn keyword tmuxCmds rename[-session] kill-session switchc switch-client
|
||||
syn keyword tmuxCmds has[-session] copy-mode pasteb paste-buffer
|
||||
syn keyword tmuxCmds new[-session] start[-server] kill-server setw
|
||||
syn keyword tmuxCmds set-window-option show[-options] showw show-window-options
|
||||
syn keyword tmuxCmds command-prompt setb set-buffer showb show-buffer lsb
|
||||
syn keyword tmuxCmds list-buffers deleteb delete-buffer lscm list-commands
|
||||
syn keyword tmuxCmds movew move-window respawnw respawn-window
|
||||
syn keyword tmuxCmds source[-file] info server-info clock-mode lock[-server]
|
||||
syn keyword tmuxCmds saveb save-buffer killp
|
||||
syn keyword tmuxCmds kill-pane resizep resize-pane selectp select-pane swapp
|
||||
syn keyword tmuxCmds swap-pane splitw split-window choose-session
|
||||
syn keyword tmuxCmds choose-window loadb load-buffer copyb copy-buffer suspendc
|
||||
syn keyword tmuxCmds suspend-client findw find-window breakp break-pane nextl
|
||||
syn keyword tmuxCmds next-layout rotatew rotate-window confirm[-before]
|
||||
syn keyword tmuxCmds clearhist clear-history selectl select-layout if[-shell]
|
||||
syn keyword tmuxCmds display[-message] setenv set-environment showenv
|
||||
syn keyword tmuxCmds show-environment choose-client displayp display-panes
|
||||
syn keyword tmuxCmds run[-shell] lockc lock-client locks lock-session lsp
|
||||
syn keyword tmuxCmds list-panes pipep pipe-pane showmsgs show-messages capturep
|
||||
syn keyword tmuxCmds capture-pane joinp join-pane choose-buffer
|
||||
|
||||
syn keyword tmuxOptsSet prefix status status-fg status-bg bell-action
|
||||
syn keyword tmuxOptsSet default-command history-limit status-left status-right
|
||||
syn keyword tmuxOptsSet status-interval set-titles display-time buffer-limit
|
||||
syn keyword tmuxOptsSet status-left-length status-right-length message-fg
|
||||
syn keyword tmuxOptsSet message-bg lock-after-time default-path repeat-time
|
||||
syn keyword tmuxOptsSet message-attr status-attr status-keys set-remain-on-exit
|
||||
syn keyword tmuxOptsSet status-utf8 default-terminal visual-activity
|
||||
syn keyword tmuxOptsSet visual-bell visual-content status-justify
|
||||
syn keyword tmuxOptsSet terminal-overrides status-left-attr status-left-bg
|
||||
syn keyword tmuxOptsSet status-left-fg status-right-attr status-right-bg
|
||||
syn keyword tmuxOptsSet status-right-fg update-environment base-index
|
||||
syn keyword tmuxOptsSet display-panes-colour display-panes-time default-shell
|
||||
syn keyword tmuxOptsSet set-titles-string lock-command lock-server
|
||||
syn keyword tmuxOptsSet mouse-select-pane message-limit quiet escape-time
|
||||
syn keyword tmuxOptsSet pane-active-border-bg pane-active-border-fg
|
||||
syn keyword tmuxOptsSet pane-border-bg pane-border-fg
|
||||
syn keyword tmuxOptsSet display-panes-active-colour alternate-screen
|
||||
syn keyword tmuxOptsSet detach-on-destroy
|
||||
|
||||
syn keyword tmuxOptsSetw monitor-activity aggressive-resize force-width
|
||||
syn keyword tmuxOptsSetw force-height remain-on-exit uft8 mode-fg mode-bg
|
||||
syn keyword tmuxOptsSetw mode-keys clock-mode-colour clock-mode-style
|
||||
syn keyword tmuxOptsSetw xterm-keys mode-attr window-status-attr
|
||||
syn keyword tmuxOptsSetw window-status-bg window-status-fg automatic-rename
|
||||
syn keyword tmuxOptsSetw main-pane-width main-pane-height monitor-content
|
||||
syn keyword tmuxOptsSetw window-status-current-attr window-status-current-bg
|
||||
syn keyword tmuxOptsSetw window-status-current-fg mode-mouse synchronize-panes
|
||||
syn keyword tmuxOptsSetw window-status-format window-status-current-format
|
||||
syn keyword tmuxOptsSetw word-separators window-status-alert-alert
|
||||
syn keyword tmuxOptsSetw window-status-alert-bg window-status-alert-fg
|
||||
|
||||
syn keyword tmuxTodo FIXME NOTE TODO XXX contained
|
||||
|
||||
syn match tmuxKey /\(C-\|M-\|\^\)\p/ display
|
||||
syn match tmuxNumber /\d\+/ display
|
||||
syn match tmuxOptions /\s-\a\+/ display
|
||||
syn match tmuxVariable /\w\+=/ display
|
||||
syn match tmuxVariableExpansion /\${\=\w\+}\=/ display
|
||||
|
||||
syn region tmuxComment start=/#/ end=/$/ contains=tmuxTodo display oneline
|
||||
syn region tmuxString start=/"/ end=/"/ display oneline
|
||||
syn region tmuxString start=/'/ end=/'/ display oneline
|
||||
|
||||
hi def link tmuxAction Boolean
|
||||
hi def link tmuxBoolean Boolean
|
||||
hi def link tmuxCmds Keyword
|
||||
hi def link tmuxComment Comment
|
||||
hi def link tmuxKey Special
|
||||
hi def link tmuxNumber Number
|
||||
hi def link tmuxOptions Identifier
|
||||
hi def link tmuxOptsSet Function
|
||||
hi def link tmuxOptsSetw Function
|
||||
hi def link tmuxString String
|
||||
hi def link tmuxTodo Todo
|
||||
hi def link tmuxVariable Constant
|
||||
hi def link tmuxVariableExpansion Constant
|
||||
|
||||
let b:current_syntax = "tmux"
|
||||
|
|
@ -47,8 +47,8 @@ syntax on
|
|||
set wildignore+=*.o,*.obj,.git,*.rbc,*.swp
|
||||
|
||||
" Status bar
|
||||
set laststatus=2
|
||||
set statusline=%<%f\ %h%m%r%{fugitive#statusline()}%=%-14.(%l,%c%V%)\ %P
|
||||
" set laststatus=2
|
||||
" set statusline=%<%f\ %h%m%r%{fugitive#statusline()}%=%-14.(%l,%c%V%)\ %P
|
||||
|
||||
" Folding
|
||||
set foldenable " Turn on folding
|
||||
|
|
|
|||
Loading…
Reference in New Issue