move to macos dir
This commit is contained in:
Tyrel Souza
parent
063887a90c
commit
e628aad352
@ -43,11 +43,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1672500394,
|
"lastModified": 1672600835,
|
||||||
"narHash": "sha256-yzwBzCoeRBoRzm7ySHhm72kBG0QjgFalLz2FY48iLI4=",
|
"narHash": "sha256-PCrIP7joW/SaDYbKlZGV44bBcLOXI/woLVnVHwcJlWc=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "feda52be1d59f13b9aa02f064b4f14784b9a06c8",
|
"rev": "fe1c6a5547c10a5f6b6debb22d548017f7e14263",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -15,10 +15,10 @@
|
|||||||
system = "x86_64-darwin";
|
system = "x86_64-darwin";
|
||||||
modules = [
|
modules = [
|
||||||
home-manager.darwinModules.home-manager
|
home-manager.darwinModules.home-manager
|
||||||
./hosts/ts-tl-mbp/default.nix
|
../hosts/ts-tl-mbp/default.nix
|
||||||
./hosts/ts-tl-mbp/home-manager.nix
|
../hosts/ts-tl-mbp/home-manager.nix
|
||||||
./hosts/ts-tl-mbp/brew.nix
|
../hosts/ts-tl-mbp/brew.nix
|
||||||
./hosts/ts-tl-mbp/fonts.nix
|
../hosts/ts-tl-mbp/fonts.nix
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
@ -1,80 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
|
|
||||||
# get initial directories setup
|
|
||||||
ln -s $(pwd)/bin ~/bin
|
|
||||||
|
|
||||||
if [[ $OSTYPE == darwin* ]]; then
|
|
||||||
~/bin/setup-usr-local.sh
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
rm -rf ~/.zprezto
|
|
||||||
git clone --recursive https://github.com/sorin-ionescu/prezto.git ~/.zprezto
|
|
||||||
|
|
||||||
# delete existing dotfiles
|
|
||||||
rm -rf ~/.bash_aliases
|
|
||||||
rm -rf ~/.gitconfig
|
|
||||||
rm -rf ~/.gitignore
|
|
||||||
rm -rf ~/.git_template
|
|
||||||
rm -rf ~/.hushlogin
|
|
||||||
rm -rf ~/.vim
|
|
||||||
rm -rf ~/.emacs
|
|
||||||
rm -rf ~/.vimrc
|
|
||||||
rm -rf ~/.zshrc
|
|
||||||
rm -rf ~/.pythonstartup.py
|
|
||||||
rm -rf ~/.zlogin
|
|
||||||
rm -rf ~/.zlogout
|
|
||||||
rm -rf ~/.zpreztorc
|
|
||||||
rm -rf ~/.zprofile
|
|
||||||
rm -rf ~/.zshenv
|
|
||||||
rm -rf ~/.zshrc
|
|
||||||
rm -rf ~/.tmux
|
|
||||||
rm -rf ~/.tmux.conf
|
|
||||||
rm -rf ~/.pryrc
|
|
||||||
|
|
||||||
# set Symlinks to configs
|
|
||||||
ln -s $(pwd)/bash_aliases ~/.bash_aliases
|
|
||||||
ln -s $(pwd)/gitconfig ~/.gitconfig
|
|
||||||
ln -s $(pwd)/gitignore ~/.gitignore
|
|
||||||
ln -s $(pwd)/git_template ~/.git_template
|
|
||||||
ln -s $(pwd)/hushlogin ~/.hushlogin
|
|
||||||
ln -s $(pwd)/emacs ~/.emacs
|
|
||||||
ln -s $(pwd)/vim ~/.vim
|
|
||||||
ln -s $(pwd)/vimrc ~/.vimrc
|
|
||||||
ln -s $(pwd)/zshrc ~/.zshrc
|
|
||||||
ln -s $(pwd)/pythonstartup.py ~/.pythonstartup.py
|
|
||||||
ln -s $(pwd)/zprofile.local ~/.zprofile.local
|
|
||||||
ln -s $(pwd)/zpreztorc ~/.zpreztorc
|
|
||||||
ln -s $(pwd)/tmux ~/.tmux
|
|
||||||
ln -s $(pwd)/tmux.conf ~/.tmux.conf
|
|
||||||
ln -s $(pwd)/pryrc ~/.pryrc
|
|
||||||
|
|
||||||
ln -s $HOME/.zprezto/runcoms/zlogin ~/.zlogin
|
|
||||||
ln -s $HOME/.zprezto/runcoms/zlogout ~/.zlogout
|
|
||||||
ln -s $HOME/.zprezto/runcoms/zshenv ~/.zshenv
|
|
||||||
ln -s $HOME/.zprezto/runcoms/zshrc ~/.zshrc
|
|
||||||
ln -s $HOME/.zprezto/runcoms/zprofile ~/.zprofile
|
|
||||||
echo "source ~/.zprofile.local" >> ~/.zprofile
|
|
||||||
|
|
||||||
# cleanup fish config
|
|
||||||
mkdir -p ~/.config/fish
|
|
||||||
rm -rf ~/.config/fish
|
|
||||||
ln -s $(pwd)/config/fish ~/.config/fish
|
|
||||||
|
|
||||||
# Setup vim
|
|
||||||
mkdir -p ~/.vim/bundle
|
|
||||||
cd ~/.vim/bundle
|
|
||||||
# Put Bundles Here
|
|
||||||
git clone git@github.com:JamshedVesuna/vim-markdown-preview.git
|
|
||||||
git clone git@github.com:Shougo/denite.nvim.git
|
|
||||||
git clone git@github.com:croaky/vim-colors-github.git
|
|
||||||
git clone git@github.com:danro/rename.vim.git
|
|
||||||
git clone git@github.com:fatih/vim-go.git
|
|
||||||
git clone git@github.com:kien/ctrlp.vim.git
|
|
||||||
git clone git@github.com:mileszs/ack.vim.git
|
|
||||||
git clone git@github.com:pbrisbin/vim-mkdir.git
|
|
||||||
git clone git@github.com:scrooloose/syntastic.git
|
|
||||||
git clone git@github.com:spolu/dwm.vim.git
|
|
||||||
git clone git@github.com:tpope/vim-surround.git
|
|
||||||
git clone git@github.com:vim-airline/vim-airline-themes.git
|
|
||||||
git clone git@github.com:vim-airline/vim-airline.git
|
|
||||||
10
_old/pryrc
10
_old/pryrc
@ -1,10 +0,0 @@
|
|||||||
if defined?(PryByebug)
|
|
||||||
Pry.commands.alias_command 'c', 'continue'
|
|
||||||
Pry.commands.alias_command 's', 'step'
|
|
||||||
Pry.commands.alias_command 'n', 'next'
|
|
||||||
Pry.commands.alias_command 'f', 'finish'
|
|
||||||
end
|
|
||||||
# Hit Enter to repeat last command
|
|
||||||
Pry::Commands.command /^$/, "repeat last command" do
|
|
||||||
_pry_.run_command Pry.history.to_a.last
|
|
||||||
end
|
|
||||||
@ -1,353 +0,0 @@
|
|||||||
" pathogen.vim - path option manipulation
|
|
||||||
" Maintainer: Tim Pope <http://tpo.pe/>
|
|
||||||
" Version: 2.4
|
|
||||||
|
|
||||||
" 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.
|
|
||||||
|
|
||||||
if exists("g:loaded_pathogen") || &cp
|
|
||||||
finish
|
|
||||||
endif
|
|
||||||
let g:loaded_pathogen = 1
|
|
||||||
|
|
||||||
" Point of entry for basic default usage. Give a relative path to invoke
|
|
||||||
" pathogen#interpose() (defaults to "bundle/{}"), or an absolute path to invoke
|
|
||||||
" pathogen#surround(). Curly braces are expanded with pathogen#expand():
|
|
||||||
" "bundle/{}" finds all subdirectories inside "bundle" inside all directories
|
|
||||||
" in the runtime path.
|
|
||||||
function! pathogen#infect(...) abort
|
|
||||||
for path in a:0 ? filter(reverse(copy(a:000)), 'type(v:val) == type("")') : ['bundle/{}']
|
|
||||||
if path =~# '^\%({\=[$~\\/]\|{\=\w:[\\/]\).*[{}*]'
|
|
||||||
call pathogen#surround(path)
|
|
||||||
elseif path =~# '^\%([$~\\/]\|\w:[\\/]\)'
|
|
||||||
call s:warn('Change pathogen#infect('.string(path).') to pathogen#infect('.string(path.'/{}').')')
|
|
||||||
call pathogen#surround(path . '/{}')
|
|
||||||
elseif path =~# '[{}*]'
|
|
||||||
call pathogen#interpose(path)
|
|
||||||
else
|
|
||||||
call s:warn('Change pathogen#infect('.string(path).') to pathogen#infect('.string(path.'/{}').')')
|
|
||||||
call pathogen#interpose(path . '/{}')
|
|
||||||
endif
|
|
||||||
endfor
|
|
||||||
call pathogen#cycle_filetype()
|
|
||||||
if pathogen#is_disabled($MYVIMRC)
|
|
||||||
return 'finish'
|
|
||||||
endif
|
|
||||||
return ''
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
" Split a path into a list.
|
|
||||||
function! pathogen#split(path) abort
|
|
||||||
if type(a:path) == type([]) | return a:path | endif
|
|
||||||
if empty(a:path) | return [] | endif
|
|
||||||
let split = split(a:path,'\\\@<!\%(\\\\\)*\zs,')
|
|
||||||
return map(split,'substitute(v:val,''\\\([\\,]\)'',''\1'',"g")')
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
" Convert a list to a path.
|
|
||||||
function! pathogen#join(...) abort
|
|
||||||
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
|
|
||||||
|
|
||||||
" Convert a list to a path with escaped spaces for 'path', 'tag', etc.
|
|
||||||
function! pathogen#legacyjoin(...) abort
|
|
||||||
return call('pathogen#join',[1] + a:000)
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
" Turn filetype detection off and back on again if it was already enabled.
|
|
||||||
function! pathogen#cycle_filetype() abort
|
|
||||||
if exists('g:did_load_filetypes')
|
|
||||||
filetype off
|
|
||||||
filetype on
|
|
||||||
endif
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
" Check if a bundle is disabled. A bundle is considered disabled if its
|
|
||||||
" basename or full name is included in the list g:pathogen_blacklist or the
|
|
||||||
" comma delimited environment variable $VIMBLACKLIST.
|
|
||||||
function! pathogen#is_disabled(path) abort
|
|
||||||
if a:path =~# '\~$'
|
|
||||||
return 1
|
|
||||||
endif
|
|
||||||
let sep = pathogen#slash()
|
|
||||||
let blacklist =
|
|
||||||
\ get(g:, 'pathogen_blacklist', get(g:, 'pathogen_disabled', [])) +
|
|
||||||
\ pathogen#split($VIMBLACKLIST)
|
|
||||||
if !empty(blacklist)
|
|
||||||
call map(blacklist, 'substitute(v:val, "[\\/]$", "", "")')
|
|
||||||
endif
|
|
||||||
return index(blacklist, fnamemodify(a:path, ':t')) != -1 || index(blacklist, a:path) != -1
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
" Prepend the given directory to the runtime path and append its corresponding
|
|
||||||
" after directory. Curly braces are expanded with pathogen#expand().
|
|
||||||
function! pathogen#surround(path) abort
|
|
||||||
let sep = pathogen#slash()
|
|
||||||
let rtp = pathogen#split(&rtp)
|
|
||||||
let path = fnamemodify(a:path, ':s?[\\/]\=$??')
|
|
||||||
let before = filter(pathogen#expand(path), '!pathogen#is_disabled(v:val)')
|
|
||||||
let after = filter(reverse(pathogen#expand(path, sep.'after')), '!pathogen#is_disabled(v:val[0:-7])')
|
|
||||||
call filter(rtp, 'index(before + after, v:val) == -1')
|
|
||||||
let &rtp = pathogen#join(before, rtp, after)
|
|
||||||
return &rtp
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
" For each directory in the runtime path, add a second entry with the given
|
|
||||||
" argument appended. Curly braces are expanded with pathogen#expand().
|
|
||||||
function! pathogen#interpose(name) abort
|
|
||||||
let sep = pathogen#slash()
|
|
||||||
let name = a:name
|
|
||||||
if has_key(s:done_bundles, name)
|
|
||||||
return ""
|
|
||||||
endif
|
|
||||||
let s:done_bundles[name] = 1
|
|
||||||
let list = []
|
|
||||||
for dir in pathogen#split(&rtp)
|
|
||||||
if dir =~# '\<after$'
|
|
||||||
let list += reverse(filter(pathogen#expand(dir[0:-6].name, sep.'after'), '!pathogen#is_disabled(v:val[0:-7])')) + [dir]
|
|
||||||
else
|
|
||||||
let list += [dir] + filter(pathogen#expand(dir.sep.name), '!pathogen#is_disabled(v:val)')
|
|
||||||
endif
|
|
||||||
endfor
|
|
||||||
let &rtp = pathogen#join(pathogen#uniq(list))
|
|
||||||
return 1
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
let s:done_bundles = {}
|
|
||||||
|
|
||||||
" Invoke :helptags on all non-$VIM doc directories in runtimepath.
|
|
||||||
function! pathogen#helptags() abort
|
|
||||||
let sep = pathogen#slash()
|
|
||||||
for glob in pathogen#split(&rtp)
|
|
||||||
for dir in map(split(glob(glob), "\n"), 'v:val.sep."/doc/".sep')
|
|
||||||
if (dir)[0 : strlen($VIMRUNTIME)] !=# $VIMRUNTIME.sep && filewritable(dir) == 2 && !empty(split(glob(dir.'*.txt'))) && (!filereadable(dir.'tags') || filewritable(dir.'tags'))
|
|
||||||
silent! execute 'helptags' pathogen#fnameescape(dir)
|
|
||||||
endif
|
|
||||||
endfor
|
|
||||||
endfor
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
command! -bar Helptags :call pathogen#helptags()
|
|
||||||
|
|
||||||
" Execute the given command. This is basically a backdoor for --remote-expr.
|
|
||||||
function! pathogen#execute(...) abort
|
|
||||||
for command in a:000
|
|
||||||
execute command
|
|
||||||
endfor
|
|
||||||
return ''
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
" Section: Unofficial
|
|
||||||
|
|
||||||
function! pathogen#is_absolute(path) abort
|
|
||||||
return a:path =~# (has('win32') ? '^\%([\\/]\|\w:\)[\\/]\|^[~$]' : '^[/~$]')
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
" Given a string, returns all possible permutations of comma delimited braced
|
|
||||||
" alternatives of that string. pathogen#expand('/{a,b}/{c,d}') yields
|
|
||||||
" ['/a/c', '/a/d', '/b/c', '/b/d']. Empty braces are treated as a wildcard
|
|
||||||
" and globbed. Actual globs are preserved.
|
|
||||||
function! pathogen#expand(pattern, ...) abort
|
|
||||||
let after = a:0 ? a:1 : ''
|
|
||||||
if a:pattern =~# '{[^{}]\+}'
|
|
||||||
let [pre, pat, post] = split(substitute(a:pattern, '\(.\{-\}\){\([^{}]\+\)}\(.*\)', "\\1\001\\2\001\\3", ''), "\001", 1)
|
|
||||||
let found = map(split(pat, ',', 1), 'pre.v:val.post')
|
|
||||||
let results = []
|
|
||||||
for pattern in found
|
|
||||||
call extend(results, pathogen#expand(pattern))
|
|
||||||
endfor
|
|
||||||
elseif a:pattern =~# '{}'
|
|
||||||
let pat = matchstr(a:pattern, '^.*{}[^*]*\%($\|[\\/]\)')
|
|
||||||
let post = a:pattern[strlen(pat) : -1]
|
|
||||||
let results = map(split(glob(substitute(pat, '{}', '*', 'g')), "\n"), 'v:val.post')
|
|
||||||
else
|
|
||||||
let results = [a:pattern]
|
|
||||||
endif
|
|
||||||
let vf = pathogen#slash() . 'vimfiles'
|
|
||||||
call map(results, 'v:val =~# "\\*" ? v:val.after : isdirectory(v:val.vf.after) ? v:val.vf.after : isdirectory(v:val.after) ? v:val.after : ""')
|
|
||||||
return filter(results, '!empty(v:val)')
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
" \ on Windows unless shellslash is set, / everywhere else.
|
|
||||||
function! pathogen#slash() abort
|
|
||||||
return !exists("+shellslash") || &shellslash ? '/' : '\'
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
function! pathogen#separator() abort
|
|
||||||
return pathogen#slash()
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
" Convenience wrapper around glob() which returns a list.
|
|
||||||
function! pathogen#glob(pattern) abort
|
|
||||||
let files = split(glob(a:pattern),"\n")
|
|
||||||
return map(files,'substitute(v:val,"[".pathogen#slash()."/]$","","")')
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
" Like pathogen#glob(), only limit the results to directories.
|
|
||||||
function! pathogen#glob_directories(pattern) abort
|
|
||||||
return filter(pathogen#glob(a:pattern),'isdirectory(v:val)')
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
" Remove duplicates from a list.
|
|
||||||
function! pathogen#uniq(list) abort
|
|
||||||
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
|
|
||||||
|
|
||||||
" Backport of fnameescape().
|
|
||||||
function! pathogen#fnameescape(string) abort
|
|
||||||
if exists('*fnameescape')
|
|
||||||
return fnameescape(a:string)
|
|
||||||
elseif a:string ==# '-'
|
|
||||||
return '\-'
|
|
||||||
else
|
|
||||||
return substitute(escape(a:string," \t\n*?[{`$\\%#'\"|!<"),'^[+>]','\\&','')
|
|
||||||
endif
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
" Like findfile(), but hardcoded to use the runtimepath.
|
|
||||||
function! pathogen#runtime_findfile(file,count) abort
|
|
||||||
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
|
|
||||||
|
|
||||||
" Section: Deprecated
|
|
||||||
|
|
||||||
function! s:warn(msg) abort
|
|
||||||
echohl WarningMsg
|
|
||||||
echomsg a:msg
|
|
||||||
echohl NONE
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
" Prepend all subdirectories of path to the rtp, and append all 'after'
|
|
||||||
" directories in those subdirectories. Deprecated.
|
|
||||||
function! pathogen#runtime_prepend_subdirectories(path) abort
|
|
||||||
call s:warn('Change pathogen#runtime_prepend_subdirectories('.string(a:path).') to pathogen#infect('.string(a:path.'/{}').')')
|
|
||||||
return pathogen#surround(a:path . pathogen#slash() . '{}')
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
function! pathogen#incubate(...) abort
|
|
||||||
let name = a:0 ? a:1 : 'bundle/{}'
|
|
||||||
call s:warn('Change pathogen#incubate('.(a:0 ? string(a:1) : '').') to pathogen#infect('.string(name).')')
|
|
||||||
return pathogen#interpose(name)
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
" Deprecated alias for pathogen#interpose().
|
|
||||||
function! pathogen#runtime_append_all_bundles(...) abort
|
|
||||||
if a:0
|
|
||||||
call s:warn('Change pathogen#runtime_append_all_bundles('.string(a:1).') to pathogen#infect('.string(a:1.'/{}').')')
|
|
||||||
else
|
|
||||||
call s:warn('Change pathogen#runtime_append_all_bundles() to pathogen#infect()')
|
|
||||||
endif
|
|
||||||
return pathogen#interpose(a:0 ? a:1 . '/{}' : 'bundle/{}')
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
if exists(':Vedit')
|
|
||||||
finish
|
|
||||||
endif
|
|
||||||
|
|
||||||
let s:vopen_warning = 0
|
|
||||||
|
|
||||||
function! s:find(count,cmd,file,lcd)
|
|
||||||
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
|
|
||||||
|
|
||||||
function! s:Findcomplete(A,L,P)
|
|
||||||
let sep = pathogen#slash()
|
|
||||||
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
|
|
||||||
|
|
||||||
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 foldmethod=expr foldexpr=getline(v\:lnum)=~'^\"\ Section\:'?'>1'\:getline(v\:lnum)=~#'^fu'?'a1'\:getline(v\:lnum)=~#'^endf'?'s1'\:'=':
|
|
||||||
@ -1,115 +0,0 @@
|
|||||||
" Vim color file -- with 256 colour support!
|
|
||||||
"
|
|
||||||
" Author: Anthony Carapetis <anthony.carapetis@gmail.com>
|
|
||||||
" Contributors: Lucas Tadeu <lucastadeuteixeira@gmail.com>
|
|
||||||
"
|
|
||||||
" Note: Based on github's syntax highlighting theme
|
|
||||||
" Used Brian Mock's darkspectrum as a starting point/template
|
|
||||||
" Thanks to Ryan Heath for an easy list of some of the colours:
|
|
||||||
" http://rpheath.com/posts/356-github-theme-for-syntax-gem
|
|
||||||
|
|
||||||
set background=light
|
|
||||||
|
|
||||||
if version > 580
|
|
||||||
hi clear
|
|
||||||
if exists("syntax_on")
|
|
||||||
syntax reset
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
|
|
||||||
let colors_name = "github"
|
|
||||||
|
|
||||||
" {{{ General colors
|
|
||||||
hi Normal ctermfg=0 ctermbg=255 guifg=#000000 guibg=#F8F8FF
|
|
||||||
hi Cursor ctermfg=239 ctermbg=15 guifg=#F8F8FF guibg=#444454
|
|
||||||
hi Visual ctermfg=15 ctermbg=61 guifg=#FFFFFF guibg=#3465a3
|
|
||||||
hi VisualNOS ctermfg=15 ctermbg=24 guifg=#FFFFFF guibg=#204a87
|
|
||||||
hi Search ctermfg=236 ctermbg=228 guifg=#000000 guibg=#FFFF8C cterm=bold gui=bold
|
|
||||||
hi Folded ctermfg=8 ctermbg=15 guifg=#808080 guibg=#ECECEC gui=bold cterm=bold
|
|
||||||
hi Title ctermfg=167 guifg=#ef5939
|
|
||||||
hi StatusLine ctermfg=238 ctermbg=250 guifg=#404040 guibg=#bbbbbb gui=bold cterm=bold
|
|
||||||
hi StatusLineNC ctermfg=238 ctermbg=252 guifg=#404040 guibg=#d4d4d4 gui=italic cterm=italic
|
|
||||||
hi VertSplit ctermfg=250 ctermbg=250 guifg=#bbbbbb guibg=#bbbbbb gui=none cterm=none
|
|
||||||
hi LineNr ctermfg=246 ctermbg=15 guifg=#959595 guibg=#ECECEC gui=bold cterm=bold
|
|
||||||
hi SpecialKey ctermfg=6 guifg=#177F80 gui=italic cterm=italic
|
|
||||||
hi WarningMsg ctermfg=167 guifg=#ef5939
|
|
||||||
hi ErrorMsg ctermbg=15 ctermfg=196 guibg=#f8f8ff guifg=#ff1100 gui=undercurl cterm=undercurl
|
|
||||||
hi ColorColumn ctermbg=254 guibg=#e4e4e4
|
|
||||||
" }}}
|
|
||||||
|
|
||||||
" {{{ Vim => 7.0 specific colors
|
|
||||||
if version >= 700
|
|
||||||
hi CursorLine ctermbg=253 guibg=#D8D8DD
|
|
||||||
hi MatchParen ctermfg=0 ctermbg=252 guifg=#000000 guibg=#cdcdfd
|
|
||||||
hi Pmenu ctermfg=15 ctermbg=8 guifg=#ffffff guibg=#808080 gui=bold cterm=bold
|
|
||||||
hi PmenuSel ctermfg=0 ctermbg=252 guifg=#000000 guibg=#cdcdfd gui=italic cterm=italic
|
|
||||||
hi PmenuSbar ctermfg=238 ctermbg=0 guifg=#444444 guibg=#000000
|
|
||||||
hi PmenuThumb ctermfg=248 ctermbg=248 guifg=#aaaaaa guibg=#aaaaaa
|
|
||||||
endif
|
|
||||||
" }}}
|
|
||||||
|
|
||||||
" {{{ Diff highlighting
|
|
||||||
hi DiffAdd ctermfg=233 ctermbg=194 guifg=#003300 guibg=#DDFFDD gui=none cterm=none
|
|
||||||
hi DiffChange ctermbg=255 guibg=#ececec gui=none cterm=none
|
|
||||||
hi DiffText ctermfg=233 ctermbg=189 guifg=#000033 guibg=#DDDDFF gui=none cterm=none
|
|
||||||
hi DiffDelete ctermfg=252 ctermbg=224 guifg=#DDCCCC guibg=#FFDDDD gui=none cterm=none
|
|
||||||
" }}}
|
|
||||||
|
|
||||||
" {{{ Syntax highlighting
|
|
||||||
hi Ignore ctermfg=8 guifg=#808080
|
|
||||||
hi Identifier ctermfg=31 guifg=#0086B3
|
|
||||||
hi PreProc ctermfg=247 guifg=#A0A0A0 gui=bold cterm=bold
|
|
||||||
hi Comment ctermfg=246 guifg=#999988
|
|
||||||
hi Constant ctermfg=6 guifg=#177F80 gui=none cterm=none
|
|
||||||
hi String ctermfg=161 guifg=#D81745
|
|
||||||
hi Function ctermfg=88 guifg=#990000 gui=bold cterm=bold
|
|
||||||
hi Statement ctermfg=0 guifg=#000000 gui=bold cterm=bold
|
|
||||||
hi Type ctermfg=60 guifg=#445588 gui=bold cterm=bold
|
|
||||||
hi Number ctermfg=30 guifg=#1C9898
|
|
||||||
hi Todo ctermfg=15 ctermbg=88 guifg=#FFFFFF guibg=#990000 gui=bold cterm=bold
|
|
||||||
hi Special ctermfg=28 guifg=#159828 gui=bold cterm=bold
|
|
||||||
hi Todo ctermbg=15 ctermfg=196 guibg=#f8f8ff guifg=#ff1100 gui=underline cterm=underline
|
|
||||||
hi Label ctermfg=0 guifg=#000000 gui=bold cterm=bold
|
|
||||||
hi StorageClass ctermfg=0 guifg=#000000 gui=bold cterm=bold
|
|
||||||
hi Structure ctermfg=0 guifg=#000000 gui=bold cterm=bold
|
|
||||||
hi TypeDef ctermfg=0 guifg=#000000 gui=bold cterm=bold
|
|
||||||
|
|
||||||
" {{{ Links
|
|
||||||
hi! link FoldColumn Folded
|
|
||||||
hi! link CursorColumn CursorLine
|
|
||||||
hi! link NonText LineNr
|
|
||||||
" }}}
|
|
||||||
|
|
||||||
" {{{ Aliases
|
|
||||||
hi link cppSTL Function
|
|
||||||
hi link cppSTLType Type
|
|
||||||
hi link Character Number
|
|
||||||
hi link htmlTag htmlEndTag
|
|
||||||
hi link htmlLink Underlined
|
|
||||||
hi link pythonFunction Identifier
|
|
||||||
hi link Question Type
|
|
||||||
hi link CursorIM Cursor
|
|
||||||
hi link VisualNOS Visual
|
|
||||||
hi link xmlTag Identifier
|
|
||||||
hi link xmlTagName Identifier
|
|
||||||
hi link shDeref Identifier
|
|
||||||
hi link shVariable Function
|
|
||||||
hi link rubySharpBang Special
|
|
||||||
hi link perlSharpBang Special
|
|
||||||
hi link schemeFunc Statement
|
|
||||||
" }}}
|
|
||||||
|
|
||||||
" {{{ Tabs
|
|
||||||
hi TabLine ctermfg=238 ctermbg=188 guifg=#404040 guibg=#dddddd gui=none
|
|
||||||
hi TabLineFill ctermfg=238 ctermbg=188 guifg=#404040 guibg=#dddddd gui=none
|
|
||||||
hi TabLineSel ctermfg=238 guifg=#404040 gui=bold
|
|
||||||
" }}}
|
|
||||||
|
|
||||||
" {{{ Spelling
|
|
||||||
if has("spell")
|
|
||||||
hi spellBad guisp=#fcaf3e
|
|
||||||
hi spellCap guisp=#73d216
|
|
||||||
hi spellRare guisp=#fcaf3e
|
|
||||||
hi spellLocal guisp=#729fcf
|
|
||||||
endif
|
|
||||||
" }}}
|
|
||||||
@ -1,108 +0,0 @@
|
|||||||
" Vim color file
|
|
||||||
" Converted from Textmate theme Monokai using Coloration v0.3.2 (http://github.com/sickill/coloration)
|
|
||||||
|
|
||||||
set background=dark
|
|
||||||
highlight clear
|
|
||||||
|
|
||||||
if exists("syntax_on")
|
|
||||||
syntax reset
|
|
||||||
endif
|
|
||||||
|
|
||||||
set t_Co=256
|
|
||||||
let g:colors_name = "monokai"
|
|
||||||
|
|
||||||
hi Cursor ctermfg=235 ctermbg=231 cterm=NONE guifg=#272822 guibg=#f8f8f0 gui=NONE
|
|
||||||
hi Visual ctermfg=NONE ctermbg=59 cterm=NONE guifg=NONE guibg=#49483e gui=NONE
|
|
||||||
hi CursorLine ctermfg=NONE ctermbg=237 cterm=NONE guifg=NONE guibg=#3c3d37 gui=NONE
|
|
||||||
hi CursorColumn ctermfg=NONE ctermbg=237 cterm=NONE guifg=NONE guibg=#3c3d37 gui=NONE
|
|
||||||
hi ColorColumn ctermfg=NONE ctermbg=237 cterm=NONE guifg=NONE guibg=#3c3d37 gui=NONE
|
|
||||||
hi LineNr ctermfg=102 ctermbg=237 cterm=NONE guifg=#90908a guibg=#3c3d37 gui=NONE
|
|
||||||
hi VertSplit ctermfg=241 ctermbg=241 cterm=NONE guifg=#64645e guibg=#64645e gui=NONE
|
|
||||||
hi MatchParen ctermfg=197 ctermbg=NONE cterm=underline guifg=#f92672 guibg=NONE gui=underline
|
|
||||||
hi StatusLine ctermfg=231 ctermbg=241 cterm=bold guifg=#f8f8f2 guibg=#64645e gui=bold
|
|
||||||
hi StatusLineNC ctermfg=231 ctermbg=241 cterm=NONE guifg=#f8f8f2 guibg=#64645e gui=NONE
|
|
||||||
hi Pmenu ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE
|
|
||||||
hi PmenuSel ctermfg=NONE ctermbg=59 cterm=NONE guifg=NONE guibg=#49483e gui=NONE
|
|
||||||
hi IncSearch ctermfg=235 ctermbg=186 cterm=NONE guifg=#272822 guibg=#e6db74 gui=NONE
|
|
||||||
hi Search ctermfg=NONE ctermbg=NONE cterm=underline guifg=NONE guibg=NONE gui=underline
|
|
||||||
hi Directory ctermfg=141 ctermbg=NONE cterm=NONE guifg=#ae81ff guibg=NONE gui=NONE
|
|
||||||
hi Folded ctermfg=242 ctermbg=235 cterm=NONE guifg=#75715e guibg=#272822 gui=NONE
|
|
||||||
|
|
||||||
hi Normal ctermfg=231 ctermbg=235 cterm=NONE guifg=#f8f8f2 guibg=#272822 gui=NONE
|
|
||||||
hi Boolean ctermfg=141 ctermbg=NONE cterm=NONE guifg=#ae81ff guibg=NONE gui=NONE
|
|
||||||
hi Character ctermfg=141 ctermbg=NONE cterm=NONE guifg=#ae81ff guibg=NONE gui=NONE
|
|
||||||
hi Comment ctermfg=242 ctermbg=NONE cterm=NONE guifg=#75715e guibg=NONE gui=NONE
|
|
||||||
hi Conditional ctermfg=197 ctermbg=NONE cterm=NONE guifg=#f92672 guibg=NONE gui=NONE
|
|
||||||
hi Constant ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE
|
|
||||||
hi Define ctermfg=197 ctermbg=NONE cterm=NONE guifg=#f92672 guibg=NONE gui=NONE
|
|
||||||
hi DiffAdd ctermfg=231 ctermbg=64 cterm=bold guifg=#f8f8f2 guibg=#46830c gui=bold
|
|
||||||
hi DiffDelete ctermfg=88 ctermbg=NONE cterm=NONE guifg=#8b0807 guibg=NONE gui=NONE
|
|
||||||
hi DiffChange ctermfg=231 ctermbg=23 cterm=NONE guifg=#f8f8f2 guibg=#243955 gui=NONE
|
|
||||||
hi DiffText ctermfg=231 ctermbg=24 cterm=bold guifg=#f8f8f2 guibg=#204a87 gui=bold
|
|
||||||
hi ErrorMsg ctermfg=231 ctermbg=197 cterm=NONE guifg=#f8f8f0 guibg=#f92672 gui=NONE
|
|
||||||
hi WarningMsg ctermfg=231 ctermbg=197 cterm=NONE guifg=#f8f8f0 guibg=#f92672 gui=NONE
|
|
||||||
hi Float ctermfg=141 ctermbg=NONE cterm=NONE guifg=#ae81ff guibg=NONE gui=NONE
|
|
||||||
hi Function ctermfg=148 ctermbg=NONE cterm=NONE guifg=#a6e22e guibg=NONE gui=NONE
|
|
||||||
hi Identifier ctermfg=81 ctermbg=NONE cterm=NONE guifg=#66d9ef guibg=NONE gui=italic
|
|
||||||
hi Keyword ctermfg=197 ctermbg=NONE cterm=NONE guifg=#f92672 guibg=NONE gui=NONE
|
|
||||||
hi Label ctermfg=186 ctermbg=NONE cterm=NONE guifg=#e6db74 guibg=NONE gui=NONE
|
|
||||||
hi NonText ctermfg=59 ctermbg=236 cterm=NONE guifg=#49483e guibg=#31322c gui=NONE
|
|
||||||
hi Number ctermfg=141 ctermbg=NONE cterm=NONE guifg=#ae81ff guibg=NONE gui=NONE
|
|
||||||
hi Operator ctermfg=197 ctermbg=NONE cterm=NONE guifg=#f92672 guibg=NONE gui=NONE
|
|
||||||
hi PreProc ctermfg=197 ctermbg=NONE cterm=NONE guifg=#f92672 guibg=NONE gui=NONE
|
|
||||||
hi Special ctermfg=231 ctermbg=NONE cterm=NONE guifg=#f8f8f2 guibg=NONE gui=NONE
|
|
||||||
hi SpecialKey ctermfg=59 ctermbg=237 cterm=NONE guifg=#49483e guibg=#3c3d37 gui=NONE
|
|
||||||
hi Statement ctermfg=197 ctermbg=NONE cterm=NONE guifg=#f92672 guibg=NONE gui=NONE
|
|
||||||
hi StorageClass ctermfg=81 ctermbg=NONE cterm=NONE guifg=#66d9ef guibg=NONE gui=italic
|
|
||||||
hi String ctermfg=186 ctermbg=NONE cterm=NONE guifg=#e6db74 guibg=NONE gui=NONE
|
|
||||||
hi Tag ctermfg=197 ctermbg=NONE cterm=NONE guifg=#f92672 guibg=NONE gui=NONE
|
|
||||||
hi Title ctermfg=231 ctermbg=NONE cterm=bold guifg=#f8f8f2 guibg=NONE gui=bold
|
|
||||||
hi Todo ctermfg=95 ctermbg=NONE cterm=inverse,bold guifg=#75715e guibg=NONE gui=inverse,bold
|
|
||||||
hi Type ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE
|
|
||||||
hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline guifg=NONE guibg=NONE gui=underline
|
|
||||||
hi rubyClass ctermfg=197 ctermbg=NONE cterm=NONE guifg=#f92672 guibg=NONE gui=NONE
|
|
||||||
hi rubyFunction ctermfg=148 ctermbg=NONE cterm=NONE guifg=#a6e22e guibg=NONE gui=NONE
|
|
||||||
hi rubyInterpolationDelimiter ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE
|
|
||||||
hi rubySymbol ctermfg=141 ctermbg=NONE cterm=NONE guifg=#ae81ff guibg=NONE gui=NONE
|
|
||||||
hi rubyConstant ctermfg=81 ctermbg=NONE cterm=NONE guifg=#66d9ef guibg=NONE gui=italic
|
|
||||||
hi rubyStringDelimiter ctermfg=186 ctermbg=NONE cterm=NONE guifg=#e6db74 guibg=NONE gui=NONE
|
|
||||||
hi rubyBlockParameter ctermfg=208 ctermbg=NONE cterm=NONE guifg=#fd971f guibg=NONE gui=italic
|
|
||||||
hi rubyInstanceVariable ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE
|
|
||||||
hi rubyInclude ctermfg=197 ctermbg=NONE cterm=NONE guifg=#f92672 guibg=NONE gui=NONE
|
|
||||||
hi rubyGlobalVariable ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE
|
|
||||||
hi rubyRegexp ctermfg=186 ctermbg=NONE cterm=NONE guifg=#e6db74 guibg=NONE gui=NONE
|
|
||||||
hi rubyRegexpDelimiter ctermfg=186 ctermbg=NONE cterm=NONE guifg=#e6db74 guibg=NONE gui=NONE
|
|
||||||
hi rubyEscape ctermfg=141 ctermbg=NONE cterm=NONE guifg=#ae81ff guibg=NONE gui=NONE
|
|
||||||
hi rubyControl ctermfg=197 ctermbg=NONE cterm=NONE guifg=#f92672 guibg=NONE gui=NONE
|
|
||||||
hi rubyClassVariable ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE
|
|
||||||
hi rubyOperator ctermfg=197 ctermbg=NONE cterm=NONE guifg=#f92672 guibg=NONE gui=NONE
|
|
||||||
hi rubyException ctermfg=197 ctermbg=NONE cterm=NONE guifg=#f92672 guibg=NONE gui=NONE
|
|
||||||
hi rubyPseudoVariable ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE
|
|
||||||
hi rubyRailsUserClass ctermfg=81 ctermbg=NONE cterm=NONE guifg=#66d9ef guibg=NONE gui=italic
|
|
||||||
hi rubyRailsARAssociationMethod ctermfg=81 ctermbg=NONE cterm=NONE guifg=#66d9ef guibg=NONE gui=NONE
|
|
||||||
hi rubyRailsARMethod ctermfg=81 ctermbg=NONE cterm=NONE guifg=#66d9ef guibg=NONE gui=NONE
|
|
||||||
hi rubyRailsRenderMethod ctermfg=81 ctermbg=NONE cterm=NONE guifg=#66d9ef guibg=NONE gui=NONE
|
|
||||||
hi rubyRailsMethod ctermfg=81 ctermbg=NONE cterm=NONE guifg=#66d9ef guibg=NONE gui=NONE
|
|
||||||
hi erubyDelimiter ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE
|
|
||||||
hi erubyComment ctermfg=95 ctermbg=NONE cterm=NONE guifg=#75715e guibg=NONE gui=NONE
|
|
||||||
hi erubyRailsMethod ctermfg=81 ctermbg=NONE cterm=NONE guifg=#66d9ef guibg=NONE gui=NONE
|
|
||||||
hi htmlTag ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE
|
|
||||||
hi htmlEndTag ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE
|
|
||||||
hi htmlTagName ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE
|
|
||||||
hi htmlArg ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE
|
|
||||||
hi htmlSpecialChar ctermfg=141 ctermbg=NONE cterm=NONE guifg=#ae81ff guibg=NONE gui=NONE
|
|
||||||
hi javaScriptFunction ctermfg=81 ctermbg=NONE cterm=NONE guifg=#66d9ef guibg=NONE gui=italic
|
|
||||||
hi javaScriptRailsFunction ctermfg=81 ctermbg=NONE cterm=NONE guifg=#66d9ef guibg=NONE gui=NONE
|
|
||||||
hi javaScriptBraces ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE
|
|
||||||
hi yamlKey ctermfg=197 ctermbg=NONE cterm=NONE guifg=#f92672 guibg=NONE gui=NONE
|
|
||||||
hi yamlAnchor ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE
|
|
||||||
hi yamlAlias ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE
|
|
||||||
hi yamlDocumentHeader ctermfg=186 ctermbg=NONE cterm=NONE guifg=#e6db74 guibg=NONE gui=NONE
|
|
||||||
hi cssURL ctermfg=208 ctermbg=NONE cterm=NONE guifg=#fd971f guibg=NONE gui=italic
|
|
||||||
hi cssFunctionName ctermfg=81 ctermbg=NONE cterm=NONE guifg=#66d9ef guibg=NONE gui=NONE
|
|
||||||
hi cssColor ctermfg=141 ctermbg=NONE cterm=NONE guifg=#ae81ff guibg=NONE gui=NONE
|
|
||||||
hi cssPseudoClassId ctermfg=148 ctermbg=NONE cterm=NONE guifg=#a6e22e guibg=NONE gui=NONE
|
|
||||||
hi cssClassName ctermfg=148 ctermbg=NONE cterm=NONE guifg=#a6e22e guibg=NONE gui=NONE
|
|
||||||
hi cssValueLength ctermfg=141 ctermbg=NONE cterm=NONE guifg=#ae81ff guibg=NONE gui=NONE
|
|
||||||
hi cssCommonAttr ctermfg=81 ctermbg=NONE cterm=NONE guifg=#66d9ef guibg=NONE gui=NONE
|
|
||||||
hi cssBraces ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE
|
|
||||||
File diff suppressed because it is too large
Load Diff
@ -1 +0,0 @@
|
|||||||
/home/tsouza/.vimrc
|
|
||||||
@ -1 +0,0 @@
|
|||||||
/home/tsouza/.config/nvim
|
|
||||||
@ -1 +0,0 @@
|
|||||||
/home/tsouza/Documents/gitlab/tyrelsouza/dotfiles/vim
|
|
||||||
166
_old/vimrc
166
_old/vimrc
@ -1,166 +0,0 @@
|
|||||||
" Use Vim settings, rather then Vi settings. This setting must be as early as
|
|
||||||
" possible, as it has side effects.
|
|
||||||
set nocompatible
|
|
||||||
execute pathogen#infect()
|
|
||||||
|
|
||||||
syntax on
|
|
||||||
set noshowmode
|
|
||||||
set mouse-=a
|
|
||||||
syntax enable
|
|
||||||
colorscheme solarized
|
|
||||||
|
|
||||||
" Leader
|
|
||||||
let mapleader = " "
|
|
||||||
|
|
||||||
set hidden " allow buffers to be hidden
|
|
||||||
set backspace=2 " Backspace deletes like most programs in insert mode
|
|
||||||
set nobackup
|
|
||||||
set nowritebackup
|
|
||||||
set noswapfile " http://robots.thoughtbot.com/post/18739402579/global-gitignore#comment-458413287
|
|
||||||
set history=50
|
|
||||||
set ruler " show the cursor position all the time
|
|
||||||
set showcmd " display incomplete commands
|
|
||||||
set incsearch " do incremental searching
|
|
||||||
set laststatus=2 " Always display the status line
|
|
||||||
set autowrite " Automatically :write before running commands
|
|
||||||
set tabstop=4 softtabstop=0 expandtab shiftwidth=4 shiftround " Softtabs, 4 spaces
|
|
||||||
set textwidth=80 " Make it obvious where 80 characters is
|
|
||||||
set colorcolumn=+1
|
|
||||||
set autoindent
|
|
||||||
set preserveindent
|
|
||||||
set copyindent
|
|
||||||
|
|
||||||
" Numbers
|
|
||||||
set number
|
|
||||||
set numberwidth=4
|
|
||||||
" Allow pasting and not auto formatting
|
|
||||||
set paste
|
|
||||||
|
|
||||||
" Open new split panes to right and bottom, which feels more natural
|
|
||||||
set splitbelow
|
|
||||||
set splitright
|
|
||||||
|
|
||||||
" Quicker window movement
|
|
||||||
" Switch between the last two files
|
|
||||||
nnoremap <leader><leader> <c-^>
|
|
||||||
|
|
||||||
" Easier tab changing
|
|
||||||
nnoremap rr :bprevious<CR>
|
|
||||||
nnoremap tt :bnext<CR>
|
|
||||||
|
|
||||||
" configure syntastic syntax checking to check on open as well as save
|
|
||||||
let g:syntastic_check_on_open=1
|
|
||||||
let g:syntastic_html_tidy_ignore_errors=[" proprietary attribute \"ng-"]
|
|
||||||
" Fix for airline fonts
|
|
||||||
let g:airline_powerline_fonts = 1
|
|
||||||
let g:airline#extensions#tabline#enabled = 1
|
|
||||||
let g:airline_theme='base16'
|
|
||||||
let g:tmuxline_powerline_separators = 0
|
|
||||||
let g:airline#extensions#tabline#fnamemod = ':t'
|
|
||||||
|
|
||||||
|
|
||||||
" Treat <li> and <p> tags like the block tags they are
|
|
||||||
let g:html_indent_tags = 'li\|p'
|
|
||||||
|
|
||||||
filetype plugin indent on
|
|
||||||
|
|
||||||
augroup vimrcEx
|
|
||||||
autocmd!
|
|
||||||
|
|
||||||
" When editing a file, always jump to the last known cursor position.
|
|
||||||
" Don't do it for commit messages, when the position is invalid, or when
|
|
||||||
" inside an event handler (happens when dropping a file on gvim).
|
|
||||||
autocmd BufReadPost *
|
|
||||||
\ if &ft != 'gitcommit' && line("'\"") > 0 && line("'\"") <= line("$") |
|
|
||||||
\ exe "normal g`\"" |
|
|
||||||
\ endif
|
|
||||||
|
|
||||||
" Set syntax highlighting for specific file types
|
|
||||||
autocmd BufRead,BufNewFile *.md set filetype=markdown
|
|
||||||
|
|
||||||
" Allow stylesheets to autocomplete hyphenated words
|
|
||||||
autocmd FileType css,scss,sass setlocal iskeyword+=-
|
|
||||||
augroup END
|
|
||||||
|
|
||||||
" Use The Silver Searcher https://github.com/ggreer/the_silver_searcher
|
|
||||||
if executable('ag')
|
|
||||||
" Use Ag over Grep
|
|
||||||
set grepprg=ag\ --nogroup\ --nocolor
|
|
||||||
|
|
||||||
" Use ag in CtrlP for listing files. Lightning fast and respects .gitignore
|
|
||||||
let g:ctrlp_user_command = 'ag %s -l --nocolor -g ""'
|
|
||||||
let g:ackprg = 'ag --vimgrep'
|
|
||||||
|
|
||||||
" ag is fast enough that CtrlP doesn't need to cache
|
|
||||||
let g:ctrlp_use_caching = 0
|
|
||||||
endif
|
|
||||||
|
|
||||||
" Setup some default ignores
|
|
||||||
let g:ctrlp_custom_ignore = {
|
|
||||||
\ 'dir': '\v[\/](\.(git|hg|svn)|\_site)$',
|
|
||||||
\ 'file': '\v\.(exe|so|dll|class|png|jpg|jpeg)$',
|
|
||||||
\}
|
|
||||||
|
|
||||||
" Use the nearest .git directory as the cwd
|
|
||||||
" This makes a lot of sense if you are working on a project that is in version
|
|
||||||
" control. It also supports works with .svn, .hg, .bzr.
|
|
||||||
let g:ctrlp_working_path_mode = 'r'
|
|
||||||
|
|
||||||
" Use a leader instead of the actual named binding
|
|
||||||
nmap <leader>pb :CtrlPBuffer<cr>
|
|
||||||
nmap <S-t> :CtrlPBuffer<cr>
|
|
||||||
|
|
||||||
" Easy bindings for its various modes
|
|
||||||
nmap <leader>bb :CtrlPBuffer<cr>
|
|
||||||
nmap <leader>bm :CtrlPMixed<cr>
|
|
||||||
nmap <leader>bs :CtrlPMRU<cr>
|
|
||||||
|
|
||||||
" Tagbar
|
|
||||||
nmap <F8> :TagbarToggle<CR>
|
|
||||||
nmap <F7> :CtrlPTag<CR>
|
|
||||||
|
|
||||||
|
|
||||||
" To open a new empty buffer
|
|
||||||
" This replaces :tabnew which I used to bind to this mapping
|
|
||||||
nmap <leader>t :enew<cr>
|
|
||||||
|
|
||||||
" Move to the next buffer
|
|
||||||
nmap <leader>l :bnext<CR>
|
|
||||||
|
|
||||||
" Move to the previous buffer
|
|
||||||
nmap <leader>h :bprevious<CR>
|
|
||||||
|
|
||||||
" Close the current buffer and move to the previous one
|
|
||||||
nmap <leader>bq :bp <BAR> bd #<CR>
|
|
||||||
|
|
||||||
" FUCK EX MODE
|
|
||||||
map q: <Nop>
|
|
||||||
nnoremap Q <nop>
|
|
||||||
|
|
||||||
|
|
||||||
" Toggle line numbers with F1 - no more stupid help!
|
|
||||||
"nmap <silent> <F1> :set invnumber<CR>
|
|
||||||
nmap <silent> <F1> :exec &nu==&rnu? "se nu!" : "se rnu!"<CR>
|
|
||||||
autocmd StdinReadPre * let s:std_in=1
|
|
||||||
hi Normal ctermbg=none
|
|
||||||
" Local config
|
|
||||||
let g:go_fmt_command = "goimports"
|
|
||||||
nnoremap <leader><tab> :buffers<CR>:buffer<Space>
|
|
||||||
set background=dark
|
|
||||||
let vim_markdown_preview_hotkey='<S-m>'
|
|
||||||
let vim_markdown_preview_github=1
|
|
||||||
let vim_markdown_preview_browser='Google Chrome'
|
|
||||||
|
|
||||||
if filereadable($HOME . "/.vimrc.local")
|
|
||||||
source ~/.vimrc.local
|
|
||||||
endif
|
|
||||||
|
|
||||||
" Set the ctags file name
|
|
||||||
set tags=./.tags;
|
|
||||||
let g:tagbar_ctags_bin='/usr/local/bin/ctags'
|
|
||||||
let g:session_autoload = 'no'
|
|
||||||
let g:airline#extensions#tabline#fnamemod = ':.'
|
|
||||||
let g:ctrlp_working_path_mode = 0
|
|
||||||
let g:ctrlp_custom_ignore = 'node_modules\|DS_Store\|git|.pyc'
|
|
||||||
|
|
||||||
set timeoutlen=100 ttimeoutlen=10
|
|
||||||
@ -1,33 +0,0 @@
|
|||||||
if &compatible
|
|
||||||
set nocompatible
|
|
||||||
end
|
|
||||||
|
|
||||||
filetype off
|
|
||||||
set rtp+=~/.vim/bundle/Vundle.vim/
|
|
||||||
call vundle#begin()
|
|
||||||
|
|
||||||
" Let Vundle manage Vundle
|
|
||||||
Plugin 'gmarik/Vundle.vim'
|
|
||||||
|
|
||||||
" Define bundles via Github repos
|
|
||||||
Plugin 'croaky/vim-colors-github'
|
|
||||||
Plugin 'danro/rename.vim'
|
|
||||||
Plugin 'kien/ctrlp.vim'
|
|
||||||
Plugin 'pbrisbin/vim-mkdir'
|
|
||||||
Plugin 'scrooloose/syntastic'
|
|
||||||
Plugin 'scrooloose/nerdtree'
|
|
||||||
Plugin 'tpope/vim-surround'
|
|
||||||
Plugin 'vim-airline/vim-airline'
|
|
||||||
Plugin 'vim-airline/vim-airline-themes'
|
|
||||||
|
|
||||||
|
|
||||||
" do mac specific stuff
|
|
||||||
if has("unix")
|
|
||||||
let s:uname = system("uname -s")
|
|
||||||
if s:uname == "Darwin"
|
|
||||||
Plugin 'rizzatti/dash.vim'
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
|
|
||||||
call vundle#end()
|
|
||||||
filetype on
|
|
||||||
@ -1,4 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
#if [ -e bin/update_dependencies.sh ]; then
|
|
||||||
# bin/update_dependencies.sh
|
|
||||||
#fi
|
|
||||||
@ -1,4 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
#if [ -e bin/update_dependencies.sh ]; then
|
|
||||||
# bin/update_dependencies.sh
|
|
||||||
#fi
|
|
||||||
@ -1,17 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
|
|
||||||
#protected_branch='master'
|
|
||||||
#current_branch=$(git symbolic-ref HEAD | sed -e 's,.*/\(.*\),\1,')
|
|
||||||
#
|
|
||||||
#if [[ $current_branch = *"$protected_branch"* ]]
|
|
||||||
#then
|
|
||||||
# read -p "You're about to push $current_branch, is that what you intended? [y|n] " -n 1 -r < /dev/tty
|
|
||||||
# echo
|
|
||||||
# if echo $REPLY | grep -E '^[Yy]$' > /dev/null
|
|
||||||
# then
|
|
||||||
# exit 0 # push will execute
|
|
||||||
# fi
|
|
||||||
# exit 1 # push will not execute
|
|
||||||
#else
|
|
||||||
# exit 0 # push will execute
|
|
||||||
#fi
|
|
||||||
34
home/config/fish/fish_variables
Normal file
34
home/config/fish/fish_variables
Normal file
@ -0,0 +1,34 @@
|
|||||||
|
# This file contains fish universal variable definitions.
|
||||||
|
# VERSION: 3.0
|
||||||
|
SETUVAR __fish_initialized:3400
|
||||||
|
SETUVAR fish_color_autosuggestion:555\x1ebrblack
|
||||||
|
SETUVAR fish_color_cancel:\x2dr
|
||||||
|
SETUVAR fish_color_command:blue
|
||||||
|
SETUVAR fish_color_comment:red
|
||||||
|
SETUVAR fish_color_cwd:green
|
||||||
|
SETUVAR fish_color_cwd_root:red
|
||||||
|
SETUVAR fish_color_end:green
|
||||||
|
SETUVAR fish_color_error:brred
|
||||||
|
SETUVAR fish_color_escape:brcyan
|
||||||
|
SETUVAR fish_color_history_current:\x2d\x2dbold
|
||||||
|
SETUVAR fish_color_host:normal
|
||||||
|
SETUVAR fish_color_host_remote:yellow
|
||||||
|
SETUVAR fish_color_normal:normal
|
||||||
|
SETUVAR fish_color_operator:brcyan
|
||||||
|
SETUVAR fish_color_param:cyan
|
||||||
|
SETUVAR fish_color_quote:yellow
|
||||||
|
SETUVAR fish_color_redirection:cyan\x1e\x2d\x2dbold
|
||||||
|
SETUVAR fish_color_search_match:\x2d\x2dbackground\x3d111
|
||||||
|
SETUVAR fish_color_selection:white\x1e\x2d\x2dbold\x1e\x2d\x2dbackground\x3dbrblack
|
||||||
|
SETUVAR fish_color_status:red
|
||||||
|
SETUVAR fish_color_user:brgreen
|
||||||
|
SETUVAR fish_color_valid_path:\x2d\x2dunderline
|
||||||
|
SETUVAR fish_key_bindings:fish_default_key_bindings
|
||||||
|
SETUVAR fish_pager_color_completion:normal
|
||||||
|
SETUVAR fish_pager_color_description:B3A06D\x1eyellow\x1e\x2di
|
||||||
|
SETUVAR fish_pager_color_prefix:cyan\x1e\x2d\x2dbold\x1e\x2d\x2dunderline
|
||||||
|
SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan
|
||||||
|
SETUVAR fish_pager_color_selected_background:\x2dr
|
||||||
|
SETUVAR fish_user_paths:/etc/profiles/per\x2duser/tyrel/bin
|
||||||
|
SETUVAR hydro_color_git:red
|
||||||
|
SETUVAR hydro_color_pwd:green
|
||||||
@ -18,8 +18,6 @@ set -g @batt_discharging_icon "👎"
|
|||||||
set -g @batt_attached_icon "😐"
|
set -g @batt_attached_icon "😐"
|
||||||
|
|
||||||
|
|
||||||
# Initialize TMUX plugin manager (keep this line at the very bottom of tmux.conf)
|
|
||||||
run '~/.tmux/plugins/tpm/tpm'
|
|
||||||
|
|
||||||
bind '"' split-window -c "#{pane_current_path}"
|
bind '"' split-window -c "#{pane_current_path}"
|
||||||
bind % split-window -h -c "#{pane_current_path}"
|
bind % split-window -h -c "#{pane_current_path}"
|
||||||
@ -29,6 +27,9 @@ bind - split-window -v -c "#{pane_current_path}"# Split panes vertically
|
|||||||
|
|
||||||
set -g @continuum-restore 'on'
|
set -g @continuum-restore 'on'
|
||||||
|
|
||||||
set-option -g default-command "reattach-to-user-namespace -l zsh"
|
set-option -g default-command "reattach-to-user-namespace -l fish"
|
||||||
set-option -g set-titles on
|
set-option -g set-titles on
|
||||||
|
|
||||||
|
|
||||||
|
# Initialize TMUX plugin manager (keep this line at the very bottom of tmux.conf)
|
||||||
|
run '~/.tmux/plugins/tpm/tpm'
|
||||||
@ -11,9 +11,9 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
home.packages = with pkgs; [
|
home.packages = with pkgs; [
|
||||||
|
bat
|
||||||
ctags
|
ctags
|
||||||
exa
|
exa
|
||||||
bat
|
|
||||||
fzf
|
fzf
|
||||||
ripgrep
|
ripgrep
|
||||||
wget
|
wget
|
||||||
@ -22,13 +22,17 @@
|
|||||||
programs.tmux = {
|
programs.tmux = {
|
||||||
enable = true;
|
enable = true;
|
||||||
};
|
};
|
||||||
#home.file.".tmux".source = "../../tmux";
|
home.file = {
|
||||||
#home.file.".tmux.conf".source = "../../tmux.conf";
|
".tmux.conf" = {
|
||||||
|
source = ../../home/tmux.conf;
|
||||||
|
recursive = true;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
programs.git = {
|
programs.git = {
|
||||||
enable = true;
|
enable = true;
|
||||||
includes = [
|
includes = [
|
||||||
{ path = "~/code/tyrel.dev/dotfiles/gitconfig"; }
|
{ path = "~/code/tyrel.dev/dotfiles/home/gitconfig"; }
|
||||||
];
|
];
|
||||||
aliases = {
|
aliases = {
|
||||||
ap = "add -p";
|
ap = "add -p";
|
||||||
@ -41,22 +45,10 @@
|
|||||||
programs.neovim = {
|
programs.neovim = {
|
||||||
enable = true;
|
enable = true;
|
||||||
};
|
};
|
||||||
xdg.configFile = {
|
|
||||||
"nvim" = {
|
|
||||||
source = ../../config/nvim;
|
|
||||||
recursive = true;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
programs.fish = {
|
programs.fish = {
|
||||||
enable = true;
|
enable = true;
|
||||||
};
|
};
|
||||||
xdg.configFile = {
|
|
||||||
"fish" = {
|
|
||||||
source = ../../config/fish;
|
|
||||||
recursive = true;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
programs.htop = {
|
programs.htop = {
|
||||||
@ -64,18 +56,25 @@
|
|||||||
};
|
};
|
||||||
#xdg.configFile = {
|
#xdg.configFile = {
|
||||||
# "htop" = {
|
# "htop" = {
|
||||||
# source = ../../config/htop;
|
# source = ../../home/config/htop;
|
||||||
# recursive = true;
|
# recursive = true;
|
||||||
# };
|
# };
|
||||||
#};
|
#};
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
# XDG CONFIGS
|
||||||
# Brew's XDG CONFIGS
|
|
||||||
xdg.configFile = {
|
xdg.configFile = {
|
||||||
|
"nvim" = {
|
||||||
|
source = ../../home/config/nvim;
|
||||||
|
recursive = true;
|
||||||
|
};
|
||||||
|
"fish" = {
|
||||||
|
source = ../../home/config/fish;
|
||||||
|
recursive = true;
|
||||||
|
};
|
||||||
"karabiner" = {
|
"karabiner" = {
|
||||||
source = ../../config/karabiner;
|
source = ../../home/config/karabiner;
|
||||||
recursive = true;
|
recursive = true;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
git add . # YOLO
|
git add . # YOLO
|
||||||
./result/sw/bin/darwin-rebuild switch --flake .
|
./result/sw/bin/darwin-rebuild switch --flake _macos
|
||||||
|
|||||||
@ -1 +0,0 @@
|
|||||||
Subproject commit 09be78c35ee84f858f724442b94ad045ade23eb0
|
|
||||||
@ -1 +0,0 @@
|
|||||||
Subproject commit 90f4a00c41de094864dd4e29231253bcd80d4409
|
|
||||||
@ -1 +0,0 @@
|
|||||||
Subproject commit e91b178ff832b7bcbbf4d99d9f467f63fd1b76b5
|
|
||||||
@ -1 +0,0 @@
|
|||||||
Subproject commit 748ab165adf6b5f74ed10d6a416dc55cd1906033
|
|
||||||
@ -1 +0,0 @@
|
|||||||
Subproject commit 95f78336c3972f3e6648b7b3db754f2224320a5e
|
|
||||||
Loading…
Reference in New Issue
Block a user