Compare commits
No commits in common. "2022" and "master" have entirely different histories.
|
|
@ -0,0 +1,120 @@
|
||||||
|
# thanks Swathe for this
|
||||||
|
|
||||||
|
alignment top_right
|
||||||
|
double_buffer yes
|
||||||
|
gap_x 5
|
||||||
|
gap_y 5
|
||||||
|
update_interval 1.0
|
||||||
|
background yes
|
||||||
|
own_window yes
|
||||||
|
own_window_transparent yes
|
||||||
|
own_window_argb_visual yes
|
||||||
|
own_window_type normal
|
||||||
|
own_window_class conky-semi
|
||||||
|
own_window_hints undecorated,below,sticky,skip_taskbar,skip_pager
|
||||||
|
minimum_size 230 5
|
||||||
|
maximum_width 230
|
||||||
|
use_xft yes
|
||||||
|
xftalpha 0.5
|
||||||
|
xftfont Sans:size=7
|
||||||
|
|
||||||
|
TEXT
|
||||||
|
${font openlogos:size=20}${font Arial:size=15}${color #0088cc}EXCALIBUR ${color Ivory}${font openlogos:size=15}${font }
|
||||||
|
${font size=7}${color slate grey}Infos $hr${color }${font }
|
||||||
|
|
||||||
|
Kernel: ${alignr}$kernel ($machine)
|
||||||
|
Uptime: ${alignr}$uptime
|
||||||
|
Time: ${alignr}${time %H:%M:%S}
|
||||||
|
Date: ${alignr}${time %d.%m.%y}
|
||||||
|
User: ${alignr}$alignc${exec whoami} @ $nodename
|
||||||
|
Filesystem: $alignr${fs_type}
|
||||||
|
|
||||||
|
${font size=7}${color slate grey}Intel Core i5 2300 $hr${color }${font }
|
||||||
|
|
||||||
|
CPU1 ${alignr}${cpu cpu1}%
|
||||||
|
${cpugraph cpu1 10, 200}
|
||||||
|
|
||||||
|
CPU2 ${alignr}${cpu cpu2}%
|
||||||
|
${cpugraph cpu2 10, 200}
|
||||||
|
|
||||||
|
CPU3 ${alignr}${cpu cpu3}%
|
||||||
|
${cpugraph cpu3 10, 200}
|
||||||
|
|
||||||
|
CPU4 ${alignr}${cpu cpu4}%
|
||||||
|
${cpugraph cpu4 10, 200}
|
||||||
|
|
||||||
|
#CPU5 ${alignr}${cpu cpu5}%
|
||||||
|
#${cpugraph cpu4 10, 200}
|
||||||
|
|
||||||
|
#CPU6 ${alignr}${cpu cpu6}%
|
||||||
|
#${cpugraph cpu4 10, 200}
|
||||||
|
|
||||||
|
${font size=7}${color slate grey}Ram Usage $hr${color }${font }
|
||||||
|
|
||||||
|
RAM ${alignr}$mem/$memmax
|
||||||
|
${membar 6, 200}
|
||||||
|
|
||||||
|
Swap ${alignr}$swap/$swapmax
|
||||||
|
${swapbar 6, 200}
|
||||||
|
|
||||||
|
${font size=7}${color slate grey}Filesystem $hr${color }${font }
|
||||||
|
|
||||||
|
/ ${alignr}${fs_free /}
|
||||||
|
${fs_bar 6, 200 /}
|
||||||
|
|
||||||
|
home ${alignr}${fs_free /home}
|
||||||
|
${fs_bar 6, 200 /home}
|
||||||
|
|
||||||
|
Ownage ${alignr}${fs_free /media/Ownage}
|
||||||
|
${fs_bar 6, 200 /media/Ownage}
|
||||||
|
|
||||||
|
Ownage3 ${alignr}${fs_free /media/Ownage3}
|
||||||
|
${fs_bar 6, 200 /media/Ownage3}
|
||||||
|
|
||||||
|
Ownage4 ${alignr}${fs_free /media/Ownage4}
|
||||||
|
${fs_bar 6, 200 /media/Ownage4}
|
||||||
|
|
||||||
|
${font size=7}${color slate grey}Top CPU Tasks $hr${color }${font }
|
||||||
|
|
||||||
|
${color #ddaa00}${top name 1}${alignr}${top cpu 1}%${color }
|
||||||
|
${top name 2}${alignr}${top cpu 2}%
|
||||||
|
${top name 3}${alignr}${top cpu 3}%
|
||||||
|
${top name 4}${alignr}${top cpu 4}%
|
||||||
|
${top name 5}${alignr}${top cpu 5}%
|
||||||
|
|
||||||
|
${font size=7}${color slate grey}Top RAM Tasks $hr${color }${font }
|
||||||
|
|
||||||
|
${color #ddaa00}${top_mem name 1}${alignr}${top_mem mem 1}%${color }
|
||||||
|
${top_mem name 2}${alignr}${top_mem mem 2}%
|
||||||
|
${top_mem name 3}${alignr}${top_mem mem 3}%
|
||||||
|
${top_mem name 4}${alignr}${top_mem mem 4}%
|
||||||
|
${top_mem name 5}${alignr}${top_mem mem 5}%
|
||||||
|
|
||||||
|
${font size=7}${color slate grey}Network $hr${color }${font }
|
||||||
|
IP (Lan): $alignr${addr eth0}
|
||||||
|
IP (Public): $alignr${execi 600 wget http://checkip.dyndns.org/ -q -O - | grep -Eo '\<[[:digit:]]{1,3}(\.[[:digit:]]{1,3}){3}\>'}
|
||||||
|
Total Down $alignr${totaldown eth0}
|
||||||
|
Total Up $alignr${totalup eth0}
|
||||||
|
|
||||||
|
Download ${alignr}${downspeed eth0}
|
||||||
|
${downspeedgraph eth0 10, 200}
|
||||||
|
|
||||||
|
Upload ${alignr}${upspeed eth0}
|
||||||
|
${upspeedgraph eth0 10, 200}
|
||||||
|
|
||||||
|
#Outbound Connections:
|
||||||
|
#${tcp_portmon 1 65535 rhost 0}:${tcp_portmon 1 65535 rport 0}
|
||||||
|
#${tcp_portmon 1 65535 rhost 1}:${tcp_portmon 1 65535 rport 1}
|
||||||
|
#${tcp_portmon 1 65535 rhost 2}:${tcp_portmon 1 65535 rport 2}
|
||||||
|
#${tcp_portmon 1 65535 rhost 3}:${tcp_portmon 1 65535 rport 3}
|
||||||
|
#${tcp_portmon 1 65535 rhost 4}:${tcp_portmon 1 65535 rport 4}
|
||||||
|
#${tcp_portmon 1 65535 rhost 5}:${tcp_portmon 1 65535 rport 5}
|
||||||
|
#${tcp_portmon 1 65535 rhost 6}:${tcp_portmon 1 65535 rport 6}
|
||||||
|
#${tcp_portmon 1 65535 rhost 7}:${tcp_portmon 1 65535 rport 7}
|
||||||
|
|
||||||
|
${font size=7}${color slate grey}Now Playing $hr${color }${font }
|
||||||
|
Artist: ${alignr}${mpd_artist}
|
||||||
|
Title: ${alignr}${mpd_title 35}
|
||||||
|
Album: ${alignr}${mpd_album}
|
||||||
|
$mpd_bar
|
||||||
|
$mpd_elapsed/$mpd_length ${alignc}$mpd_status ${alignr}$mpd_percent%
|
||||||
|
|
@ -0,0 +1,6 @@
|
||||||
|
[submodule ".vim/bundle/ctrlp.vim"]
|
||||||
|
path = .vim/bundle/ctrlp.vim
|
||||||
|
url = https://github.com/kien/ctrlp.vim.git
|
||||||
|
[submodule ".vim/bundle/vim-colors-solarized"]
|
||||||
|
path = .vim/bundle/vim-colors-solarized
|
||||||
|
url = https://github.com/altercation/vim-colors-solarized.git
|
||||||
31
.tmux.conf
31
.tmux.conf
|
|
@ -94,10 +94,7 @@ bind '"' choose-window
|
||||||
bind r source-file ~/.tmux.conf
|
bind r source-file ~/.tmux.conf
|
||||||
|
|
||||||
# Set TERM to 256 colors
|
# Set TERM to 256 colors
|
||||||
set -g default-terminal "tmux-256color"
|
set -g default-terminal "screen-256color"
|
||||||
|
|
||||||
# 24 bit colors
|
|
||||||
set -ga terminal-overrides ",tmux-256color:Tc"
|
|
||||||
|
|
||||||
# Start window numbering at 1
|
# Start window numbering at 1
|
||||||
set -g base-index 1
|
set -g base-index 1
|
||||||
|
|
@ -108,7 +105,7 @@ set -g base-index 1
|
||||||
# # # select the current pane. The mouse click is also
|
# # # select the current pane. The mouse click is also
|
||||||
# # # passed through to the application as normal.
|
# # # passed through to the application as normal.
|
||||||
# # #
|
# # #
|
||||||
#set -g mouse-select-pane on
|
set -g mouse-select-pane on
|
||||||
|
|
||||||
# status bar stuff
|
# status bar stuff
|
||||||
set -g status-interval 2
|
set -g status-interval 2
|
||||||
|
|
@ -117,22 +114,27 @@ set -g status-right "#(date) #H"
|
||||||
#### COLOUR (Solarized 256)
|
#### COLOUR (Solarized 256)
|
||||||
|
|
||||||
# default statusbar colors
|
# default statusbar colors
|
||||||
set-option -g status-style fg=colour136,bg=colour235 #yellow and base02
|
set-option -g status-bg colour235 #base02
|
||||||
|
set-option -g status-fg colour136 #yellow
|
||||||
|
set-option -g status-attr default
|
||||||
|
|
||||||
# default window title colors
|
# default window title colors
|
||||||
set-window-option -g window-status-style fg=colour244,bg=default #base0 and default
|
set-window-option -g window-status-fg colour244 #base0
|
||||||
#set-window-option -g window-status-style dim
|
set-window-option -g window-status-bg default
|
||||||
|
#set-window-option -g window-status-attr dim
|
||||||
|
|
||||||
# active window title colors
|
# active window title colors
|
||||||
set-window-option -g window-status-current-style fg=colour166,bg=default #orange and default
|
set-window-option -g window-status-current-fg colour166 #orange
|
||||||
#set-window-option -g window-status-current-style bright
|
set-window-option -g window-status-current-bg default
|
||||||
|
#set-window-option -g window-status-current-attr bright
|
||||||
|
|
||||||
# pane border
|
# pane border
|
||||||
set-option -g pane-border-style fg=colour235 #base02
|
set-option -g pane-border-fg colour235 #base02
|
||||||
set-option -g pane-active-border-style fg=colour240 #base01
|
set-option -g pane-active-border-fg colour240 #base01
|
||||||
|
|
||||||
# message text
|
# message text
|
||||||
set-option -g message-style fg=colour166,bg=colour235 #orange and base02
|
set-option -g message-bg colour235 #base02
|
||||||
|
set-option -g message-fg colour166 #orange
|
||||||
|
|
||||||
# pane number display
|
# pane number display
|
||||||
set-option -g display-panes-active-colour colour33 #blue
|
set-option -g display-panes-active-colour colour33 #blue
|
||||||
|
|
@ -140,6 +142,3 @@ set-option -g display-panes-colour colour166 #orange
|
||||||
|
|
||||||
# clock
|
# clock
|
||||||
set-window-option -g clock-mode-colour colour64 #green
|
set-window-option -g clock-mode-colour colour64 #green
|
||||||
|
|
||||||
# bell
|
|
||||||
set-window-option -g window-status-bell-style fg=colour235,bg=colour160 #base02, red
|
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,326 @@
|
||||||
|
" pathogen.vim - path option manipulation
|
||||||
|
" Maintainer: Tim Pope <http://tpo.pe/>
|
||||||
|
" Version: 2.2
|
||||||
|
|
||||||
|
" Install in ~/.vim/autoload (or ~\vimfiles\autoload).
|
||||||
|
"
|
||||||
|
" For management of individually installed plugins in ~/.vim/bundle (or
|
||||||
|
" ~\vimfiles\bundle), adding `execute pathogen#infect()` to the top of your
|
||||||
|
" .vimrc is the only other setup necessary.
|
||||||
|
"
|
||||||
|
" The API is documented inline below. For maximum ease of reading,
|
||||||
|
" :set foldmethod=marker
|
||||||
|
|
||||||
|
if exists("g:loaded_pathogen") || &cp
|
||||||
|
finish
|
||||||
|
endif
|
||||||
|
let g:loaded_pathogen = 1
|
||||||
|
|
||||||
|
function! s:warn(msg)
|
||||||
|
echohl WarningMsg
|
||||||
|
echomsg a:msg
|
||||||
|
echohl NONE
|
||||||
|
endfunction
|
||||||
|
|
||||||
|
" Point of entry for basic default usage. Give a relative path to invoke
|
||||||
|
" pathogen#incubate() (defaults to "bundle/{}"), or an absolute path to invoke
|
||||||
|
" pathogen#surround(). For backwards compatibility purposes, a full path that
|
||||||
|
" does not end in {} or * is given to pathogen#runtime_prepend_subdirectories()
|
||||||
|
" instead.
|
||||||
|
function! pathogen#infect(...) abort " {{{1
|
||||||
|
for path in a:0 ? reverse(copy(a:000)) : ['bundle/{}']
|
||||||
|
if path =~# '^[^\\/]\+$'
|
||||||
|
call s:warn('Change pathogen#infect('.string(path).') to pathogen#infect('.string(path.'/{}').')')
|
||||||
|
call pathogen#incubate(path . '/{}')
|
||||||
|
elseif path =~# '^[^\\/]\+[\\/]\%({}\|\*\)$'
|
||||||
|
call pathogen#incubate(path)
|
||||||
|
elseif path =~# '[\\/]\%({}\|\*\)$'
|
||||||
|
call pathogen#surround(path)
|
||||||
|
else
|
||||||
|
call s:warn('Change pathogen#infect('.string(path).') to pathogen#infect('.string(path.'/{}').')')
|
||||||
|
call pathogen#surround(path . '/{}')
|
||||||
|
endif
|
||||||
|
endfor
|
||||||
|
call pathogen#cycle_filetype()
|
||||||
|
return ''
|
||||||
|
endfunction " }}}1
|
||||||
|
|
||||||
|
" Split a path into a list.
|
||||||
|
function! pathogen#split(path) abort " {{{1
|
||||||
|
if type(a:path) == type([]) | return a:path | endif
|
||||||
|
let split = split(a:path,'\\\@<!\%(\\\\\)*\zs,')
|
||||||
|
return map(split,'substitute(v:val,''\\\([\\,]\)'',''\1'',"g")')
|
||||||
|
endfunction " }}}1
|
||||||
|
|
||||||
|
" Convert a list to a path.
|
||||||
|
function! pathogen#join(...) abort " {{{1
|
||||||
|
if type(a:1) == type(1) && a:1
|
||||||
|
let i = 1
|
||||||
|
let space = ' '
|
||||||
|
else
|
||||||
|
let i = 0
|
||||||
|
let space = ''
|
||||||
|
endif
|
||||||
|
let path = ""
|
||||||
|
while i < a:0
|
||||||
|
if type(a:000[i]) == type([])
|
||||||
|
let list = a:000[i]
|
||||||
|
let j = 0
|
||||||
|
while j < len(list)
|
||||||
|
let escaped = substitute(list[j],'[,'.space.']\|\\[\,'.space.']\@=','\\&','g')
|
||||||
|
let path .= ',' . escaped
|
||||||
|
let j += 1
|
||||||
|
endwhile
|
||||||
|
else
|
||||||
|
let path .= "," . a:000[i]
|
||||||
|
endif
|
||||||
|
let i += 1
|
||||||
|
endwhile
|
||||||
|
return substitute(path,'^,','','')
|
||||||
|
endfunction " }}}1
|
||||||
|
|
||||||
|
" Convert a list to a path with escaped spaces for 'path', 'tag', etc.
|
||||||
|
function! pathogen#legacyjoin(...) abort " {{{1
|
||||||
|
return call('pathogen#join',[1] + a:000)
|
||||||
|
endfunction " }}}1
|
||||||
|
|
||||||
|
" Remove duplicates from a list.
|
||||||
|
function! pathogen#uniq(list) abort " {{{1
|
||||||
|
let i = 0
|
||||||
|
let seen = {}
|
||||||
|
while i < len(a:list)
|
||||||
|
if (a:list[i] ==# '' && exists('empty')) || has_key(seen,a:list[i])
|
||||||
|
call remove(a:list,i)
|
||||||
|
elseif a:list[i] ==# ''
|
||||||
|
let i += 1
|
||||||
|
let empty = 1
|
||||||
|
else
|
||||||
|
let seen[a:list[i]] = 1
|
||||||
|
let i += 1
|
||||||
|
endif
|
||||||
|
endwhile
|
||||||
|
return a:list
|
||||||
|
endfunction " }}}1
|
||||||
|
|
||||||
|
" \ on Windows unless shellslash is set, / everywhere else.
|
||||||
|
function! pathogen#separator() abort " {{{1
|
||||||
|
return !exists("+shellslash") || &shellslash ? '/' : '\'
|
||||||
|
endfunction " }}}1
|
||||||
|
|
||||||
|
" Convenience wrapper around glob() which returns a list.
|
||||||
|
function! pathogen#glob(pattern) abort " {{{1
|
||||||
|
let files = split(glob(a:pattern),"\n")
|
||||||
|
return map(files,'substitute(v:val,"[".pathogen#separator()."/]$","","")')
|
||||||
|
endfunction "}}}1
|
||||||
|
|
||||||
|
" Like pathogen#glob(), only limit the results to directories.
|
||||||
|
function! pathogen#glob_directories(pattern) abort " {{{1
|
||||||
|
return filter(pathogen#glob(a:pattern),'isdirectory(v:val)')
|
||||||
|
endfunction "}}}1
|
||||||
|
|
||||||
|
" Turn filetype detection off and back on again if it was already enabled.
|
||||||
|
function! pathogen#cycle_filetype() " {{{1
|
||||||
|
if exists('g:did_load_filetypes')
|
||||||
|
filetype off
|
||||||
|
filetype on
|
||||||
|
endif
|
||||||
|
endfunction " }}}1
|
||||||
|
|
||||||
|
" Check if a bundle is disabled. A bundle is considered disabled if it ends
|
||||||
|
" in a tilde or its basename or full name is included in the list
|
||||||
|
" g:pathogen_disabled.
|
||||||
|
function! pathogen#is_disabled(path) " {{{1
|
||||||
|
if a:path =~# '\~$'
|
||||||
|
return 1
|
||||||
|
elseif !exists("g:pathogen_disabled")
|
||||||
|
return 0
|
||||||
|
endif
|
||||||
|
let sep = pathogen#separator()
|
||||||
|
let blacklist = g:pathogen_disabled
|
||||||
|
return index(blacklist, strpart(a:path, strridx(a:path, sep)+1)) != -1 && index(blacklist, a:path) != 1
|
||||||
|
endfunction "}}}1
|
||||||
|
|
||||||
|
" Prepend the given directory to the runtime path and append its corresponding
|
||||||
|
" after directory. If the directory is already included, move it to the
|
||||||
|
" outermost position. Wildcards are added as is. Ending a path in /{} causes
|
||||||
|
" all subdirectories to be added (except those in g:pathogen_disabled).
|
||||||
|
function! pathogen#surround(path) abort " {{{1
|
||||||
|
let sep = pathogen#separator()
|
||||||
|
let rtp = pathogen#split(&rtp)
|
||||||
|
if a:path =~# '[\\/]{}$'
|
||||||
|
let path = fnamemodify(a:path[0:-4], ':p:s?[\\/]\=$??')
|
||||||
|
let before = filter(pathogen#glob_directories(path.sep.'*'), '!pathogen#is_disabled(v:val)')
|
||||||
|
let after = filter(reverse(pathogen#glob_directories(path.sep."*".sep."after")), '!pathogen#is_disabled(v:val[0:-7])')
|
||||||
|
call filter(rtp,'v:val[0:strlen(path)-1] !=# path')
|
||||||
|
else
|
||||||
|
let path = fnamemodify(a:path, ':p:s?[\\/]\=$??')
|
||||||
|
let before = [path]
|
||||||
|
let after = [path . sep . 'after']
|
||||||
|
call filter(rtp, 'index(before + after, v:val) == -1')
|
||||||
|
endif
|
||||||
|
let &rtp = pathogen#join(before, rtp, after)
|
||||||
|
return &rtp
|
||||||
|
endfunction " }}}1
|
||||||
|
|
||||||
|
" Prepend all subdirectories of path to the rtp, and append all 'after'
|
||||||
|
" directories in those subdirectories. Deprecated.
|
||||||
|
function! pathogen#runtime_prepend_subdirectories(path) " {{{1
|
||||||
|
call s:warn('Change pathogen#runtime_prepend_subdirectories('.string(a:path).') to pathogen#surround('.string(a:path.'/{}').')')
|
||||||
|
return pathogen#surround(a:path . pathogen#separator() . '{}')
|
||||||
|
endfunction " }}}1
|
||||||
|
|
||||||
|
" For each directory in the runtime path, add a second entry with the given
|
||||||
|
" argument appended. If the argument ends in '/{}', add a separate entry for
|
||||||
|
" each subdirectory. The default argument is 'bundle/{}', which means that
|
||||||
|
" .vim/bundle/*, $VIM/vimfiles/bundle/*, $VIMRUNTIME/bundle/*,
|
||||||
|
" $VIM/vim/files/bundle/*/after, and .vim/bundle/*/after will be added (on
|
||||||
|
" UNIX).
|
||||||
|
function! pathogen#incubate(...) abort " {{{1
|
||||||
|
let sep = pathogen#separator()
|
||||||
|
let name = a:0 ? a:1 : 'bundle/{}'
|
||||||
|
if "\n".s:done_bundles =~# "\\M\n".name."\n"
|
||||||
|
return ""
|
||||||
|
endif
|
||||||
|
let s:done_bundles .= name . "\n"
|
||||||
|
let list = []
|
||||||
|
for dir in pathogen#split(&rtp)
|
||||||
|
if dir =~# '\<after$'
|
||||||
|
if name =~# '{}$'
|
||||||
|
let list += filter(pathogen#glob_directories(substitute(dir,'after$',name[0:-3],'').'*'.sep.'after'), '!pathogen#is_disabled(v:val[0:-7])') + [dir]
|
||||||
|
else
|
||||||
|
let list += [dir, substitute(dir, 'after$', '', '') . name . sep . 'after']
|
||||||
|
endif
|
||||||
|
else
|
||||||
|
if name =~# '{}$'
|
||||||
|
let list += [dir] + filter(pathogen#glob_directories(dir.sep.name[0:-3].'*'), '!pathogen#is_disabled(v:val)')
|
||||||
|
else
|
||||||
|
let list += [dir . sep . name, dir]
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
endfor
|
||||||
|
let &rtp = pathogen#join(pathogen#uniq(list))
|
||||||
|
return 1
|
||||||
|
endfunction " }}}1
|
||||||
|
|
||||||
|
" Deprecated alias for pathogen#incubate().
|
||||||
|
function! pathogen#runtime_append_all_bundles(...) abort " {{{1
|
||||||
|
if a:0
|
||||||
|
call s:warn('Change pathogen#runtime_append_all_bundles('.string(a:1).') to pathogen#incubate('.string(a:1.'/{}').')')
|
||||||
|
else
|
||||||
|
call s:warn('Change pathogen#runtime_append_all_bundles() to pathogen#incubate()')
|
||||||
|
endif
|
||||||
|
return call('pathogen#incubate', map(copy(a:000),'v:val . "/{}"'))
|
||||||
|
endfunction
|
||||||
|
|
||||||
|
let s:done_bundles = ''
|
||||||
|
" }}}1
|
||||||
|
|
||||||
|
" Invoke :helptags on all non-$VIM doc directories in runtimepath.
|
||||||
|
function! pathogen#helptags() abort " {{{1
|
||||||
|
let sep = pathogen#separator()
|
||||||
|
for glob in pathogen#split(&rtp)
|
||||||
|
for dir in split(glob(glob), "\n")
|
||||||
|
if (dir.sep)[0 : strlen($VIMRUNTIME)] !=# $VIMRUNTIME.sep && filewritable(dir.sep.'doc') == 2 && !empty(filter(split(glob(dir.sep.'doc'.sep.'*'),"\n>"),'!isdirectory(v:val)')) && (!filereadable(dir.sep.'doc'.sep.'tags') || filewritable(dir.sep.'doc'.sep.'tags'))
|
||||||
|
silent! execute 'helptags' pathogen#fnameescape(dir.'/doc')
|
||||||
|
endif
|
||||||
|
endfor
|
||||||
|
endfor
|
||||||
|
endfunction " }}}1
|
||||||
|
|
||||||
|
command! -bar Helptags :call pathogen#helptags()
|
||||||
|
|
||||||
|
" Execute the given command. This is basically a backdoor for --remote-expr.
|
||||||
|
function! pathogen#execute(...) abort " {{{1
|
||||||
|
for command in a:000
|
||||||
|
execute command
|
||||||
|
endfor
|
||||||
|
return ''
|
||||||
|
endfunction " }}}1
|
||||||
|
|
||||||
|
" Like findfile(), but hardcoded to use the runtimepath.
|
||||||
|
function! pathogen#runtime_findfile(file,count) abort "{{{1
|
||||||
|
let rtp = pathogen#join(1,pathogen#split(&rtp))
|
||||||
|
let file = findfile(a:file,rtp,a:count)
|
||||||
|
if file ==# ''
|
||||||
|
return ''
|
||||||
|
else
|
||||||
|
return fnamemodify(file,':p')
|
||||||
|
endif
|
||||||
|
endfunction " }}}1
|
||||||
|
|
||||||
|
" Backport of fnameescape().
|
||||||
|
function! pathogen#fnameescape(string) abort " {{{1
|
||||||
|
if exists('*fnameescape')
|
||||||
|
return fnameescape(a:string)
|
||||||
|
elseif a:string ==# '-'
|
||||||
|
return '\-'
|
||||||
|
else
|
||||||
|
return substitute(escape(a:string," \t\n*?[{`$\\%#'\"|!<"),'^[+>]','\\&','')
|
||||||
|
endif
|
||||||
|
endfunction " }}}1
|
||||||
|
|
||||||
|
if exists(':Vedit')
|
||||||
|
finish
|
||||||
|
endif
|
||||||
|
|
||||||
|
let s:vopen_warning = 0
|
||||||
|
|
||||||
|
function! s:find(count,cmd,file,lcd) " {{{1
|
||||||
|
let rtp = pathogen#join(1,pathogen#split(&runtimepath))
|
||||||
|
let file = pathogen#runtime_findfile(a:file,a:count)
|
||||||
|
if file ==# ''
|
||||||
|
return "echoerr 'E345: Can''t find file \"".a:file."\" in runtimepath'"
|
||||||
|
endif
|
||||||
|
if !s:vopen_warning
|
||||||
|
let s:vopen_warning = 1
|
||||||
|
let warning = '|echohl WarningMsg|echo "Install scriptease.vim to continue using :V'.a:cmd.'"|echohl NONE'
|
||||||
|
else
|
||||||
|
let warning = ''
|
||||||
|
endif
|
||||||
|
if a:lcd
|
||||||
|
let path = file[0:-strlen(a:file)-2]
|
||||||
|
execute 'lcd `=path`'
|
||||||
|
return a:cmd.' '.pathogen#fnameescape(a:file) . warning
|
||||||
|
else
|
||||||
|
return a:cmd.' '.pathogen#fnameescape(file) . warning
|
||||||
|
endif
|
||||||
|
endfunction " }}}1
|
||||||
|
|
||||||
|
function! s:Findcomplete(A,L,P) " {{{1
|
||||||
|
let sep = pathogen#separator()
|
||||||
|
let cheats = {
|
||||||
|
\'a': 'autoload',
|
||||||
|
\'d': 'doc',
|
||||||
|
\'f': 'ftplugin',
|
||||||
|
\'i': 'indent',
|
||||||
|
\'p': 'plugin',
|
||||||
|
\'s': 'syntax'}
|
||||||
|
if a:A =~# '^\w[\\/]' && has_key(cheats,a:A[0])
|
||||||
|
let request = cheats[a:A[0]].a:A[1:-1]
|
||||||
|
else
|
||||||
|
let request = a:A
|
||||||
|
endif
|
||||||
|
let pattern = substitute(request,'/\|\'.sep,'*'.sep,'g').'*'
|
||||||
|
let found = {}
|
||||||
|
for path in pathogen#split(&runtimepath)
|
||||||
|
let path = expand(path, ':p')
|
||||||
|
let matches = split(glob(path.sep.pattern),"\n")
|
||||||
|
call map(matches,'isdirectory(v:val) ? v:val.sep : v:val')
|
||||||
|
call map(matches,'expand(v:val, ":p")[strlen(path)+1:-1]')
|
||||||
|
for match in matches
|
||||||
|
let found[match] = 1
|
||||||
|
endfor
|
||||||
|
endfor
|
||||||
|
return sort(keys(found))
|
||||||
|
endfunction " }}}1
|
||||||
|
|
||||||
|
command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Ve :execute s:find(<count>,'edit<bang>',<q-args>,0)
|
||||||
|
command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vedit :execute s:find(<count>,'edit<bang>',<q-args>,0)
|
||||||
|
command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vopen :execute s:find(<count>,'edit<bang>',<q-args>,1)
|
||||||
|
command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vsplit :execute s:find(<count>,'split',<q-args>,<bang>1)
|
||||||
|
command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vvsplit :execute s:find(<count>,'vsplit',<q-args>,<bang>1)
|
||||||
|
command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vtabedit :execute s:find(<count>,'tabedit',<q-args>,<bang>1)
|
||||||
|
command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vpedit :execute s:find(<count>,'pedit',<q-args>,<bang>1)
|
||||||
|
command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vread :execute s:find(<count>,'read',<q-args>,<bang>1)
|
||||||
|
|
||||||
|
" vim:set et sw=2:
|
||||||
|
|
@ -0,0 +1 @@
|
||||||
|
Subproject commit b5d3fe66a58a13d2ff8b6391f4387608496a030f
|
||||||
|
|
@ -0,0 +1 @@
|
||||||
|
Subproject commit 528a59f26d12278698bb946f8fb82a63711eec21
|
||||||
|
|
@ -0,0 +1,328 @@
|
||||||
|
" File: hybrid-light.vim
|
||||||
|
" Maintainer: Andrew Wong (w0ng)
|
||||||
|
" URL: https://github.com/w0ng/vim-hybrid
|
||||||
|
" Modified: 27 Jan 2013 06:05 AM AEST
|
||||||
|
" License: MIT
|
||||||
|
|
||||||
|
" Description:"{{{
|
||||||
|
" ----------------------------------------------------------------------------
|
||||||
|
" A clone of Solarized light with a custom colour palette. Currently a WIP.
|
||||||
|
|
||||||
|
"}}}
|
||||||
|
" Initialisation:"{{{
|
||||||
|
" ----------------------------------------------------------------------------
|
||||||
|
if !has("gui_running") && &t_Co < 256
|
||||||
|
finish
|
||||||
|
endif
|
||||||
|
|
||||||
|
set background=light
|
||||||
|
hi clear
|
||||||
|
|
||||||
|
if exists("syntax_on")
|
||||||
|
syntax reset
|
||||||
|
endif
|
||||||
|
|
||||||
|
let colors_name = "hybrid-light"
|
||||||
|
|
||||||
|
"}}}
|
||||||
|
" GUI And Cterm Palettes:"{{{
|
||||||
|
" ----------------------------------------------------------------------------
|
||||||
|
if has("gui_running")
|
||||||
|
let s:vmode = "gui"
|
||||||
|
let s:background = "#e4e4e4"
|
||||||
|
let s:foreground = "#000000"
|
||||||
|
let s:selection = "#bcbcbc"
|
||||||
|
let s:line = "#d0d0d0"
|
||||||
|
let s:comment = "#5f5f5f"
|
||||||
|
let s:red = "#5f0000"
|
||||||
|
let s:orange = "#875f00"
|
||||||
|
let s:yellow = "#5f5f00"
|
||||||
|
let s:green = "#005f00"
|
||||||
|
let s:aqua = "#005f5f"
|
||||||
|
let s:blue = "#00005f"
|
||||||
|
let s:purple = "#5f005f"
|
||||||
|
let s:window = "#9e9e9e"
|
||||||
|
let s:darkcolumn = "#808080"
|
||||||
|
let s:addbg = "#d7ffd7"
|
||||||
|
let s:changebg = "#d7d7ff"
|
||||||
|
let s:delbg = "#ffd7d7"
|
||||||
|
else
|
||||||
|
let s:vmode = "cterm"
|
||||||
|
let s:background = "254"
|
||||||
|
let s:foreground = "16"
|
||||||
|
let s:selection = "250"
|
||||||
|
let s:line = "252"
|
||||||
|
let s:comment = "59"
|
||||||
|
let s:red = "52"
|
||||||
|
let s:orange = "94"
|
||||||
|
let s:yellow = "58"
|
||||||
|
let s:green = "22"
|
||||||
|
let s:aqua = "23"
|
||||||
|
let s:blue = "17"
|
||||||
|
let s:purple = "53"
|
||||||
|
let s:window = "247"
|
||||||
|
let s:darkcolumn = "244"
|
||||||
|
let s:addbg = "194"
|
||||||
|
let s:changebg = "189"
|
||||||
|
let s:delbg = "224"
|
||||||
|
endif
|
||||||
|
|
||||||
|
"}}}
|
||||||
|
" Formatting Options:"{{{
|
||||||
|
" ----------------------------------------------------------------------------
|
||||||
|
let s:none = "NONE"
|
||||||
|
let s:t_none = "NONE"
|
||||||
|
let s:n = "NONE"
|
||||||
|
let s:c = ",undercurl"
|
||||||
|
let s:r = ",reverse"
|
||||||
|
let s:s = ",standout"
|
||||||
|
let s:b = ",bold"
|
||||||
|
let s:u = ",underline"
|
||||||
|
let s:i = ",italic"
|
||||||
|
|
||||||
|
"}}}
|
||||||
|
" Highlighting Primitives:"{{{
|
||||||
|
" ----------------------------------------------------------------------------
|
||||||
|
exe "let s:bg_none = ' ".s:vmode."bg=".s:none ."'"
|
||||||
|
exe "let s:bg_foreground = ' ".s:vmode."bg=".s:foreground."'"
|
||||||
|
exe "let s:bg_background = ' ".s:vmode."bg=".s:background."'"
|
||||||
|
exe "let s:bg_selection = ' ".s:vmode."bg=".s:selection ."'"
|
||||||
|
exe "let s:bg_line = ' ".s:vmode."bg=".s:line ."'"
|
||||||
|
exe "let s:bg_comment = ' ".s:vmode."bg=".s:comment ."'"
|
||||||
|
exe "let s:bg_red = ' ".s:vmode."bg=".s:red ."'"
|
||||||
|
exe "let s:bg_orange = ' ".s:vmode."bg=".s:orange ."'"
|
||||||
|
exe "let s:bg_yellow = ' ".s:vmode."bg=".s:yellow ."'"
|
||||||
|
exe "let s:bg_green = ' ".s:vmode."bg=".s:green ."'"
|
||||||
|
exe "let s:bg_aqua = ' ".s:vmode."bg=".s:aqua ."'"
|
||||||
|
exe "let s:bg_blue = ' ".s:vmode."bg=".s:blue ."'"
|
||||||
|
exe "let s:bg_purple = ' ".s:vmode."bg=".s:purple ."'"
|
||||||
|
exe "let s:bg_window = ' ".s:vmode."bg=".s:window ."'"
|
||||||
|
exe "let s:bg_darkcolumn = ' ".s:vmode."bg=".s:darkcolumn."'"
|
||||||
|
exe "let s:bg_addbg = ' ".s:vmode."bg=".s:addbg ."'"
|
||||||
|
exe "let s:bg_changebg = ' ".s:vmode."bg=".s:changebg ."'"
|
||||||
|
exe "let s:bg_delbg = ' ".s:vmode."bg=".s:delbg ."'"
|
||||||
|
|
||||||
|
exe "let s:fg_none = ' ".s:vmode."fg=".s:none ."'"
|
||||||
|
exe "let s:fg_foreground = ' ".s:vmode."fg=".s:foreground."'"
|
||||||
|
exe "let s:fg_background = ' ".s:vmode."fg=".s:background."'"
|
||||||
|
exe "let s:fg_selection = ' ".s:vmode."fg=".s:selection ."'"
|
||||||
|
exe "let s:fg_line = ' ".s:vmode."fg=".s:line ."'"
|
||||||
|
exe "let s:fg_comment = ' ".s:vmode."fg=".s:comment ."'"
|
||||||
|
exe "let s:fg_red = ' ".s:vmode."fg=".s:red ."'"
|
||||||
|
exe "let s:fg_orange = ' ".s:vmode."fg=".s:orange ."'"
|
||||||
|
exe "let s:fg_yellow = ' ".s:vmode."fg=".s:yellow ."'"
|
||||||
|
exe "let s:fg_green = ' ".s:vmode."fg=".s:green ."'"
|
||||||
|
exe "let s:fg_aqua = ' ".s:vmode."fg=".s:aqua ."'"
|
||||||
|
exe "let s:fg_blue = ' ".s:vmode."fg=".s:blue ."'"
|
||||||
|
exe "let s:fg_purple = ' ".s:vmode."fg=".s:purple ."'"
|
||||||
|
exe "let s:fg_window = ' ".s:vmode."fg=".s:window ."'"
|
||||||
|
exe "let s:fg_darkcolumn = ' ".s:vmode."fg=".s:darkcolumn."'"
|
||||||
|
exe "let s:fg_addbg = ' ".s:vmode."fg=".s:addbg ."'"
|
||||||
|
exe "let s:fg_changebg = ' ".s:vmode."fg=".s:changebg ."'"
|
||||||
|
exe "let s:fg_delbg = ' ".s:vmode."fg=".s:delbg ."'"
|
||||||
|
|
||||||
|
exe "let s:fmt_none = ' ".s:vmode."=NONE". " term=NONE" ."'"
|
||||||
|
exe "let s:fmt_bold = ' ".s:vmode."=NONE".s:b. " term=NONE".s:b ."'"
|
||||||
|
exe "let s:fmt_bldi = ' ".s:vmode."=NONE".s:b. " term=NONE".s:b ."'"
|
||||||
|
exe "let s:fmt_undr = ' ".s:vmode."=NONE".s:u. " term=NONE".s:u ."'"
|
||||||
|
exe "let s:fmt_undb = ' ".s:vmode."=NONE".s:u.s:b. " term=NONE".s:u.s:b."'"
|
||||||
|
exe "let s:fmt_undi = ' ".s:vmode."=NONE".s:u. " term=NONE".s:u ."'"
|
||||||
|
exe "let s:fmt_curl = ' ".s:vmode."=NONE".s:c. " term=NONE".s:c ."'"
|
||||||
|
exe "let s:fmt_ital = ' ".s:vmode."=NONE".s:i. " term=NONE".s:i ."'"
|
||||||
|
exe "let s:fmt_stnd = ' ".s:vmode."=NONE".s:s. " term=NONE".s:s ."'"
|
||||||
|
exe "let s:fmt_revr = ' ".s:vmode."=NONE".s:r. " term=NONE".s:r ."'"
|
||||||
|
exe "let s:fmt_revb = ' ".s:vmode."=NONE".s:r.s:b. " term=NONE".s:r.s:b."'"
|
||||||
|
|
||||||
|
if has("gui_running")
|
||||||
|
exe "let s:sp_none = ' guisp=".s:none ."'"
|
||||||
|
exe "let s:sp_foreground = ' guisp=".s:foreground."'"
|
||||||
|
exe "let s:sp_background = ' guisp=".s:background."'"
|
||||||
|
exe "let s:sp_selection = ' guisp=".s:selection ."'"
|
||||||
|
exe "let s:sp_line = ' guisp=".s:line ."'"
|
||||||
|
exe "let s:sp_comment = ' guisp=".s:comment ."'"
|
||||||
|
exe "let s:sp_red = ' guisp=".s:red ."'"
|
||||||
|
exe "let s:sp_orange = ' guisp=".s:orange ."'"
|
||||||
|
exe "let s:sp_yellow = ' guisp=".s:yellow ."'"
|
||||||
|
exe "let s:sp_green = ' guisp=".s:green ."'"
|
||||||
|
exe "let s:sp_aqua = ' guisp=".s:aqua ."'"
|
||||||
|
exe "let s:sp_blue = ' guisp=".s:blue ."'"
|
||||||
|
exe "let s:sp_purple = ' guisp=".s:purple ."'"
|
||||||
|
exe "let s:sp_window = ' guisp=".s:window ."'"
|
||||||
|
exe "let s:sp_addbg = ' guisp=".s:addbg ."'"
|
||||||
|
exe "let s:sp_changebg = ' guisp=".s:changebg ."'"
|
||||||
|
exe "let s:sp_delbg = ' guisp=".s:delbg ."'"
|
||||||
|
else
|
||||||
|
let s:sp_none = ""
|
||||||
|
let s:sp_foreground = ""
|
||||||
|
let s:sp_background = ""
|
||||||
|
let s:sp_selection = ""
|
||||||
|
let s:sp_line = ""
|
||||||
|
let s:sp_comment = ""
|
||||||
|
let s:sp_red = ""
|
||||||
|
let s:sp_orange = ""
|
||||||
|
let s:sp_yellow = ""
|
||||||
|
let s:sp_green = ""
|
||||||
|
let s:sp_aqua = ""
|
||||||
|
let s:sp_blue = ""
|
||||||
|
let s:sp_purple = ""
|
||||||
|
let s:sp_window = ""
|
||||||
|
let s:sp_addbg = ""
|
||||||
|
let s:sp_changebg = ""
|
||||||
|
let s:sp_delbg = ""
|
||||||
|
endif
|
||||||
|
|
||||||
|
"}}}
|
||||||
|
" Vim Highlighting: (see :help highlight-groups)"{{{
|
||||||
|
" ----------------------------------------------------------------------------
|
||||||
|
exe "hi! ColorColumn" .s:fg_none .s:bg_line .s:fmt_none
|
||||||
|
" Conceal"
|
||||||
|
" Cursor"
|
||||||
|
" CursorIM"
|
||||||
|
exe "hi! CursorColumn" .s:fg_none .s:bg_line .s:fmt_none
|
||||||
|
exe "hi! CursorLine" .s:fg_none .s:bg_line .s:fmt_none
|
||||||
|
exe "hi! Directory" .s:fg_blue .s:bg_none .s:fmt_none
|
||||||
|
exe "hi! DiffAdd" .s:fg_green .s:bg_addbg .s:fmt_none
|
||||||
|
exe "hi! DiffChange" .s:fg_purple .s:bg_changebg .s:fmt_none
|
||||||
|
exe "hi! DiffDelete" .s:fg_red .s:bg_delbg .s:fmt_none
|
||||||
|
exe "hi! DiffText" .s:fg_background .s:bg_purple .s:fmt_none
|
||||||
|
exe "hi! ErrorMsg" .s:fg_background .s:bg_red .s:fmt_stnd
|
||||||
|
exe "hi! VertSplit" .s:fg_window .s:bg_none .s:fmt_none
|
||||||
|
exe "hi! Folded" .s:fg_background .s:bg_darkcolumn .s:fmt_none
|
||||||
|
exe "hi! FoldColumn" .s:fg_none .s:bg_darkcolumn .s:fmt_none
|
||||||
|
exe "hi! SignColumn" .s:fg_none .s:bg_darkcolumn .s:fmt_none
|
||||||
|
" Incsearch"
|
||||||
|
exe "hi! LineNr" .s:fg_comment .s:bg_line .s:fmt_none
|
||||||
|
exe "hi! CursorLineNr" .s:fg_orange .s:bg_none .s:fmt_bold
|
||||||
|
exe "hi! MatchParen" .s:fg_background .s:bg_aqua .s:fmt_none
|
||||||
|
exe "hi! ModeMsg" .s:fg_green .s:bg_none .s:fmt_none
|
||||||
|
exe "hi! MoreMsg" .s:fg_green .s:bg_none .s:fmt_none
|
||||||
|
exe "hi! NonText" .s:fg_selection .s:bg_none .s:fmt_none
|
||||||
|
exe "hi! Normal" .s:fg_foreground .s:bg_background .s:fmt_none
|
||||||
|
exe "hi! Pmenu" .s:fg_foreground .s:bg_selection .s:fmt_none
|
||||||
|
exe "hi! PmenuSel" .s:fg_foreground .s:bg_selection .s:fmt_revr
|
||||||
|
" PmenuSbar"
|
||||||
|
" PmenuThumb"
|
||||||
|
exe "hi! Question" .s:fg_green .s:bg_none .s:fmt_none
|
||||||
|
exe "hi! Search" .s:fg_background .s:bg_yellow .s:fmt_none
|
||||||
|
exe "hi! SpecialKey" .s:fg_selection .s:bg_none .s:fmt_none
|
||||||
|
exe "hi! SpellBad" .s:fg_red .s:bg_none .s:fmt_undr
|
||||||
|
exe "hi! SpellCap" .s:fg_blue .s:bg_none .s:fmt_undr
|
||||||
|
exe "hi! SpellLocal" .s:fg_aqua .s:bg_none .s:fmt_undr
|
||||||
|
exe "hi! SpellRare" .s:fg_purple .s:bg_none .s:fmt_undr
|
||||||
|
exe "hi! StatusLine" .s:fg_comment .s:bg_background .s:fmt_revr
|
||||||
|
exe "hi! StatusLineNC" .s:fg_window .s:bg_foreground .s:fmt_revr
|
||||||
|
exe "hi! TabLine" .s:fg_foreground .s:bg_darkcolumn .s:fmt_revr
|
||||||
|
" TabLineFill"
|
||||||
|
" TabLineSel"
|
||||||
|
exe "hi! Title" .s:fg_yellow .s:bg_none .s:fmt_none
|
||||||
|
exe "hi! Visual" .s:fg_none .s:bg_selection .s:fmt_none
|
||||||
|
" VisualNos"
|
||||||
|
exe "hi! WarningMsg" .s:fg_red .s:bg_none .s:fmt_none
|
||||||
|
" WildMenu"
|
||||||
|
|
||||||
|
"}}}
|
||||||
|
" Generic Syntax Highlighting: (see :help group-name)"{{{
|
||||||
|
" ----------------------------------------------------------------------------
|
||||||
|
exe "hi! Comment" .s:fg_comment .s:bg_none .s:fmt_none
|
||||||
|
|
||||||
|
exe "hi! Constant" .s:fg_aqua .s:bg_none .s:fmt_none
|
||||||
|
"exe "hi! String" .s:fg_green .s:bg_none .s:fmt_none
|
||||||
|
" Character"
|
||||||
|
" Number"
|
||||||
|
" Boolean"
|
||||||
|
" Float"
|
||||||
|
|
||||||
|
exe "hi! Identifier" .s:fg_blue .s:bg_none .s:fmt_none
|
||||||
|
"exe "hi! Function" .s:fg_yellow .s:bg_none .s:fmt_none
|
||||||
|
|
||||||
|
exe "hi! Statement" .s:fg_green .s:bg_none .s:fmt_none
|
||||||
|
" Conditional"
|
||||||
|
" Repeat"
|
||||||
|
" Label"
|
||||||
|
"exe "hi! Operator" .s:fg_foreground .s:bg_none .s:fmt_none
|
||||||
|
" Keyword"
|
||||||
|
" Exception"
|
||||||
|
|
||||||
|
exe "hi! PreProc" .s:fg_orange .s:bg_none .s:fmt_none
|
||||||
|
" Include"
|
||||||
|
" Define"
|
||||||
|
" Macro"
|
||||||
|
" PreCondit"
|
||||||
|
|
||||||
|
exe "hi! Type" .s:fg_yellow .s:bg_none .s:fmt_none
|
||||||
|
" StorageClass"
|
||||||
|
"exe "hi! Structure" .s:fg_aqua .s:bg_none .s:fmt_none
|
||||||
|
" Typedef"
|
||||||
|
|
||||||
|
exe "hi! Special" .s:fg_red .s:bg_none .s:fmt_none
|
||||||
|
" SpecialChar"
|
||||||
|
" Tag"
|
||||||
|
" Delimiter"
|
||||||
|
" SpecialComment"
|
||||||
|
" Debug"
|
||||||
|
"
|
||||||
|
exe "hi! Underlined" .s:fg_purple .s:bg_none .s:fmt_none
|
||||||
|
|
||||||
|
exe "hi! Ignore" .s:fg_none .s:bg_none .s:fmt_none
|
||||||
|
|
||||||
|
exe "hi! Error" .s:fg_red .s:bg_none .s:fmt_undr
|
||||||
|
|
||||||
|
exe "hi! Todo" .s:fg_comment .s:bg_addbg .s:fmt_none
|
||||||
|
|
||||||
|
" Quickfix window
|
||||||
|
exe "hi! qfLineNr" .s:fg_yellow .s:bg_none .s:fmt_none
|
||||||
|
" qfFileName"
|
||||||
|
" qfLineNr"
|
||||||
|
" qfError"
|
||||||
|
|
||||||
|
"}}}
|
||||||
|
" Diff Syntax Highlighting:"{{{
|
||||||
|
" ----------------------------------------------------------------------------
|
||||||
|
" Diff
|
||||||
|
" diffOldFile
|
||||||
|
" diffNewFile
|
||||||
|
" diffFile
|
||||||
|
" diffOnly
|
||||||
|
" diffIdentical
|
||||||
|
" diffDiffer
|
||||||
|
" diffBDiffer
|
||||||
|
" diffIsA
|
||||||
|
" diffNoEOL
|
||||||
|
" diffCommon
|
||||||
|
hi! link diffRemoved Special
|
||||||
|
" diffChanged
|
||||||
|
hi! link diffAdded Statement
|
||||||
|
" diffLine
|
||||||
|
" diffSubname
|
||||||
|
" diffComment
|
||||||
|
|
||||||
|
"}}}
|
||||||
|
" Legal:"{{{
|
||||||
|
" ----------------------------------------------------------------------------
|
||||||
|
" Copyright (c) 2011 Ethan Schoonover
|
||||||
|
" Copyright (c) 2013 w0ng
|
||||||
|
"
|
||||||
|
" Permission is hereby granted, free of charge, to any per‐
|
||||||
|
" son obtaining a copy of this software and associated doc‐
|
||||||
|
" umentation files (the “Software”), to deal in the Soft‐
|
||||||
|
" ware without restriction, including without limitation
|
||||||
|
" the rights to use, copy, modify, merge, publish, distrib‐
|
||||||
|
" ute, sublicense, and/or sell copies of the Software, and
|
||||||
|
" to permit persons to whom the Software is furnished to do
|
||||||
|
" so, subject to the following conditions:
|
||||||
|
"
|
||||||
|
" The above copyright notice and this permission notice
|
||||||
|
" shall be included in all copies or substantial portions
|
||||||
|
" of the Software.
|
||||||
|
"
|
||||||
|
" THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY
|
||||||
|
" KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO
|
||||||
|
" THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICU‐
|
||||||
|
" LAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||||
|
" AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
|
||||||
|
" DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CON‐
|
||||||
|
" TRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON‐
|
||||||
|
" NECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||||
|
" THE SOFTWARE.
|
||||||
|
|
||||||
|
" }}}
|
||||||
|
|
@ -0,0 +1,444 @@
|
||||||
|
" File: hybrid.vim
|
||||||
|
" Maintainer: Andrew Wong (w0ng)
|
||||||
|
" URL: https://github.com/w0ng/vim-hybrid
|
||||||
|
" Modified: 27 Jan 2013 07:33 AM AEST
|
||||||
|
" License: MIT
|
||||||
|
|
||||||
|
" Description:"{{{
|
||||||
|
" ----------------------------------------------------------------------------
|
||||||
|
" The RGB colour palette is taken from Tomorrow-Night.vim:
|
||||||
|
" https://github.com/chriskempson/vim-tomorrow-theme
|
||||||
|
"
|
||||||
|
" The syntax highlighting scheme is taken from jellybeans.vim:
|
||||||
|
" https://github.com/nanotech/jellybeans.vim
|
||||||
|
"
|
||||||
|
" The code taken from solarized.vim
|
||||||
|
" https://github.com/altercation/vim-colors-solarized
|
||||||
|
|
||||||
|
"}}}
|
||||||
|
" Requirements And Recommendations:"{{{
|
||||||
|
" ----------------------------------------------------------------------------
|
||||||
|
" This colourscheme is intended for use on:
|
||||||
|
" - gVim 7.3 for Linux, Mac and Windows.
|
||||||
|
" - Vim 7.3 for Linux, using a 256 colour enabled terminal.
|
||||||
|
"
|
||||||
|
" By default, Vim will use the closest matching cterm equivalent of the RGB
|
||||||
|
" colours.
|
||||||
|
"
|
||||||
|
" However, Due to the limited 256 palette, colours in Vim and gVim will still
|
||||||
|
" be noticeably different. In order to get a uniform appearance and the way
|
||||||
|
" that this colourscheme was intended, it is HIGHLY recommended that you:
|
||||||
|
"
|
||||||
|
" 1. Add these colours to ~/.Xresources:
|
||||||
|
"
|
||||||
|
" https://gist.github.com/3278077
|
||||||
|
"
|
||||||
|
" 2. Use Xresources colours by setting in ~/.vimrc:
|
||||||
|
"
|
||||||
|
" let g:hybrid_use_Xresources = 1
|
||||||
|
" colorscheme hybrid
|
||||||
|
"
|
||||||
|
" For iTerm2 users:
|
||||||
|
" 1. Install this color preset on your iTerm2:
|
||||||
|
"
|
||||||
|
" https://gist.github.com/luan/6362811
|
||||||
|
"
|
||||||
|
" 2. Use iTerm colours by setting in ~/.vimrc:
|
||||||
|
"
|
||||||
|
" let g:hybrid_use_iTerm_colors = 1
|
||||||
|
" colorscheme hybrid
|
||||||
|
"
|
||||||
|
|
||||||
|
"}}}
|
||||||
|
" Initialisation:"{{{
|
||||||
|
" ----------------------------------------------------------------------------
|
||||||
|
if !has("gui_running") && &t_Co < 256
|
||||||
|
finish
|
||||||
|
endif
|
||||||
|
|
||||||
|
if !exists("g:hybrid_use_Xresources")
|
||||||
|
let g:hybrid_use_Xresources = 0
|
||||||
|
endif
|
||||||
|
|
||||||
|
if !exists("g:hybrid_use_iTerm_colors")
|
||||||
|
let g:hybrid_use_iTerm_colors = 0
|
||||||
|
endif
|
||||||
|
|
||||||
|
set background=dark
|
||||||
|
hi clear
|
||||||
|
|
||||||
|
if exists("syntax_on")
|
||||||
|
syntax reset
|
||||||
|
endif
|
||||||
|
|
||||||
|
let colors_name = "hybrid"
|
||||||
|
|
||||||
|
"}}}
|
||||||
|
" GUI And Cterm Palettes:"{{{
|
||||||
|
" ----------------------------------------------------------------------------
|
||||||
|
if has("gui_running")
|
||||||
|
let s:vmode = "gui"
|
||||||
|
let s:background = "#1d1f21"
|
||||||
|
let s:foreground = "#c5c8c6"
|
||||||
|
let s:selection = "#373b41"
|
||||||
|
let s:line = "#282a2e"
|
||||||
|
let s:comment = "#707880"
|
||||||
|
let s:red = "#cc6666"
|
||||||
|
let s:orange = "#de935f"
|
||||||
|
let s:yellow = "#f0c674"
|
||||||
|
let s:green = "#b5bd68"
|
||||||
|
let s:aqua = "#8abeb7"
|
||||||
|
let s:blue = "#81a2be"
|
||||||
|
let s:purple = "#b294bb"
|
||||||
|
let s:window = "#303030"
|
||||||
|
let s:darkcolumn = "#1c1c1c"
|
||||||
|
let s:addbg = "#5F875F"
|
||||||
|
let s:addfg = "#d7ffaf"
|
||||||
|
let s:changebg = "#5F5F87"
|
||||||
|
let s:changefg = "#d7d7ff"
|
||||||
|
let s:darkblue = "#00005f"
|
||||||
|
let s:darkcyan = "#005f5f"
|
||||||
|
let s:darkred = "#5f0000"
|
||||||
|
let s:darkpurple = "#5f005f"
|
||||||
|
else
|
||||||
|
let s:vmode = "cterm"
|
||||||
|
let s:background = "234"
|
||||||
|
let s:window = "236"
|
||||||
|
let s:darkcolumn = "234"
|
||||||
|
let s:addbg = "65"
|
||||||
|
let s:addfg = "193"
|
||||||
|
let s:changebg = "60"
|
||||||
|
let s:changefg = "189"
|
||||||
|
let s:darkblue = "17"
|
||||||
|
let s:darkcyan = "24"
|
||||||
|
let s:darkred = "52"
|
||||||
|
let s:darkpurple = "53"
|
||||||
|
if g:hybrid_use_Xresources == 1
|
||||||
|
let s:foreground = "15" " White
|
||||||
|
let s:selection = "8" " DarkGrey
|
||||||
|
let s:line = "0" " Black
|
||||||
|
let s:comment = "7" " LightGrey
|
||||||
|
let s:red = "9" " LightRed
|
||||||
|
let s:orange = "3" " DarkYellow
|
||||||
|
let s:yellow = "11" " LightYellow
|
||||||
|
let s:green = "10" " LightGreen
|
||||||
|
let s:aqua = "14" " LightCyan
|
||||||
|
let s:blue = "12" " LightBlue
|
||||||
|
let s:purple = "13" " LightMagenta
|
||||||
|
elseif g:hybrid_use_iTerm_colors == 1
|
||||||
|
let s:background = "8"
|
||||||
|
let s:foreground = "15"
|
||||||
|
let s:selection = "13"
|
||||||
|
let s:line = "0"
|
||||||
|
let s:comment = "7"
|
||||||
|
let s:red = "1"
|
||||||
|
let s:orange = "9"
|
||||||
|
let s:yellow = "3"
|
||||||
|
let s:green = "2"
|
||||||
|
let s:aqua = "6"
|
||||||
|
let s:blue = "4"
|
||||||
|
let s:purple = "5"
|
||||||
|
let s:darkcolumn = "11"
|
||||||
|
let s:addbg = "10"
|
||||||
|
let s:changebg = "12"
|
||||||
|
else
|
||||||
|
let s:foreground = "250"
|
||||||
|
let s:selection = "237"
|
||||||
|
let s:line = "235"
|
||||||
|
let s:comment = "243"
|
||||||
|
let s:red = "167"
|
||||||
|
let s:orange = "173"
|
||||||
|
let s:yellow = "221"
|
||||||
|
let s:green = "143"
|
||||||
|
let s:aqua = "109"
|
||||||
|
let s:blue = "110"
|
||||||
|
let s:purple = "139"
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
|
||||||
|
"}}}
|
||||||
|
" Formatting Options:"{{{
|
||||||
|
" ----------------------------------------------------------------------------
|
||||||
|
let s:none = "NONE"
|
||||||
|
let s:t_none = "NONE"
|
||||||
|
let s:n = "NONE"
|
||||||
|
let s:c = ",undercurl"
|
||||||
|
let s:r = ",reverse"
|
||||||
|
let s:s = ",standout"
|
||||||
|
let s:b = ",bold"
|
||||||
|
let s:u = ",underline"
|
||||||
|
let s:i = ",italic"
|
||||||
|
|
||||||
|
"}}}
|
||||||
|
" Highlighting Primitives:"{{{
|
||||||
|
" ----------------------------------------------------------------------------
|
||||||
|
exe "let s:bg_none = ' ".s:vmode."bg=".s:none ."'"
|
||||||
|
exe "let s:bg_foreground = ' ".s:vmode."bg=".s:foreground."'"
|
||||||
|
exe "let s:bg_background = ' ".s:vmode."bg=".s:background."'"
|
||||||
|
exe "let s:bg_selection = ' ".s:vmode."bg=".s:selection ."'"
|
||||||
|
exe "let s:bg_line = ' ".s:vmode."bg=".s:line ."'"
|
||||||
|
exe "let s:bg_comment = ' ".s:vmode."bg=".s:comment ."'"
|
||||||
|
exe "let s:bg_red = ' ".s:vmode."bg=".s:red ."'"
|
||||||
|
exe "let s:bg_orange = ' ".s:vmode."bg=".s:orange ."'"
|
||||||
|
exe "let s:bg_yellow = ' ".s:vmode."bg=".s:yellow ."'"
|
||||||
|
exe "let s:bg_green = ' ".s:vmode."bg=".s:green ."'"
|
||||||
|
exe "let s:bg_aqua = ' ".s:vmode."bg=".s:aqua ."'"
|
||||||
|
exe "let s:bg_blue = ' ".s:vmode."bg=".s:blue ."'"
|
||||||
|
exe "let s:bg_purple = ' ".s:vmode."bg=".s:purple ."'"
|
||||||
|
exe "let s:bg_window = ' ".s:vmode."bg=".s:window ."'"
|
||||||
|
exe "let s:bg_darkcolumn = ' ".s:vmode."bg=".s:darkcolumn."'"
|
||||||
|
exe "let s:bg_addbg = ' ".s:vmode."bg=".s:addbg ."'"
|
||||||
|
exe "let s:bg_addfg = ' ".s:vmode."bg=".s:addfg ."'"
|
||||||
|
exe "let s:bg_changebg = ' ".s:vmode."bg=".s:changebg ."'"
|
||||||
|
exe "let s:bg_changefg = ' ".s:vmode."bg=".s:changefg ."'"
|
||||||
|
exe "let s:bg_darkblue = ' ".s:vmode."bg=".s:darkblue ."'"
|
||||||
|
exe "let s:bg_darkcyan = ' ".s:vmode."bg=".s:darkcyan ."'"
|
||||||
|
exe "let s:bg_darkred = ' ".s:vmode."bg=".s:darkred ."'"
|
||||||
|
exe "let s:bg_darkpurple = ' ".s:vmode."bg=".s:darkpurple."'"
|
||||||
|
|
||||||
|
exe "let s:fg_none = ' ".s:vmode."fg=".s:none ."'"
|
||||||
|
exe "let s:fg_foreground = ' ".s:vmode."fg=".s:foreground."'"
|
||||||
|
exe "let s:fg_background = ' ".s:vmode."fg=".s:background."'"
|
||||||
|
exe "let s:fg_selection = ' ".s:vmode."fg=".s:selection ."'"
|
||||||
|
exe "let s:fg_line = ' ".s:vmode."fg=".s:line ."'"
|
||||||
|
exe "let s:fg_comment = ' ".s:vmode."fg=".s:comment ."'"
|
||||||
|
exe "let s:fg_red = ' ".s:vmode."fg=".s:red ."'"
|
||||||
|
exe "let s:fg_orange = ' ".s:vmode."fg=".s:orange ."'"
|
||||||
|
exe "let s:fg_yellow = ' ".s:vmode."fg=".s:yellow ."'"
|
||||||
|
exe "let s:fg_green = ' ".s:vmode."fg=".s:green ."'"
|
||||||
|
exe "let s:fg_aqua = ' ".s:vmode."fg=".s:aqua ."'"
|
||||||
|
exe "let s:fg_blue = ' ".s:vmode."fg=".s:blue ."'"
|
||||||
|
exe "let s:fg_purple = ' ".s:vmode."fg=".s:purple ."'"
|
||||||
|
exe "let s:fg_window = ' ".s:vmode."fg=".s:window ."'"
|
||||||
|
exe "let s:fg_darkcolumn = ' ".s:vmode."fg=".s:darkcolumn."'"
|
||||||
|
exe "let s:fg_addbg = ' ".s:vmode."fg=".s:addbg ."'"
|
||||||
|
exe "let s:fg_addfg = ' ".s:vmode."fg=".s:addfg ."'"
|
||||||
|
exe "let s:fg_changebg = ' ".s:vmode."fg=".s:changebg ."'"
|
||||||
|
exe "let s:fg_changefg = ' ".s:vmode."fg=".s:changefg ."'"
|
||||||
|
exe "let s:fg_darkblue = ' ".s:vmode."fg=".s:darkblue ."'"
|
||||||
|
exe "let s:fg_darkcyan = ' ".s:vmode."fg=".s:darkcyan ."'"
|
||||||
|
exe "let s:fg_darkred = ' ".s:vmode."fg=".s:darkred ."'"
|
||||||
|
exe "let s:fg_darkpurple = ' ".s:vmode."fg=".s:darkpurple."'"
|
||||||
|
|
||||||
|
exe "let s:fmt_none = ' ".s:vmode."=NONE". " term=NONE" ."'"
|
||||||
|
exe "let s:fmt_bold = ' ".s:vmode."=NONE".s:b. " term=NONE".s:b ."'"
|
||||||
|
exe "let s:fmt_bldi = ' ".s:vmode."=NONE".s:b. " term=NONE".s:b ."'"
|
||||||
|
exe "let s:fmt_undr = ' ".s:vmode."=NONE".s:u. " term=NONE".s:u ."'"
|
||||||
|
exe "let s:fmt_undb = ' ".s:vmode."=NONE".s:u.s:b. " term=NONE".s:u.s:b."'"
|
||||||
|
exe "let s:fmt_undi = ' ".s:vmode."=NONE".s:u. " term=NONE".s:u ."'"
|
||||||
|
exe "let s:fmt_curl = ' ".s:vmode."=NONE".s:c. " term=NONE".s:c ."'"
|
||||||
|
exe "let s:fmt_ital = ' ".s:vmode."=NONE".s:i. " term=NONE".s:i ."'"
|
||||||
|
exe "let s:fmt_stnd = ' ".s:vmode."=NONE".s:s. " term=NONE".s:s ."'"
|
||||||
|
exe "let s:fmt_revr = ' ".s:vmode."=NONE".s:r. " term=NONE".s:r ."'"
|
||||||
|
exe "let s:fmt_revb = ' ".s:vmode."=NONE".s:r.s:b. " term=NONE".s:r.s:b."'"
|
||||||
|
|
||||||
|
if has("gui_running")
|
||||||
|
exe "let s:sp_none = ' guisp=".s:none ."'"
|
||||||
|
exe "let s:sp_foreground = ' guisp=".s:foreground."'"
|
||||||
|
exe "let s:sp_background = ' guisp=".s:background."'"
|
||||||
|
exe "let s:sp_selection = ' guisp=".s:selection ."'"
|
||||||
|
exe "let s:sp_line = ' guisp=".s:line ."'"
|
||||||
|
exe "let s:sp_comment = ' guisp=".s:comment ."'"
|
||||||
|
exe "let s:sp_red = ' guisp=".s:red ."'"
|
||||||
|
exe "let s:sp_orange = ' guisp=".s:orange ."'"
|
||||||
|
exe "let s:sp_yellow = ' guisp=".s:yellow ."'"
|
||||||
|
exe "let s:sp_green = ' guisp=".s:green ."'"
|
||||||
|
exe "let s:sp_aqua = ' guisp=".s:aqua ."'"
|
||||||
|
exe "let s:sp_blue = ' guisp=".s:blue ."'"
|
||||||
|
exe "let s:sp_purple = ' guisp=".s:purple ."'"
|
||||||
|
exe "let s:sp_window = ' guisp=".s:window ."'"
|
||||||
|
exe "let s:sp_addbg = ' guisp=".s:addbg ."'"
|
||||||
|
exe "let s:sp_addfg = ' guisp=".s:addfg ."'"
|
||||||
|
exe "let s:sp_changebg = ' guisp=".s:changebg ."'"
|
||||||
|
exe "let s:sp_changefg = ' guisp=".s:changefg ."'"
|
||||||
|
exe "let s:sp_darkblue = ' guisp=".s:darkblue ."'"
|
||||||
|
exe "let s:sp_darkcyan = ' guisp=".s:darkcyan ."'"
|
||||||
|
exe "let s:sp_darkred = ' guisp=".s:darkred ."'"
|
||||||
|
exe "let s:sp_darkpurple = ' guisp=".s:darkpurple."'"
|
||||||
|
else
|
||||||
|
let s:sp_none = ""
|
||||||
|
let s:sp_foreground = ""
|
||||||
|
let s:sp_background = ""
|
||||||
|
let s:sp_selection = ""
|
||||||
|
let s:sp_line = ""
|
||||||
|
let s:sp_comment = ""
|
||||||
|
let s:sp_red = ""
|
||||||
|
let s:sp_orange = ""
|
||||||
|
let s:sp_yellow = ""
|
||||||
|
let s:sp_green = ""
|
||||||
|
let s:sp_aqua = ""
|
||||||
|
let s:sp_blue = ""
|
||||||
|
let s:sp_purple = ""
|
||||||
|
let s:sp_window = ""
|
||||||
|
let s:sp_addbg = ""
|
||||||
|
let s:sp_addfg = ""
|
||||||
|
let s:sp_changebg = ""
|
||||||
|
let s:sp_changefg = ""
|
||||||
|
let s:sp_darkblue = ""
|
||||||
|
let s:sp_darkcyan = ""
|
||||||
|
let s:sp_darkred = ""
|
||||||
|
let s:sp_darkpurple = ""
|
||||||
|
endif
|
||||||
|
|
||||||
|
"}}}
|
||||||
|
" Vim Highlighting: (see :help highlight-groups)"{{{
|
||||||
|
" ----------------------------------------------------------------------------
|
||||||
|
exe "hi! ColorColumn" .s:fg_none .s:bg_line .s:fmt_none
|
||||||
|
" Conceal"
|
||||||
|
" Cursor"
|
||||||
|
" CursorIM"
|
||||||
|
exe "hi! CursorColumn" .s:fg_none .s:bg_line .s:fmt_none
|
||||||
|
exe "hi! CursorLine" .s:fg_none .s:bg_line .s:fmt_none
|
||||||
|
exe "hi! Directory" .s:fg_blue .s:bg_none .s:fmt_none
|
||||||
|
exe "hi! DiffAdd" .s:fg_addfg .s:bg_addbg .s:fmt_none
|
||||||
|
exe "hi! DiffChange" .s:fg_changefg .s:bg_changebg .s:fmt_none
|
||||||
|
exe "hi! DiffDelete" .s:fg_background .s:bg_red .s:fmt_none
|
||||||
|
exe "hi! DiffText" .s:fg_background .s:bg_blue .s:fmt_none
|
||||||
|
exe "hi! ErrorMsg" .s:fg_background .s:bg_red .s:fmt_stnd
|
||||||
|
exe "hi! VertSplit" .s:fg_window .s:bg_none .s:fmt_none
|
||||||
|
exe "hi! Folded" .s:fg_comment .s:bg_darkcolumn .s:fmt_none
|
||||||
|
exe "hi! FoldColumn" .s:fg_none .s:bg_darkcolumn .s:fmt_none
|
||||||
|
exe "hi! SignColumn" .s:fg_none .s:bg_darkcolumn .s:fmt_none
|
||||||
|
" Incsearch"
|
||||||
|
exe "hi! LineNr" .s:fg_selection .s:bg_none .s:fmt_none
|
||||||
|
exe "hi! CursorLineNr" .s:fg_yellow .s:bg_none .s:fmt_bold
|
||||||
|
exe "hi! MatchParen" .s:fg_background .s:bg_changebg .s:fmt_none
|
||||||
|
exe "hi! ModeMsg" .s:fg_green .s:bg_none .s:fmt_none
|
||||||
|
exe "hi! MoreMsg" .s:fg_green .s:bg_none .s:fmt_none
|
||||||
|
exe "hi! NonText" .s:fg_selection .s:bg_none .s:fmt_none
|
||||||
|
exe "hi! Pmenu" .s:fg_foreground .s:bg_selection .s:fmt_none
|
||||||
|
exe "hi! PmenuSel" .s:fg_foreground .s:bg_selection .s:fmt_revr
|
||||||
|
" PmenuSbar"
|
||||||
|
" PmenuThumb"
|
||||||
|
exe "hi! Question" .s:fg_green .s:bg_none .s:fmt_none
|
||||||
|
exe "hi! Search" .s:fg_background .s:bg_yellow .s:fmt_none
|
||||||
|
exe "hi! SpecialKey" .s:fg_selection .s:bg_none .s:fmt_none
|
||||||
|
exe "hi! SpellCap" .s:fg_blue .s:bg_darkblue .s:fmt_undr
|
||||||
|
exe "hi! SpellLocal" .s:fg_aqua .s:bg_darkcyan .s:fmt_undr
|
||||||
|
exe "hi! SpellBad" .s:fg_red .s:bg_darkred .s:fmt_undr
|
||||||
|
exe "hi! SpellRare" .s:fg_purple .s:bg_darkpurple .s:fmt_undr
|
||||||
|
exe "hi! StatusLine" .s:fg_comment .s:bg_background .s:fmt_revr
|
||||||
|
exe "hi! StatusLineNC" .s:fg_window .s:bg_comment .s:fmt_revr
|
||||||
|
exe "hi! TabLine" .s:fg_foreground .s:bg_darkcolumn .s:fmt_revr
|
||||||
|
" TabLineFill"
|
||||||
|
" TabLineSel"
|
||||||
|
exe "hi! Title" .s:fg_yellow .s:bg_none .s:fmt_none
|
||||||
|
exe "hi! Visual" .s:fg_none .s:bg_selection .s:fmt_none
|
||||||
|
" VisualNos"
|
||||||
|
exe "hi! WarningMsg" .s:fg_red .s:bg_none .s:fmt_none
|
||||||
|
" WildMenu"
|
||||||
|
|
||||||
|
" Use Xresources for background colour
|
||||||
|
if has('gui_running') || (g:hybrid_use_Xresources != 1 && g:hybrid_use_iTerm_colors != 1)
|
||||||
|
exe "hi! Normal" .s:fg_foreground .s:bg_background .s:fmt_none
|
||||||
|
else
|
||||||
|
exe "hi! Normal" .s:fg_foreground .s:bg_none .s:fmt_none
|
||||||
|
endif
|
||||||
|
|
||||||
|
"}}}
|
||||||
|
" Generic Syntax Highlighting: (see :help group-name)"{{{
|
||||||
|
" ----------------------------------------------------------------------------
|
||||||
|
exe "hi! Comment" .s:fg_comment .s:bg_none .s:fmt_none
|
||||||
|
|
||||||
|
exe "hi! Constant" .s:fg_red .s:bg_none .s:fmt_none
|
||||||
|
exe "hi! String" .s:fg_green .s:bg_none .s:fmt_none
|
||||||
|
" Character"
|
||||||
|
" Number"
|
||||||
|
" Boolean"
|
||||||
|
" Float"
|
||||||
|
|
||||||
|
exe "hi! Identifier" .s:fg_purple .s:bg_none .s:fmt_none
|
||||||
|
exe "hi! Function" .s:fg_yellow .s:bg_none .s:fmt_none
|
||||||
|
|
||||||
|
exe "hi! Statement" .s:fg_blue .s:bg_none .s:fmt_none
|
||||||
|
" Conditional"
|
||||||
|
" Repeat"
|
||||||
|
" Label"
|
||||||
|
exe "hi! Operator" .s:fg_aqua .s:bg_none .s:fmt_none
|
||||||
|
" Keyword"
|
||||||
|
" Exception"
|
||||||
|
|
||||||
|
exe "hi! PreProc" .s:fg_aqua .s:bg_none .s:fmt_none
|
||||||
|
" Include"
|
||||||
|
" Define"
|
||||||
|
" Macro"
|
||||||
|
" PreCondit"
|
||||||
|
|
||||||
|
exe "hi! Type" .s:fg_orange .s:bg_none .s:fmt_none
|
||||||
|
" StorageClass"
|
||||||
|
exe "hi! Structure" .s:fg_aqua .s:bg_none .s:fmt_none
|
||||||
|
" Typedef"
|
||||||
|
|
||||||
|
exe "hi! Special" .s:fg_green .s:bg_none .s:fmt_none
|
||||||
|
" SpecialChar"
|
||||||
|
" Tag"
|
||||||
|
" Delimiter"
|
||||||
|
" SpecialComment"
|
||||||
|
" Debug"
|
||||||
|
"
|
||||||
|
exe "hi! Underlined" .s:fg_blue .s:bg_none .s:fmt_none
|
||||||
|
|
||||||
|
exe "hi! Ignore" .s:fg_none .s:bg_none .s:fmt_none
|
||||||
|
|
||||||
|
exe "hi! Error" .s:fg_red .s:bg_darkred .s:fmt_undr
|
||||||
|
|
||||||
|
exe "hi! Todo" .s:fg_addfg .s:bg_none .s:fmt_none
|
||||||
|
|
||||||
|
" Quickfix window highlighting
|
||||||
|
exe "hi! qfLineNr" .s:fg_yellow .s:bg_none .s:fmt_none
|
||||||
|
" qfFileName"
|
||||||
|
" qfLineNr"
|
||||||
|
" qfError"
|
||||||
|
|
||||||
|
"}}}
|
||||||
|
" Diff Syntax Highlighting:"{{{
|
||||||
|
" ----------------------------------------------------------------------------
|
||||||
|
" Diff
|
||||||
|
" diffOldFile
|
||||||
|
" diffNewFile
|
||||||
|
" diffFile
|
||||||
|
" diffOnly
|
||||||
|
" diffIdentical
|
||||||
|
" diffDiffer
|
||||||
|
" diffBDiffer
|
||||||
|
" diffIsA
|
||||||
|
" diffNoEOL
|
||||||
|
" diffCommon
|
||||||
|
hi! link diffRemoved Constant
|
||||||
|
" diffChanged
|
||||||
|
hi! link diffAdded Special
|
||||||
|
" diffLine
|
||||||
|
" diffSubname
|
||||||
|
" diffComment
|
||||||
|
|
||||||
|
"}}}
|
||||||
|
" Legal:"{{{
|
||||||
|
" ----------------------------------------------------------------------------
|
||||||
|
" Copyright (c) 2011 Ethan Schoonover
|
||||||
|
" Copyright (c) 2009-2012 NanoTech
|
||||||
|
" Copyright (c) 2012 w0ng
|
||||||
|
"
|
||||||
|
" Permission is hereby granted, free of charge, to any per‐
|
||||||
|
" son obtaining a copy of this software and associated doc‐
|
||||||
|
" umentation files (the “Software”), to deal in the Soft‐
|
||||||
|
" ware without restriction, including without limitation
|
||||||
|
" the rights to use, copy, modify, merge, publish, distrib‐
|
||||||
|
" ute, sublicense, and/or sell copies of the Software, and
|
||||||
|
" to permit persons to whom the Software is furnished to do
|
||||||
|
" so, subject to the following conditions:
|
||||||
|
"
|
||||||
|
" The above copyright notice and this permission notice
|
||||||
|
" shall be included in all copies or substantial portions
|
||||||
|
" of the Software.
|
||||||
|
"
|
||||||
|
" THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY
|
||||||
|
" KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO
|
||||||
|
" THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICU‐
|
||||||
|
" LAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||||
|
" AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
|
||||||
|
" DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CON‐
|
||||||
|
" TRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON‐
|
||||||
|
" NECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||||
|
" THE SOFTWARE.
|
||||||
|
|
||||||
|
" }}}
|
||||||
|
|
@ -0,0 +1,42 @@
|
||||||
|
filetype plugin on
|
||||||
|
filetype plugin indent on
|
||||||
|
execute pathogen#infect()
|
||||||
|
syntax enable
|
||||||
|
set background=dark
|
||||||
|
colorscheme koehler
|
||||||
|
let g:solarized_termcolors=256
|
||||||
|
|
||||||
|
set bs=2
|
||||||
|
set nocompatible
|
||||||
|
set ts=2
|
||||||
|
set pastetoggle=<F2>
|
||||||
|
set number
|
||||||
|
set expandtab
|
||||||
|
set tabstop=4
|
||||||
|
set shiftwidth=4
|
||||||
|
set softtabstop=4
|
||||||
|
set textwidth=79
|
||||||
|
set autoindent
|
||||||
|
set mouse=a
|
||||||
|
set hls is
|
||||||
|
set encoding=utf-8
|
||||||
|
|
||||||
|
" Only do this part when compiled with support for autocommands
|
||||||
|
if has("autocmd")
|
||||||
|
" Enable file type detection
|
||||||
|
filetype on
|
||||||
|
|
||||||
|
" Syntax of these languages is fussy over tabs Vs spaces
|
||||||
|
autocmd FileType make setlocal ts=8 sts=8 sw=8 noexpandtab
|
||||||
|
autocmd FileType yaml setlocal ts=2 sts=2 sw=2 expandtab
|
||||||
|
|
||||||
|
" Customisations based on house-style (arbitrary)
|
||||||
|
autocmd FileType html setlocal ts=2 sts=2 sw=2 expandtab
|
||||||
|
autocmd FileType css setlocal ts=2 sts=2 sw=2 expandtab
|
||||||
|
autocmd FileType javascript setlocal ts=4 sts=4 sw=4 noexpandtab
|
||||||
|
autocmd FileType python setlocal omnifunc=pythoncomplete#Complete
|
||||||
|
|
||||||
|
" Treat .rss files as XML
|
||||||
|
autocmd BufNewFile,BufRead *.rss setfiletype xml
|
||||||
|
endif
|
||||||
|
|
||||||
|
|
@ -0,0 +1,14 @@
|
||||||
|
alias rmdir='rm -r'
|
||||||
|
alias sl='ls'
|
||||||
|
alias myip="wget -qO- ifconfig.me/ip"
|
||||||
|
alias memoryhog="ps aux | sort -nk +4 | tail"
|
||||||
|
alias stripext="ls -1 | sed 's/\(.*\)\..*/\1/'"
|
||||||
|
alias macgen="openssl rand -hex 6 | sed 's/\(..\)/\1:/g;s/../00/;s/.$//' | tr '[a-z]' '[A-Z]'"
|
||||||
|
alias quickpwgen="tr -cd '[:alnum:]' < /dev/urandom | fold -w30 | head -n1"
|
||||||
|
alias sprunge="curl -F 'sprunge=<-' http://sprunge.us"
|
||||||
|
|
||||||
|
if [ "$DISABLE_LS_COLORS" != "true" ]
|
||||||
|
then
|
||||||
|
# Find the option for using colors in ls, depending on the version: Linux or BSD
|
||||||
|
ls --color -d . &>/dev/null 2>&1 && alias ls='ls --color=tty' || alias ls='ls -G'
|
||||||
|
fi
|
||||||
|
|
@ -0,0 +1,6 @@
|
||||||
|
|
||||||
|
bindkey "^K" kill-whole-line # ctrl-k
|
||||||
|
bindkey "^R" history-incremental-search-backward # ctrl-r
|
||||||
|
bindkey "^A" beginning-of-line # ctrl -a
|
||||||
|
bindkey "^E" end-of-line # ctrl-e
|
||||||
|
bindkey '^x^e' edit-command-line # ctrl-x ctrl-e
|
||||||
|
|
@ -0,0 +1,23 @@
|
||||||
|
#default apps
|
||||||
|
export EDITOR="vim"
|
||||||
|
export PAGER="most"
|
||||||
|
# history stuff
|
||||||
|
# number of lines kept in history
|
||||||
|
export HISTSIZE=1000
|
||||||
|
# number of lines saved in the history after logout
|
||||||
|
export SAVEHIST=1000
|
||||||
|
# location of history
|
||||||
|
export HISTFILE=~/.zhistory
|
||||||
|
# grep options
|
||||||
|
export GREP_OPTIONS='--color=auto'
|
||||||
|
export GREP_COLOR='1;32'
|
||||||
|
# language
|
||||||
|
export LC_ALL=en_US.UTF-8
|
||||||
|
export LANGUAGE=en_US.UTF-8
|
||||||
|
# term
|
||||||
|
export TERM=screen-256color
|
||||||
|
# Make options
|
||||||
|
if [[ -r /proc/cpuinfo ]]; then
|
||||||
|
export MAKEOPTS=-j$(($(grep -c '^processor' /proc/cpuinfo) + 1))
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
@ -0,0 +1,25 @@
|
||||||
|
# append command to history file once executed
|
||||||
|
setopt inc_append_history
|
||||||
|
# Do not write events to history that are duplicates of previous events
|
||||||
|
setopt HIST_IGNORE_DUPS
|
||||||
|
# When searching history don't display results already cycled through twice
|
||||||
|
setopt HIST_FIND_NO_DUPS
|
||||||
|
# Remove extra blanks from each command line being added to history
|
||||||
|
setopt HIST_REDUCE_BLANKS
|
||||||
|
|
||||||
|
setopt APPEND_HISTORY
|
||||||
|
setopt EXTENDED_HISTORY
|
||||||
|
setopt EXTENDED_GLOB
|
||||||
|
setopt AUTO_CD
|
||||||
|
|
||||||
|
# display PID when suspending processes as well
|
||||||
|
setopt longlistjobs
|
||||||
|
# try to avoid the 'zsh: no matches found...'
|
||||||
|
setopt nonomatch
|
||||||
|
# Turn off flow control
|
||||||
|
setopt noflowcontrol
|
||||||
|
# report the status of backgrounds jobs immediately
|
||||||
|
setopt notify
|
||||||
|
# whenever a command completion is attempted, make sure the entire command path
|
||||||
|
# is hashed first.
|
||||||
|
setopt hash_list_all
|
||||||
|
|
@ -0,0 +1,22 @@
|
||||||
|
#hooks
|
||||||
|
case $TERM in
|
||||||
|
xterm*)
|
||||||
|
precmd () {print -Pn "\e]0;%n@%m: %~\a"}
|
||||||
|
;;
|
||||||
|
screen-256color*)
|
||||||
|
precmd () {print -Pn "\e]0;%n@%m: %~\a"}
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
function set_running_app {
|
||||||
|
printf "\e]1; $PWD:t:$(history $HISTCMD | cut -b7- ) \a"
|
||||||
|
}
|
||||||
|
|
||||||
|
function preexec {
|
||||||
|
set_running_app
|
||||||
|
}
|
||||||
|
|
||||||
|
function postexec {
|
||||||
|
set_running_app
|
||||||
|
}
|
||||||
|
|
||||||
|
|
@ -0,0 +1,14 @@
|
||||||
|
autoload -U compinit promptinit edit-command-line
|
||||||
|
compinit
|
||||||
|
promptinit
|
||||||
|
zle -N edit-command-line
|
||||||
|
|
||||||
|
#prompt
|
||||||
|
prompt suse
|
||||||
|
|
||||||
|
source ~/.zsh/setopt.zsh
|
||||||
|
source ~/.zsh/exports.zsh
|
||||||
|
source ~/.zsh/aliases.zsh
|
||||||
|
source ~/.zsh/zsh_hooks.zsh
|
||||||
|
source ~/.zsh/bindings.zsh
|
||||||
|
|
||||||
|
|
@ -0,0 +1 @@
|
||||||
|
This repo contains my personal dotfiles. Feel free to reuse them.
|
||||||
|
|
@ -0,0 +1,56 @@
|
||||||
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
|
# Basic requirements - bash, git
|
||||||
|
|
||||||
|
# a die function as always
|
||||||
|
die() {
|
||||||
|
printf '%s\n' "$@" >&2
|
||||||
|
exit 1
|
||||||
|
}
|
||||||
|
|
||||||
|
# Some variable(s)
|
||||||
|
|
||||||
|
repo="git://github.com/staticsafe/dotfiles.git"
|
||||||
|
|
||||||
|
# Lets get this party on the road, shall we?
|
||||||
|
|
||||||
|
gitcheck() {
|
||||||
|
hash git &>/dev/null || die 'git does not exist, exiting'
|
||||||
|
printf '%s\n' "git check : PASSED"
|
||||||
|
}
|
||||||
|
|
||||||
|
changeshell() {
|
||||||
|
if [[ $SHELL == $(command -v zsh) ]]; then
|
||||||
|
printf '%s\n' "Your default shell is already zsh, continuing."
|
||||||
|
else
|
||||||
|
chsh -s $(command -v zsh)
|
||||||
|
printf '%s\n' "Default shell changed to zsh, logout and login to see changes"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
linkfiles() {
|
||||||
|
ln -sf ~/dotfiles/.zshrc $HOME/
|
||||||
|
ln -sf ~/dotfiles/.vimrc $HOME/
|
||||||
|
ln -sf ~/dotfiles/.tmux.conf $HOME/
|
||||||
|
ln -sf ~/dotfiles/.conkyrc $HOME/
|
||||||
|
ln -sf ~/dotfiles/.zsh $HOME/
|
||||||
|
ln -sf ~/dotfiles/.vim $HOME/
|
||||||
|
touch ~/.zhistory
|
||||||
|
}
|
||||||
|
|
||||||
|
getdotfiles() {
|
||||||
|
if [[ -d ~/dotfiles ]]; then
|
||||||
|
cd ~/dotfiles
|
||||||
|
git pull
|
||||||
|
linkfiles
|
||||||
|
else
|
||||||
|
cd
|
||||||
|
git clone $repo && cd ~/dotfiles && git submodule init && git submodule update
|
||||||
|
linkfiles
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
gitcheck
|
||||||
|
changeshell
|
||||||
|
getdotfiles
|
||||||
|
exit
|
||||||
|
|
@ -0,0 +1,15 @@
|
||||||
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
|
# Small script to update my env. Too lazy to write this into my python setup script
|
||||||
|
|
||||||
|
# A die function as always
|
||||||
|
|
||||||
|
die() {
|
||||||
|
printf '%s\n' "$@" >&2
|
||||||
|
exit 1
|
||||||
|
}
|
||||||
|
|
||||||
|
cd ~/dev/dotfiles
|
||||||
|
git pull
|
||||||
|
exec zsh
|
||||||
|
|
||||||
|
|
@ -0,0 +1,16 @@
|
||||||
|
List of tools needed for my environment, dev or otherwise (in no particular
|
||||||
|
order):
|
||||||
|
- zsh/bash ($SHELL)
|
||||||
|
- vim ($EDITOR)
|
||||||
|
- most ($PAGER)
|
||||||
|
- git/svn
|
||||||
|
- tmux
|
||||||
|
- multitail
|
||||||
|
- weechat
|
||||||
|
- mutt
|
||||||
|
- mtr
|
||||||
|
- ansible
|
||||||
|
- curl/wget
|
||||||
|
- dig
|
||||||
|
- gnupg
|
||||||
|
- traceroute
|
||||||
Loading…
Reference in New Issue