From e628aad3529b7df31a87df184743f43e8632d602 Mon Sep 17 00:00:00 2001 From: Tyrel Souza Date: Mon, 2 Jan 2023 00:04:28 -0500 Subject: [PATCH] move to macos dir --- flake.lock => _macos/flake.lock | 6 +- flake.nix => _macos/flake.nix | 8 +- _old/INSTALL.sh | 80 -- _old/pryrc | 10 - _old/vim/autoload/pathogen.vim | 353 ------ _old/vim/colors/github.vim | 115 -- _old/vim/colors/monokai.vim | 108 -- _old/vim/colors/solarized.vim | 1117 ----------------- _old/vim/init.vim | 1 - _old/vim/nvim | 1 - _old/vim/vim | 1 - _old/vimrc | 166 --- _old/vimrc.bundles | 33 - git_template/hooks/post-checkout | 4 - git_template/hooks/post-merge | 4 - git_template/hooks/pre-push | 17 - {bin => home/bin}/CPSP | 0 {bin => home/bin}/Markdown.pl | 0 {bin => home/bin}/SCmd | 0 {bin => home/bin}/datecalc.py | 0 {bin => home/bin}/emax | 0 {bin => home/bin}/git-clean.sh | 0 {bin => home/bin}/git-fuck | 0 {bin => home/bin}/git_undo_everything.sh | 0 {bin => home/bin}/gochk | Bin {bin => home/bin}/goland.sh | 0 {bin => home/bin}/golangci-lint | Bin {bin => home/bin}/gstate | 0 {bin => home/bin}/json2yaml | 0 .../bin}/keybase_download_gpg_keys.sh | 0 {bin => home/bin}/killtransmission.sh | 0 {bin => home/bin}/last_status.py | 0 {bin => home/bin}/mov_to_gif.sh | 0 {bin => home/bin}/mysql_in_ram.sh | 0 {bin => home/bin}/oh_fuck.sh | 0 {bin => home/bin}/old.py | 0 {bin => home/bin}/packages/homebrew-casks.txt | 0 {bin => home/bin}/packages/homebrew.txt | 0 {bin => home/bin}/packages/pip.txt | 0 {bin => home/bin}/pycharm.sh | 0 {bin => home/bin}/release_package.sh | 0 {bin => home/bin}/restart_bluetooth | 0 {bin => home/bin}/rubymine.sh | 0 {bin => home/bin}/sc | 0 {bin => home/bin}/scf | 0 {bin => home/bin}/spoof_mac.sh | 0 {bin => home/bin}/sshc | 0 {bin => home/bin}/startemacs.sh | 0 {bin => home/bin}/startup_i3.sh | 0 {bin => home/bin}/update-neovim.sh | 0 {bin => home/bin}/upload_and_copy | 0 {bin => home/bin}/vimv | 0 {bin => home/bin}/virtualenv-auto-activate.sh | 0 {bin => home/bin}/watch.py | 0 {bin => home/bin}/water_reminder | 0 {config => home/config}/fish/config.fish | 0 {config => home/config}/fish/everquote.fish | 0 home/config/fish/fish_variables | 34 + .../config}/fish/shell_aliases.fish | 0 {config => home/config}/fish/shell_funcs.fish | 0 {config => home/config}/htop/htoprc | 0 {config => home/config}/i3/config | 0 {config => home/config}/i3/rofi | 0 {config => home/config}/i3/rofi_window | 0 .../complex_modifications/1672600379.json | 0 .../config}/karabiner/karabiner.json | 0 {config => home/config}/nvim/init.vim | 0 .../config}/polybar/battery-combined-shell.sh | 0 {config => home/config}/polybar/config | 0 .../config}/polybar/i3wmthemer_bar_launch.sh | 0 .../config}/tmuxinator/tidelift.yml | 0 gitconfig => home/gitconfig | 0 gitignore => home/gitignore | 0 hushlogin => home/hushlogin | 0 pythonstartup.py => home/pythonstartup.py | 0 shell_aliases => home/shell_aliases | 0 shell_funcs => home/shell_funcs | 0 tmux.conf => home/tmux.conf | 7 +- hosts/ts-tl-mbp/home-manager.nix | 41 +- rebuild.sh | 2 +- tmux/plugins/tmux-battery | 1 - tmux/plugins/tmux-continuum | 1 - tmux/plugins/tmux-sensible | 1 - tmux/plugins/tmux-themepack | 1 - tmux/plugins/tpm | 1 - 85 files changed, 66 insertions(+), 2047 deletions(-) rename flake.lock => _macos/flake.lock (91%) rename flake.nix => _macos/flake.nix (80%) delete mode 100755 _old/INSTALL.sh delete mode 100644 _old/pryrc delete mode 100644 _old/vim/autoload/pathogen.vim delete mode 100644 _old/vim/colors/github.vim delete mode 100644 _old/vim/colors/monokai.vim delete mode 100644 _old/vim/colors/solarized.vim delete mode 120000 _old/vim/init.vim delete mode 120000 _old/vim/nvim delete mode 120000 _old/vim/vim delete mode 100644 _old/vimrc delete mode 100644 _old/vimrc.bundles delete mode 100755 git_template/hooks/post-checkout delete mode 100755 git_template/hooks/post-merge delete mode 100755 git_template/hooks/pre-push rename {bin => home/bin}/CPSP (100%) rename {bin => home/bin}/Markdown.pl (100%) rename {bin => home/bin}/SCmd (100%) rename {bin => home/bin}/datecalc.py (100%) rename {bin => home/bin}/emax (100%) rename {bin => home/bin}/git-clean.sh (100%) rename {bin => home/bin}/git-fuck (100%) rename {bin => home/bin}/git_undo_everything.sh (100%) rename {bin => home/bin}/gochk (100%) rename {bin => home/bin}/goland.sh (100%) rename {bin => home/bin}/golangci-lint (100%) rename {bin => home/bin}/gstate (100%) rename {bin => home/bin}/json2yaml (100%) rename {bin => home/bin}/keybase_download_gpg_keys.sh (100%) rename {bin => home/bin}/killtransmission.sh (100%) rename {bin => home/bin}/last_status.py (100%) rename {bin => home/bin}/mov_to_gif.sh (100%) rename {bin => home/bin}/mysql_in_ram.sh (100%) rename {bin => home/bin}/oh_fuck.sh (100%) rename {bin => home/bin}/old.py (100%) rename {bin => home/bin}/packages/homebrew-casks.txt (100%) rename {bin => home/bin}/packages/homebrew.txt (100%) rename {bin => home/bin}/packages/pip.txt (100%) rename {bin => home/bin}/pycharm.sh (100%) rename {bin => home/bin}/release_package.sh (100%) rename {bin => home/bin}/restart_bluetooth (100%) rename {bin => home/bin}/rubymine.sh (100%) rename {bin => home/bin}/sc (100%) rename {bin => home/bin}/scf (100%) rename {bin => home/bin}/spoof_mac.sh (100%) rename {bin => home/bin}/sshc (100%) rename {bin => home/bin}/startemacs.sh (100%) rename {bin => home/bin}/startup_i3.sh (100%) rename {bin => home/bin}/update-neovim.sh (100%) rename {bin => home/bin}/upload_and_copy (100%) rename {bin => home/bin}/vimv (100%) rename {bin => home/bin}/virtualenv-auto-activate.sh (100%) rename {bin => home/bin}/watch.py (100%) rename {bin => home/bin}/water_reminder (100%) rename {config => home/config}/fish/config.fish (100%) rename {config => home/config}/fish/everquote.fish (100%) create mode 100644 home/config/fish/fish_variables rename {config => home/config}/fish/shell_aliases.fish (100%) rename {config => home/config}/fish/shell_funcs.fish (100%) rename {config => home/config}/htop/htoprc (100%) rename {config => home/config}/i3/config (100%) rename {config => home/config}/i3/rofi (100%) rename {config => home/config}/i3/rofi_window (100%) rename {config => home/config}/karabiner/assets/complex_modifications/1672600379.json (100%) rename {config => home/config}/karabiner/karabiner.json (100%) rename {config => home/config}/nvim/init.vim (100%) rename {config => home/config}/polybar/battery-combined-shell.sh (100%) rename {config => home/config}/polybar/config (100%) rename {config => home/config}/polybar/i3wmthemer_bar_launch.sh (100%) rename {config => home/config}/tmuxinator/tidelift.yml (100%) rename gitconfig => home/gitconfig (100%) rename gitignore => home/gitignore (100%) rename hushlogin => home/hushlogin (100%) rename pythonstartup.py => home/pythonstartup.py (100%) rename shell_aliases => home/shell_aliases (100%) rename shell_funcs => home/shell_funcs (100%) rename tmux.conf => home/tmux.conf (93%) delete mode 160000 tmux/plugins/tmux-battery delete mode 160000 tmux/plugins/tmux-continuum delete mode 160000 tmux/plugins/tmux-sensible delete mode 160000 tmux/plugins/tmux-themepack delete mode 160000 tmux/plugins/tpm diff --git a/flake.lock b/_macos/flake.lock similarity index 91% rename from flake.lock rename to _macos/flake.lock index 9534ee3..2bce5f1 100644 --- a/flake.lock +++ b/_macos/flake.lock @@ -43,11 +43,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1672500394, - "narHash": "sha256-yzwBzCoeRBoRzm7ySHhm72kBG0QjgFalLz2FY48iLI4=", + "lastModified": 1672600835, + "narHash": "sha256-PCrIP7joW/SaDYbKlZGV44bBcLOXI/woLVnVHwcJlWc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "feda52be1d59f13b9aa02f064b4f14784b9a06c8", + "rev": "fe1c6a5547c10a5f6b6debb22d548017f7e14263", "type": "github" }, "original": { diff --git a/flake.nix b/_macos/flake.nix similarity index 80% rename from flake.nix rename to _macos/flake.nix index 674d9bf..4499af7 100644 --- a/flake.nix +++ b/_macos/flake.nix @@ -15,10 +15,10 @@ system = "x86_64-darwin"; modules = [ home-manager.darwinModules.home-manager - ./hosts/ts-tl-mbp/default.nix - ./hosts/ts-tl-mbp/home-manager.nix - ./hosts/ts-tl-mbp/brew.nix - ./hosts/ts-tl-mbp/fonts.nix + ../hosts/ts-tl-mbp/default.nix + ../hosts/ts-tl-mbp/home-manager.nix + ../hosts/ts-tl-mbp/brew.nix + ../hosts/ts-tl-mbp/fonts.nix ]; }; }; diff --git a/_old/INSTALL.sh b/_old/INSTALL.sh deleted file mode 100755 index 03ba3df..0000000 --- a/_old/INSTALL.sh +++ /dev/null @@ -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 diff --git a/_old/pryrc b/_old/pryrc deleted file mode 100644 index 89377d9..0000000 --- a/_old/pryrc +++ /dev/null @@ -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 diff --git a/_old/vim/autoload/pathogen.vim b/_old/vim/autoload/pathogen.vim deleted file mode 100644 index 59a75c1..0000000 --- a/_old/vim/autoload/pathogen.vim +++ /dev/null @@ -1,353 +0,0 @@ -" pathogen.vim - path option manipulation -" Maintainer: Tim Pope -" 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,'\\\@]','\\&','') - 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(,'edit',,0) -command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vedit :execute s:find(,'edit',,0) -command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vopen :execute s:find(,'edit',,1) -command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vsplit :execute s:find(,'split',,1) -command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vvsplit :execute s:find(,'vsplit',,1) -command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vtabedit :execute s:find(,'tabedit',,1) -command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vpedit :execute s:find(,'pedit',,1) -command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vread :execute s:find(,'read',,1) - -" vim:set et sw=2 foldmethod=expr foldexpr=getline(v\:lnum)=~'^\"\ Section\:'?'>1'\:getline(v\:lnum)=~#'^fu'?'a1'\:getline(v\:lnum)=~#'^endf'?'s1'\:'=': diff --git a/_old/vim/colors/github.vim b/_old/vim/colors/github.vim deleted file mode 100644 index 818632d..0000000 --- a/_old/vim/colors/github.vim +++ /dev/null @@ -1,115 +0,0 @@ -" Vim color file -- with 256 colour support! -" -" Author: Anthony Carapetis -" Contributors: Lucas Tadeu -" -" 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 -" }}} diff --git a/_old/vim/colors/monokai.vim b/_old/vim/colors/monokai.vim deleted file mode 100644 index fa31009..0000000 --- a/_old/vim/colors/monokai.vim +++ /dev/null @@ -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 diff --git a/_old/vim/colors/solarized.vim b/_old/vim/colors/solarized.vim deleted file mode 100644 index 70f5223..0000000 --- a/_old/vim/colors/solarized.vim +++ /dev/null @@ -1,1117 +0,0 @@ -" Name: Solarized vim colorscheme -" Author: Ethan Schoonover -" URL: http://ethanschoonover.com/solarized -" (see this url for latest release & screenshots) -" License: OSI approved MIT license (see end of this file) -" Created: In the middle of the night -" Modified: 2011 May 05 -" -" Usage "{{{ -" -" --------------------------------------------------------------------- -" ABOUT: -" --------------------------------------------------------------------- -" Solarized is a carefully designed selective contrast colorscheme with dual -" light and dark modes that runs in both GUI, 256 and 16 color modes. -" -" See the homepage above for screenshots and details. -" -" --------------------------------------------------------------------- -" OPTIONS: -" --------------------------------------------------------------------- -" See the "solarized.txt" help file included with this colorscheme (in the -" "doc" subdirectory) for information on options, usage, the Toggle Background -" function and more. If you have already installed Solarized, this is available -" from the Solarized menu and command line as ":help solarized" -" -" --------------------------------------------------------------------- -" INSTALLATION: -" --------------------------------------------------------------------- -" Two options for installation: manual or pathogen -" -" MANUAL INSTALLATION OPTION: -" --------------------------------------------------------------------- -" -" 1. Download the solarized distribution (available on the homepage above) -" and unarchive the file. -" 2. Move `solarized.vim` to your `.vim/colors` directory. -" 3. Move each of the files in each subdirectories to the corresponding .vim -" subdirectory (e.g. autoload/togglebg.vim goes into your .vim/autoload -" directory as .vim/autoload/togglebg.vim). -" -" RECOMMENDED PATHOGEN INSTALLATION OPTION: -" --------------------------------------------------------------------- -" -" 1. Download and install Tim Pope's Pathogen from: -" https://github.com/tpope/vim-pathogen -" -" 2. Next, move or clone the `vim-colors-solarized` directory so that it is -" a subdirectory of the `.vim/bundle` directory. -" -" a. **clone with git:** -" -" $ cd ~/.vim/bundle -" $ git clone git://github.com/altercation/vim-colors-solarized.git -" -" b. **or move manually into the pathogen bundle directory:** -" In the parent directory of vim-colors-solarized: -" -" $ mv vim-colors-solarized ~/.vim/bundle/ -" -" MODIFY VIMRC: -" -" After either Option 1 or Option 2 above, put the following two lines in your -" .vimrc: -" -" syntax enable -" set background=dark -" colorscheme solarized -" -" or, for the light background mode of Solarized: -" -" syntax enable -" set background=light -" colorscheme solarized -" -" I like to have a different background in GUI and terminal modes, so I can use -" the following if-then. However, I find vim's background autodetection to be -" pretty good and, at least with MacVim, I can leave this background value -" assignment out entirely and get the same results. -" -" if has('gui_running') -" set background=light -" else -" set background=dark -" endif -" -" See the Solarized homepage at http://ethanschoonover.com/solarized for -" screenshots which will help you select either the light or dark background. -" -" --------------------------------------------------------------------- -" COLOR VALUES -" --------------------------------------------------------------------- -" Download palettes and files from: http://ethanschoonover.com/solarized -" -" L\*a\*b values are canonical (White D65, Reference D50), other values are -" matched in sRGB space. -" -" SOLARIZED HEX 16/8 TERMCOL XTERM/HEX L*A*B sRGB HSB -" --------- ------- ---- ------- ----------- ---------- ----------- ----------- -" base03 #002b36 8/4 brblack 234 #1c1c1c 15 -12 -12 0 43 54 193 100 21 -" base02 #073642 0/4 black 235 #262626 20 -12 -12 7 54 66 192 90 26 -" base01 #586e75 10/7 brgreen 240 #4e4e4e 45 -07 -07 88 110 117 194 25 46 -" base00 #657b83 11/7 bryellow 241 #585858 50 -07 -07 101 123 131 195 23 51 -" base0 #839496 12/6 brblue 244 #808080 60 -06 -03 131 148 150 186 13 59 -" base1 #93a1a1 14/4 brcyan 245 #8a8a8a 65 -05 -02 147 161 161 180 9 63 -" base2 #eee8d5 7/7 white 254 #d7d7af 92 -00 10 238 232 213 44 11 93 -" base3 #fdf6e3 15/7 brwhite 230 #ffffd7 97 00 10 253 246 227 44 10 99 -" yellow #b58900 3/3 yellow 136 #af8700 60 10 65 181 137 0 45 100 71 -" orange #cb4b16 9/3 brred 166 #d75f00 50 50 55 203 75 22 18 89 80 -" red #dc322f 1/1 red 160 #d70000 50 65 45 220 50 47 1 79 86 -" magenta #d33682 5/5 magenta 125 #af005f 50 65 -05 211 54 130 331 74 83 -" violet #6c71c4 13/5 brmagenta 61 #5f5faf 50 15 -45 108 113 196 237 45 77 -" blue #268bd2 4/4 blue 33 #0087ff 55 -10 -45 38 139 210 205 82 82 -" cyan #2aa198 6/6 cyan 37 #00afaf 60 -35 -05 42 161 152 175 74 63 -" green #859900 2/2 green 64 #5f8700 60 -20 65 133 153 0 68 100 60 -" -" --------------------------------------------------------------------- -" COLORSCHEME HACKING -" --------------------------------------------------------------------- -" -" Useful commands for testing colorschemes: -" :source $VIMRUNTIME/syntax/hitest.vim -" :help highlight-groups -" :help cterm-colors -" :help group-name -" -" Useful links for developing colorschemes: -" http://www.vim.org/scripts/script.php?script_id=2937 -" http://vimcasts.org/episodes/creating-colorschemes-for-vim/ -" http://www.frexx.de/xterm-256-notes/" -" -" }}} -" Environment Specific Overrides "{{{ -" Allow or disallow certain features based on current terminal emulator or -" environment. - -" Terminals that support italics -let s:terms_italic=[ - \"rxvt", - \"gnome-terminal" - \] -" For reference only, terminals are known to be incomptible. -" Terminals that are in neither list need to be tested. -let s:terms_noitalic=[ - \"iTerm.app", - \"Apple_Terminal" - \] -if has("gui_running") - let s:terminal_italic=1 " TODO: could refactor to not require this at all -else - let s:terminal_italic=0 " terminals will be guilty until proven compatible - for term in s:terms_italic - if $TERM_PROGRAM =~ term - let s:terminal_italic=1 - endif - endfor -endif - -" }}} -" Default option values"{{{ -" --------------------------------------------------------------------- -" s:options_list is used to autogenerate a list of all non-default options -" using "call SolarizedOptions()" or with the "Generate .vimrc commands" -" Solarized menu option. See the "Menus" section below for the function itself. -let s:options_list=[ - \'" this block of commands has been autogenerated by solarized.vim and', - \'" includes the current, non-default Solarized option values.', - \'" To use, place these commands in your .vimrc file (replacing any', - \'" existing colorscheme commands). See also ":help solarized"', - \'', - \'" ------------------------------------------------------------------', - \'" Solarized Colorscheme Config', - \'" ------------------------------------------------------------------', - \] -let s:colorscheme_list=[ - \'syntax enable', - \'set background='.&background, - \'colorscheme solarized', - \] -let s:defaults_list=[ - \'" ------------------------------------------------------------------', - \'', - \'" The following items are available options, but do not need to be', - \'" included in your .vimrc as they are currently set to their defaults.', - \'' - \] -let s:lazycat_list=[ - \'" lazy method of appending this onto your .vimrc ":w! >> ~/.vimrc"', - \'" ------------------------------------------------------------------', - \] - -function! s:SetOption(name,default) - if type(a:default) == type(0) - let l:wrap='' - let l:ewrap='' - else - let l:wrap='"' - let l:ewrap='\"' - endif - if !exists("g:solarized_".a:name) || g:solarized_{a:name}==a:default - exe 'let g:solarized_'.a:name.'='.l:wrap.a:default.l:wrap.'"' - exe 'call add(s:defaults_list, "\" let g:solarized_'.a:name.'='.l:ewrap.g:solarized_{a:name}.l:ewrap.'")' - else - exe 'call add(s:options_list, "let g:solarized_'.a:name.'='.l:ewrap.g:solarized_{a:name}.l:ewrap.' \"default value is '.a:default.'")' - endif -endfunction - -if ($TERM_PROGRAM ==? "apple_terminal" && &t_Co < 256) - let s:solarized_termtrans_default = 1 -else - let s:solarized_termtrans_default = 0 -endif -call s:SetOption("termtrans",s:solarized_termtrans_default) -call s:SetOption("degrade",0) -call s:SetOption("bold",1) -call s:SetOption("underline",1) -call s:SetOption("italic",1) " note that we need to override this later if the terminal doesn't support -call s:SetOption("termcolors",16) -call s:SetOption("contrast","normal") -call s:SetOption("visibility","normal") -call s:SetOption("diffmode","normal") -call s:SetOption("hitrail",0) -call s:SetOption("menu",1) - -"}}} -" Colorscheme initialization "{{{ -" --------------------------------------------------------------------- -hi clear -if exists("syntax_on") - syntax reset -endif -let colors_name = "solarized" - -"}}} -" GUI & CSApprox hexadecimal palettes"{{{ -" --------------------------------------------------------------------- -" -" Set both gui and terminal color values in separate conditional statements -" Due to possibility that CSApprox is running (though I suppose we could just -" leave the hex values out entirely in that case and include only cterm colors) -" We also check to see if user has set solarized (force use of the -" neutral gray monotone palette component) -if (has("gui_running") && g:solarized_degrade == 0) - let s:vmode = "gui" - let s:base03 = "#002b36" - let s:base02 = "#073642" - let s:base01 = "#586e75" - let s:base00 = "#657b83" - let s:base0 = "#839496" - let s:base1 = "#93a1a1" - let s:base2 = "#eee8d5" - let s:base3 = "#fdf6e3" - let s:yellow = "#b58900" - let s:orange = "#cb4b16" - let s:red = "#dc322f" - let s:magenta = "#d33682" - let s:violet = "#6c71c4" - let s:blue = "#268bd2" - let s:cyan = "#2aa198" - "let s:green = "#859900" "original - let s:green = "#719e07" "experimental -elseif (has("gui_running") && g:solarized_degrade == 1) - " These colors are identical to the 256 color mode. They may be viewed - " while in gui mode via "let g:solarized_degrade=1", though this is not - " recommened and is for testing only. - let s:vmode = "gui" - let s:base03 = "#1c1c1c" - let s:base02 = "#262626" - let s:base01 = "#4e4e4e" - let s:base00 = "#585858" - let s:base0 = "#808080" - let s:base1 = "#8a8a8a" - let s:base2 = "#d7d7af" - let s:base3 = "#ffffd7" - let s:yellow = "#af8700" - let s:orange = "#d75f00" - let s:red = "#af0000" - let s:magenta = "#af005f" - let s:violet = "#5f5faf" - let s:blue = "#0087ff" - let s:cyan = "#00afaf" - let s:green = "#5f8700" -elseif g:solarized_termcolors != 256 && &t_Co >= 16 - let s:vmode = "cterm" - let s:base03 = "8" - let s:base02 = "0" - let s:base01 = "10" - let s:base00 = "11" - let s:base0 = "12" - let s:base1 = "14" - let s:base2 = "7" - let s:base3 = "15" - let s:yellow = "3" - let s:orange = "9" - let s:red = "1" - let s:magenta = "5" - let s:violet = "13" - let s:blue = "4" - let s:cyan = "6" - let s:green = "2" -elseif g:solarized_termcolors == 256 - let s:vmode = "cterm" - let s:base03 = "234" - let s:base02 = "235" - let s:base01 = "239" - let s:base00 = "240" - let s:base0 = "244" - let s:base1 = "245" - let s:base2 = "187" - let s:base3 = "230" - let s:yellow = "136" - let s:orange = "166" - let s:red = "124" - let s:magenta = "125" - let s:violet = "61" - let s:blue = "33" - let s:cyan = "37" - let s:green = "64" -else - let s:vmode = "cterm" - let s:bright = "* term=bold cterm=bold" -" let s:base03 = "0".s:bright -" let s:base02 = "0" -" let s:base01 = "2".s:bright -" let s:base00 = "3".s:bright -" let s:base0 = "4".s:bright -" let s:base1 = "6".s:bright -" let s:base2 = "7" -" let s:base3 = "7".s:bright -" let s:yellow = "3" -" let s:orange = "1".s:bright -" let s:red = "1" -" let s:magenta = "5" -" let s:violet = "5".s:bright -" let s:blue = "4" -" let s:cyan = "6" -" let s:green = "2" - let s:base03 = "DarkGray" " 0* - let s:base02 = "Black" " 0 - let s:base01 = "LightGreen" " 2* - let s:base00 = "LightYellow" " 3* - let s:base0 = "LightBlue" " 4* - let s:base1 = "LightCyan" " 6* - let s:base2 = "LightGray" " 7 - let s:base3 = "White" " 7* - let s:yellow = "DarkYellow" " 3 - let s:orange = "LightRed" " 1* - let s:red = "DarkRed" " 1 - let s:magenta = "DarkMagenta" " 5 - let s:violet = "LightMagenta" " 5* - let s:blue = "DarkBlue" " 4 - let s:cyan = "DarkCyan" " 6 - let s:green = "DarkGreen" " 2 - -endif -"}}} -" Formatting options and null values for passthrough effect "{{{ -" --------------------------------------------------------------------- - let s:none = "NONE" - 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:ou = "" - let s:ob = "" -"}}} -" Background value based on termtrans setting "{{{ -" --------------------------------------------------------------------- -if (has("gui_running") || g:solarized_termtrans == 0) - let s:back = s:base03 -else - let s:back = "NONE" -endif -"}}} -" Alternate light scheme "{{{ -" --------------------------------------------------------------------- -if &background == "light" - let s:temp03 = s:base03 - let s:temp02 = s:base02 - let s:temp01 = s:base01 - let s:temp00 = s:base00 - let s:base03 = s:base3 - let s:base02 = s:base2 - let s:base01 = s:base1 - let s:base00 = s:base0 - let s:base0 = s:temp00 - let s:base1 = s:temp01 - let s:base2 = s:temp02 - let s:base3 = s:temp03 - if (s:back != "NONE") - let s:back = s:base03 - endif -endif -"}}} -" Optional contrast schemes "{{{ -" --------------------------------------------------------------------- -if g:solarized_contrast == "high" - let s:base01 = s:base00 - let s:base00 = s:base0 - let s:base0 = s:base1 - let s:base1 = s:base2 - let s:base2 = s:base3 - let s:back = s:back -endif -if g:solarized_contrast == "low" - let s:back = s:base02 - let s:ou = ",underline" -endif -"}}} -" Overrides dependent on user specified values and environment "{{{ -" --------------------------------------------------------------------- -if (g:solarized_bold == 0 || &t_Co == 8 ) - let s:b = "" - let s:bb = ",bold" -else - let s:b = ",bold" - let s:bb = "" -endif - -if g:solarized_underline == 0 - let s:u = "" -else - let s:u = ",underline" -endif - -if g:solarized_italic == 0 || s:terminal_italic == 0 - let s:i = "" -else - let s:i = ",italic" -endif -"}}} -" Highlighting primitives"{{{ -" --------------------------------------------------------------------- - -exe "let s:bg_none = ' ".s:vmode."bg=".s:none ."'" -exe "let s:bg_back = ' ".s:vmode."bg=".s:back ."'" -exe "let s:bg_base03 = ' ".s:vmode."bg=".s:base03 ."'" -exe "let s:bg_base02 = ' ".s:vmode."bg=".s:base02 ."'" -exe "let s:bg_base01 = ' ".s:vmode."bg=".s:base01 ."'" -exe "let s:bg_base00 = ' ".s:vmode."bg=".s:base00 ."'" -exe "let s:bg_base0 = ' ".s:vmode."bg=".s:base0 ."'" -exe "let s:bg_base1 = ' ".s:vmode."bg=".s:base1 ."'" -exe "let s:bg_base2 = ' ".s:vmode."bg=".s:base2 ."'" -exe "let s:bg_base3 = ' ".s:vmode."bg=".s:base3 ."'" -exe "let s:bg_green = ' ".s:vmode."bg=".s:green ."'" -exe "let s:bg_yellow = ' ".s:vmode."bg=".s:yellow ."'" -exe "let s:bg_orange = ' ".s:vmode."bg=".s:orange ."'" -exe "let s:bg_red = ' ".s:vmode."bg=".s:red ."'" -exe "let s:bg_magenta = ' ".s:vmode."bg=".s:magenta."'" -exe "let s:bg_violet = ' ".s:vmode."bg=".s:violet ."'" -exe "let s:bg_blue = ' ".s:vmode."bg=".s:blue ."'" -exe "let s:bg_cyan = ' ".s:vmode."bg=".s:cyan ."'" - -exe "let s:fg_none = ' ".s:vmode."fg=".s:none ."'" -exe "let s:fg_back = ' ".s:vmode."fg=".s:back ."'" -exe "let s:fg_base03 = ' ".s:vmode."fg=".s:base03 ."'" -exe "let s:fg_base02 = ' ".s:vmode."fg=".s:base02 ."'" -exe "let s:fg_base01 = ' ".s:vmode."fg=".s:base01 ."'" -exe "let s:fg_base00 = ' ".s:vmode."fg=".s:base00 ."'" -exe "let s:fg_base0 = ' ".s:vmode."fg=".s:base0 ."'" -exe "let s:fg_base1 = ' ".s:vmode."fg=".s:base1 ."'" -exe "let s:fg_base2 = ' ".s:vmode."fg=".s:base2 ."'" -exe "let s:fg_base3 = ' ".s:vmode."fg=".s:base3 ."'" -exe "let s:fg_green = ' ".s:vmode."fg=".s:green ."'" -exe "let s:fg_yellow = ' ".s:vmode."fg=".s:yellow ."'" -exe "let s:fg_orange = ' ".s:vmode."fg=".s:orange ."'" -exe "let s:fg_red = ' ".s:vmode."fg=".s:red ."'" -exe "let s:fg_magenta = ' ".s:vmode."fg=".s:magenta."'" -exe "let s:fg_violet = ' ".s:vmode."fg=".s:violet ."'" -exe "let s:fg_blue = ' ".s:vmode."fg=".s:blue ."'" -exe "let s:fg_cyan = ' ".s:vmode."fg=".s:cyan ."'" - -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_uopt = ' ".s:vmode."=NONE".s:ou. " term=NONE".s:ou."'" -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."'" -" revbb (reverse bold for bright colors) is only set to actual bold in low -" color terminals (t_co=8, such as OS X Terminal.app) and should only be used -" with colors 8-15. -exe "let s:fmt_revbb = ' ".s:vmode."=NONE".s:r.s:bb. " term=NONE".s:r.s:bb."'" -exe "let s:fmt_revbbu = ' ".s:vmode."=NONE".s:r.s:bb.s:u." term=NONE".s:r.s:bb.s:u."'" - -if has("gui_running") - exe "let s:sp_none = ' guisp=".s:none ."'" - exe "let s:sp_back = ' guisp=".s:back ."'" - exe "let s:sp_base03 = ' guisp=".s:base03 ."'" - exe "let s:sp_base02 = ' guisp=".s:base02 ."'" - exe "let s:sp_base01 = ' guisp=".s:base01 ."'" - exe "let s:sp_base00 = ' guisp=".s:base00 ."'" - exe "let s:sp_base0 = ' guisp=".s:base0 ."'" - exe "let s:sp_base1 = ' guisp=".s:base1 ."'" - exe "let s:sp_base2 = ' guisp=".s:base2 ."'" - exe "let s:sp_base3 = ' guisp=".s:base3 ."'" - exe "let s:sp_green = ' guisp=".s:green ."'" - exe "let s:sp_yellow = ' guisp=".s:yellow ."'" - exe "let s:sp_orange = ' guisp=".s:orange ."'" - exe "let s:sp_red = ' guisp=".s:red ."'" - exe "let s:sp_magenta = ' guisp=".s:magenta."'" - exe "let s:sp_violet = ' guisp=".s:violet ."'" - exe "let s:sp_blue = ' guisp=".s:blue ."'" - exe "let s:sp_cyan = ' guisp=".s:cyan ."'" -else - let s:sp_none = "" - let s:sp_back = "" - let s:sp_base03 = "" - let s:sp_base02 = "" - let s:sp_base01 = "" - let s:sp_base00 = "" - let s:sp_base0 = "" - let s:sp_base1 = "" - let s:sp_base2 = "" - let s:sp_base3 = "" - let s:sp_green = "" - let s:sp_yellow = "" - let s:sp_orange = "" - let s:sp_red = "" - let s:sp_magenta = "" - let s:sp_violet = "" - let s:sp_blue = "" - let s:sp_cyan = "" -endif - -"}}} -" Basic highlighting"{{{ -" --------------------------------------------------------------------- -" note that link syntax to avoid duplicate configuration doesn't work with the -" exe compiled formats - -exe "hi! Normal" .s:fmt_none .s:fg_base0 .s:bg_back - -exe "hi! Comment" .s:fmt_ital .s:fg_base01 .s:bg_none -" *Comment any comment - -exe "hi! Constant" .s:fmt_none .s:fg_cyan .s:bg_none -" *Constant any constant -" String a string constant: "this is a string" -" Character a character constant: 'c', '\n' -" Number a number constant: 234, 0xff -" Boolean a boolean constant: TRUE, false -" Float a floating point constant: 2.3e10 - -exe "hi! Identifier" .s:fmt_none .s:fg_blue .s:bg_none -" *Identifier any variable name -" Function function name (also: methods for classes) -" -exe "hi! Statement" .s:fmt_none .s:fg_green .s:bg_none -" *Statement any statement -" Conditional if, then, else, endif, switch, etc. -" Repeat for, do, while, etc. -" Label case, default, etc. -" Operator "sizeof", "+", "*", etc. -" Keyword any other keyword -" Exception try, catch, throw - -exe "hi! PreProc" .s:fmt_none .s:fg_orange .s:bg_none -" *PreProc generic Preprocessor -" Include preprocessor #include -" Define preprocessor #define -" Macro same as Define -" PreCondit preprocessor #if, #else, #endif, etc. - -exe "hi! Type" .s:fmt_none .s:fg_yellow .s:bg_none -" *Type int, long, char, etc. -" StorageClass static, register, volatile, etc. -" Structure struct, union, enum, etc. -" Typedef A typedef - -exe "hi! Special" .s:fmt_none .s:fg_red .s:bg_none -" *Special any special symbol -" SpecialChar special character in a constant -" Tag you can use CTRL-] on this -" Delimiter character that needs attention -" SpecialComment special things inside a comment -" Debug debugging statements - -exe "hi! Underlined" .s:fmt_none .s:fg_violet .s:bg_none -" *Underlined text that stands out, HTML links - -exe "hi! Ignore" .s:fmt_none .s:fg_none .s:bg_none -" *Ignore left blank, hidden |hl-Ignore| - -exe "hi! Error" .s:fmt_bold .s:fg_red .s:bg_none -" *Error any erroneous construct - -exe "hi! Todo" .s:fmt_bold .s:fg_magenta.s:bg_none -" *Todo anything that needs extra attention; mostly the -" keywords TODO FIXME and XXX -" -"}}} -" Extended highlighting "{{{ -" --------------------------------------------------------------------- -if (g:solarized_visibility=="high") - exe "hi! SpecialKey" .s:fmt_revr .s:fg_red .s:bg_none - exe "hi! NonText" .s:fmt_bold .s:fg_red .s:bg_none -elseif (g:solarized_visibility=="low") - exe "hi! SpecialKey" .s:fmt_bold .s:fg_base02 .s:bg_none - exe "hi! NonText" .s:fmt_bold .s:fg_base02 .s:bg_none -else - exe "hi! SpecialKey" .s:fmt_bold .s:fg_base00 .s:bg_base02 - exe "hi! NonText" .s:fmt_bold .s:fg_base00 .s:bg_none -endif -exe "hi! StatusLine" .s:fmt_none .s:fg_base1 .s:bg_base02 .s:fmt_revbb -exe "hi! StatusLineNC" .s:fmt_none .s:fg_base00 .s:bg_base02 .s:fmt_revbb -exe "hi! Visual" .s:fmt_none .s:fg_base01 .s:bg_base03 .s:fmt_revbb -exe "hi! Directory" .s:fmt_none .s:fg_blue .s:bg_none -exe "hi! ErrorMsg" .s:fmt_revr .s:fg_red .s:bg_none -exe "hi! IncSearch" .s:fmt_stnd .s:fg_orange .s:bg_none -exe "hi! Search" .s:fmt_revr .s:fg_yellow .s:bg_none -exe "hi! MoreMsg" .s:fmt_none .s:fg_blue .s:bg_none -exe "hi! ModeMsg" .s:fmt_none .s:fg_blue .s:bg_none -exe "hi! LineNr" .s:fmt_none .s:fg_base01 .s:bg_base02 -exe "hi! Question" .s:fmt_bold .s:fg_cyan .s:bg_none -if ( has("gui_running") || &t_Co > 8 ) - exe "hi! VertSplit" .s:fmt_none .s:fg_base00 .s:bg_base00 -else - exe "hi! VertSplit" .s:fmt_revbb .s:fg_base00 .s:bg_base02 -endif -exe "hi! Title" .s:fmt_bold .s:fg_orange .s:bg_none -exe "hi! VisualNOS" .s:fmt_stnd .s:fg_none .s:bg_base02 .s:fmt_revbb -exe "hi! WarningMsg" .s:fmt_bold .s:fg_red .s:bg_none -exe "hi! WildMenu" .s:fmt_none .s:fg_base2 .s:bg_base02 .s:fmt_revbb -exe "hi! Folded" .s:fmt_undb .s:fg_base0 .s:bg_base02 .s:sp_base03 -exe "hi! FoldColumn" .s:fmt_none .s:fg_base0 .s:bg_base02 -if (g:solarized_diffmode=="high") -exe "hi! DiffAdd" .s:fmt_revr .s:fg_green .s:bg_none -exe "hi! DiffChange" .s:fmt_revr .s:fg_yellow .s:bg_none -exe "hi! DiffDelete" .s:fmt_revr .s:fg_red .s:bg_none -exe "hi! DiffText" .s:fmt_revr .s:fg_blue .s:bg_none -elseif (g:solarized_diffmode=="low") -exe "hi! DiffAdd" .s:fmt_undr .s:fg_green .s:bg_none .s:sp_green -exe "hi! DiffChange" .s:fmt_undr .s:fg_yellow .s:bg_none .s:sp_yellow -exe "hi! DiffDelete" .s:fmt_bold .s:fg_red .s:bg_none -exe "hi! DiffText" .s:fmt_undr .s:fg_blue .s:bg_none .s:sp_blue -else " normal - if has("gui_running") -exe "hi! DiffAdd" .s:fmt_bold .s:fg_green .s:bg_base02 .s:sp_green -exe "hi! DiffChange" .s:fmt_bold .s:fg_yellow .s:bg_base02 .s:sp_yellow -exe "hi! DiffDelete" .s:fmt_bold .s:fg_red .s:bg_base02 -exe "hi! DiffText" .s:fmt_bold .s:fg_blue .s:bg_base02 .s:sp_blue - else -exe "hi! DiffAdd" .s:fmt_none .s:fg_green .s:bg_base02 .s:sp_green -exe "hi! DiffChange" .s:fmt_none .s:fg_yellow .s:bg_base02 .s:sp_yellow -exe "hi! DiffDelete" .s:fmt_none .s:fg_red .s:bg_base02 -exe "hi! DiffText" .s:fmt_none .s:fg_blue .s:bg_base02 .s:sp_blue - endif -endif -exe "hi! SignColumn" .s:fmt_none .s:fg_base0 -exe "hi! Conceal" .s:fmt_none .s:fg_blue .s:bg_none -exe "hi! SpellBad" .s:fmt_curl .s:fg_none .s:bg_none .s:sp_red -exe "hi! SpellCap" .s:fmt_curl .s:fg_none .s:bg_none .s:sp_violet -exe "hi! SpellRare" .s:fmt_curl .s:fg_none .s:bg_none .s:sp_cyan -exe "hi! SpellLocal" .s:fmt_curl .s:fg_none .s:bg_none .s:sp_yellow -exe "hi! Pmenu" .s:fmt_none .s:fg_base0 .s:bg_base02 .s:fmt_revbb -exe "hi! PmenuSel" .s:fmt_none .s:fg_base01 .s:bg_base2 .s:fmt_revbb -exe "hi! PmenuSbar" .s:fmt_none .s:fg_base2 .s:bg_base0 .s:fmt_revbb -exe "hi! PmenuThumb" .s:fmt_none .s:fg_base0 .s:bg_base03 .s:fmt_revbb -exe "hi! TabLine" .s:fmt_undr .s:fg_base0 .s:bg_base02 .s:sp_base0 -exe "hi! TabLineFill" .s:fmt_undr .s:fg_base0 .s:bg_base02 .s:sp_base0 -exe "hi! TabLineSel" .s:fmt_undr .s:fg_base01 .s:bg_base2 .s:sp_base0 .s:fmt_revbbu -exe "hi! CursorColumn" .s:fmt_none .s:fg_none .s:bg_base02 -exe "hi! CursorLine" .s:fmt_uopt .s:fg_none .s:bg_base02 .s:sp_base1 -exe "hi! ColorColumn" .s:fmt_none .s:fg_none .s:bg_base02 -exe "hi! Cursor" .s:fmt_none .s:fg_base03 .s:bg_base0 -hi! link lCursor Cursor -exe "hi! MatchParen" .s:fmt_bold .s:fg_red .s:bg_base01 - -"}}} -" vim syntax highlighting "{{{ -" --------------------------------------------------------------------- -"exe "hi! vimLineComment" . s:fg_base01 .s:bg_none .s:fmt_ital -"hi! link vimComment Comment -"hi! link vimLineComment Comment -hi! link vimVar Identifier -hi! link vimFunc Function -hi! link vimUserFunc Function -hi! link helpSpecial Special -hi! link vimSet Normal -hi! link vimSetEqual Normal -exe "hi! vimCommentString" .s:fmt_none .s:fg_violet .s:bg_none -exe "hi! vimCommand" .s:fmt_none .s:fg_yellow .s:bg_none -exe "hi! vimCmdSep" .s:fmt_bold .s:fg_blue .s:bg_none -exe "hi! helpExample" .s:fmt_none .s:fg_base1 .s:bg_none -exe "hi! helpOption" .s:fmt_none .s:fg_cyan .s:bg_none -exe "hi! helpNote" .s:fmt_none .s:fg_magenta.s:bg_none -exe "hi! helpVim" .s:fmt_none .s:fg_magenta.s:bg_none -exe "hi! helpHyperTextJump" .s:fmt_undr .s:fg_blue .s:bg_none -exe "hi! helpHyperTextEntry".s:fmt_none .s:fg_green .s:bg_none -exe "hi! vimIsCommand" .s:fmt_none .s:fg_base00 .s:bg_none -exe "hi! vimSynMtchOpt" .s:fmt_none .s:fg_yellow .s:bg_none -exe "hi! vimSynType" .s:fmt_none .s:fg_cyan .s:bg_none -exe "hi! vimHiLink" .s:fmt_none .s:fg_blue .s:bg_none -exe "hi! vimHiGroup" .s:fmt_none .s:fg_blue .s:bg_none -exe "hi! vimGroup" .s:fmt_undb .s:fg_blue .s:bg_none -"}}} -" diff highlighting "{{{ -" --------------------------------------------------------------------- -hi! link diffAdded Statement -hi! link diffLine Identifier -"}}} -" git & gitcommit highlighting "{{{ -"git -"exe "hi! gitDateHeader" -"exe "hi! gitIdentityHeader" -"exe "hi! gitIdentityKeyword" -"exe "hi! gitNotesHeader" -"exe "hi! gitReflogHeader" -"exe "hi! gitKeyword" -"exe "hi! gitIdentity" -"exe "hi! gitEmailDelimiter" -"exe "hi! gitEmail" -"exe "hi! gitDate" -"exe "hi! gitMode" -"exe "hi! gitHashAbbrev" -"exe "hi! gitHash" -"exe "hi! gitReflogMiddle" -"exe "hi! gitReference" -"exe "hi! gitStage" -"exe "hi! gitType" -"exe "hi! gitDiffAdded" -"exe "hi! gitDiffRemoved" -"gitcommit -"exe "hi! gitcommitSummary" -exe "hi! gitcommitComment" .s:fmt_ital .s:fg_base01 .s:bg_none -hi! link gitcommitUntracked gitcommitComment -hi! link gitcommitDiscarded gitcommitComment -hi! link gitcommitSelected gitcommitComment -exe "hi! gitcommitUnmerged" .s:fmt_bold .s:fg_green .s:bg_none -exe "hi! gitcommitOnBranch" .s:fmt_bold .s:fg_base01 .s:bg_none -exe "hi! gitcommitBranch" .s:fmt_bold .s:fg_magenta .s:bg_none -hi! link gitcommitNoBranch gitcommitBranch -exe "hi! gitcommitDiscardedType".s:fmt_none .s:fg_red .s:bg_none -exe "hi! gitcommitSelectedType" .s:fmt_none .s:fg_green .s:bg_none -"exe "hi! gitcommitUnmergedType" -"exe "hi! gitcommitType" -"exe "hi! gitcommitNoChanges" -"exe "hi! gitcommitHeader" -exe "hi! gitcommitHeader" .s:fmt_none .s:fg_base01 .s:bg_none -exe "hi! gitcommitUntrackedFile".s:fmt_bold .s:fg_cyan .s:bg_none -exe "hi! gitcommitDiscardedFile".s:fmt_bold .s:fg_red .s:bg_none -exe "hi! gitcommitSelectedFile" .s:fmt_bold .s:fg_green .s:bg_none -exe "hi! gitcommitUnmergedFile" .s:fmt_bold .s:fg_yellow .s:bg_none -exe "hi! gitcommitFile" .s:fmt_bold .s:fg_base0 .s:bg_none -hi! link gitcommitDiscardedArrow gitcommitDiscardedFile -hi! link gitcommitSelectedArrow gitcommitSelectedFile -hi! link gitcommitUnmergedArrow gitcommitUnmergedFile -"exe "hi! gitcommitArrow" -"exe "hi! gitcommitOverflow" -"exe "hi! gitcommitBlank" -" }}} -" html highlighting "{{{ -" --------------------------------------------------------------------- -exe "hi! htmlTag" .s:fmt_none .s:fg_base01 .s:bg_none -exe "hi! htmlEndTag" .s:fmt_none .s:fg_base01 .s:bg_none -exe "hi! htmlTagN" .s:fmt_bold .s:fg_base1 .s:bg_none -exe "hi! htmlTagName" .s:fmt_bold .s:fg_blue .s:bg_none -exe "hi! htmlSpecialTagName".s:fmt_ital .s:fg_blue .s:bg_none -exe "hi! htmlArg" .s:fmt_none .s:fg_base00 .s:bg_none -exe "hi! javaScript" .s:fmt_none .s:fg_yellow .s:bg_none -"}}} -" perl highlighting "{{{ -" --------------------------------------------------------------------- -exe "hi! perlHereDoc" . s:fg_base1 .s:bg_back .s:fmt_none -exe "hi! perlVarPlain" . s:fg_yellow .s:bg_back .s:fmt_none -exe "hi! perlStatementFileDesc". s:fg_cyan.s:bg_back.s:fmt_none - -"}}} -" tex highlighting "{{{ -" --------------------------------------------------------------------- -exe "hi! texStatement" . s:fg_cyan .s:bg_back .s:fmt_none -exe "hi! texMathZoneX" . s:fg_yellow .s:bg_back .s:fmt_none -exe "hi! texMathMatcher" . s:fg_yellow .s:bg_back .s:fmt_none -exe "hi! texMathMatcher" . s:fg_yellow .s:bg_back .s:fmt_none -exe "hi! texRefLabel" . s:fg_yellow .s:bg_back .s:fmt_none -"}}} -" ruby highlighting "{{{ -" --------------------------------------------------------------------- -exe "hi! rubyDefine" . s:fg_base1 .s:bg_back .s:fmt_bold -"rubyInclude -"rubySharpBang -"rubyAccess -"rubyPredefinedVariable -"rubyBoolean -"rubyClassVariable -"rubyBeginEnd -"rubyRepeatModifier -"hi! link rubyArrayDelimiter Special " [ , , ] -"rubyCurlyBlock { , , } - -"hi! link rubyClass Keyword -"hi! link rubyModule Keyword -"hi! link rubyKeyword Keyword -"hi! link rubyOperator Operator -"hi! link rubyIdentifier Identifier -"hi! link rubyInstanceVariable Identifier -"hi! link rubyGlobalVariable Identifier -"hi! link rubyClassVariable Identifier -"hi! link rubyConstant Type -"}}} -" haskell syntax highlighting"{{{ -" --------------------------------------------------------------------- -" For use with syntax/haskell.vim : Haskell Syntax File -" http://www.vim.org/scripts/script.php?script_id=3034 -" See also Steffen Siering's github repository: -" http://github.com/urso/dotrc/blob/master/vim/syntax/haskell.vim -" --------------------------------------------------------------------- -" -" Treat True and False specially, see the plugin referenced above -let hs_highlight_boolean=1 -" highlight delims, see the plugin referenced above -let hs_highlight_delimiters=1 - -exe "hi! cPreCondit". s:fg_orange.s:bg_none .s:fmt_none - -exe "hi! VarId" . s:fg_blue .s:bg_none .s:fmt_none -exe "hi! ConId" . s:fg_yellow .s:bg_none .s:fmt_none -exe "hi! hsImport" . s:fg_magenta.s:bg_none .s:fmt_none -exe "hi! hsString" . s:fg_base00 .s:bg_none .s:fmt_none - -exe "hi! hsStructure" . s:fg_cyan .s:bg_none .s:fmt_none -exe "hi! hs_hlFunctionName" . s:fg_blue .s:bg_none -exe "hi! hsStatement" . s:fg_cyan .s:bg_none .s:fmt_none -exe "hi! hsImportLabel" . s:fg_cyan .s:bg_none .s:fmt_none -exe "hi! hs_OpFunctionName" . s:fg_yellow .s:bg_none .s:fmt_none -exe "hi! hs_DeclareFunction" . s:fg_orange .s:bg_none .s:fmt_none -exe "hi! hsVarSym" . s:fg_cyan .s:bg_none .s:fmt_none -exe "hi! hsType" . s:fg_yellow .s:bg_none .s:fmt_none -exe "hi! hsTypedef" . s:fg_cyan .s:bg_none .s:fmt_none -exe "hi! hsModuleName" . s:fg_green .s:bg_none .s:fmt_undr -exe "hi! hsModuleStartLabel" . s:fg_magenta.s:bg_none .s:fmt_none -hi! link hsImportParams Delimiter -hi! link hsDelimTypeExport Delimiter -hi! link hsModuleStartLabel hsStructure -hi! link hsModuleWhereLabel hsModuleStartLabel - -" following is for the haskell-conceal plugin -" the first two items don't have an impact, but better safe -exe "hi! hsNiceOperator" . s:fg_cyan .s:bg_none .s:fmt_none -exe "hi! hsniceoperator" . s:fg_cyan .s:bg_none .s:fmt_none - -"}}} -" pandoc markdown syntax highlighting "{{{ -" --------------------------------------------------------------------- - -"PandocHiLink pandocNormalBlock -exe "hi! pandocTitleBlock" .s:fg_blue .s:bg_none .s:fmt_none -exe "hi! pandocTitleBlockTitle" .s:fg_blue .s:bg_none .s:fmt_bold -exe "hi! pandocTitleComment" .s:fg_blue .s:bg_none .s:fmt_bold -exe "hi! pandocComment" .s:fg_base01 .s:bg_none .s:fmt_ital -exe "hi! pandocVerbatimBlock" .s:fg_yellow .s:bg_none .s:fmt_none -hi! link pandocVerbatimBlockDeep pandocVerbatimBlock -hi! link pandocCodeBlock pandocVerbatimBlock -hi! link pandocCodeBlockDelim pandocVerbatimBlock -exe "hi! pandocBlockQuote" .s:fg_blue .s:bg_none .s:fmt_none -exe "hi! pandocBlockQuoteLeader1" .s:fg_blue .s:bg_none .s:fmt_none -exe "hi! pandocBlockQuoteLeader2" .s:fg_cyan .s:bg_none .s:fmt_none -exe "hi! pandocBlockQuoteLeader3" .s:fg_yellow .s:bg_none .s:fmt_none -exe "hi! pandocBlockQuoteLeader4" .s:fg_red .s:bg_none .s:fmt_none -exe "hi! pandocBlockQuoteLeader5" .s:fg_base0 .s:bg_none .s:fmt_none -exe "hi! pandocBlockQuoteLeader6" .s:fg_base01 .s:bg_none .s:fmt_none -exe "hi! pandocListMarker" .s:fg_magenta.s:bg_none .s:fmt_none -exe "hi! pandocListReference" .s:fg_magenta.s:bg_none .s:fmt_undr - -" Definitions -" --------------------------------------------------------------------- -let s:fg_pdef = s:fg_violet -exe "hi! pandocDefinitionBlock" .s:fg_pdef .s:bg_none .s:fmt_none -exe "hi! pandocDefinitionTerm" .s:fg_pdef .s:bg_none .s:fmt_stnd -exe "hi! pandocDefinitionIndctr" .s:fg_pdef .s:bg_none .s:fmt_bold -exe "hi! pandocEmphasisDefinition" .s:fg_pdef .s:bg_none .s:fmt_ital -exe "hi! pandocEmphasisNestedDefinition" .s:fg_pdef .s:bg_none .s:fmt_bldi -exe "hi! pandocStrongEmphasisDefinition" .s:fg_pdef .s:bg_none .s:fmt_bold -exe "hi! pandocStrongEmphasisNestedDefinition" .s:fg_pdef.s:bg_none.s:fmt_bldi -exe "hi! pandocStrongEmphasisEmphasisDefinition" .s:fg_pdef.s:bg_none.s:fmt_bldi -exe "hi! pandocStrikeoutDefinition" .s:fg_pdef .s:bg_none .s:fmt_revr -exe "hi! pandocVerbatimInlineDefinition" .s:fg_pdef .s:bg_none .s:fmt_none -exe "hi! pandocSuperscriptDefinition" .s:fg_pdef .s:bg_none .s:fmt_none -exe "hi! pandocSubscriptDefinition" .s:fg_pdef .s:bg_none .s:fmt_none - -" Tables -" --------------------------------------------------------------------- -let s:fg_ptable = s:fg_blue -exe "hi! pandocTable" .s:fg_ptable.s:bg_none .s:fmt_none -exe "hi! pandocTableStructure" .s:fg_ptable.s:bg_none .s:fmt_none -hi! link pandocTableStructureTop pandocTableStructre -hi! link pandocTableStructureEnd pandocTableStructre -exe "hi! pandocTableZebraLight" .s:fg_ptable.s:bg_base03.s:fmt_none -exe "hi! pandocTableZebraDark" .s:fg_ptable.s:bg_base02.s:fmt_none -exe "hi! pandocEmphasisTable" .s:fg_ptable.s:bg_none .s:fmt_ital -exe "hi! pandocEmphasisNestedTable" .s:fg_ptable.s:bg_none .s:fmt_bldi -exe "hi! pandocStrongEmphasisTable" .s:fg_ptable.s:bg_none .s:fmt_bold -exe "hi! pandocStrongEmphasisNestedTable" .s:fg_ptable.s:bg_none .s:fmt_bldi -exe "hi! pandocStrongEmphasisEmphasisTable" .s:fg_ptable.s:bg_none .s:fmt_bldi -exe "hi! pandocStrikeoutTable" .s:fg_ptable.s:bg_none .s:fmt_revr -exe "hi! pandocVerbatimInlineTable" .s:fg_ptable.s:bg_none .s:fmt_none -exe "hi! pandocSuperscriptTable" .s:fg_ptable.s:bg_none .s:fmt_none -exe "hi! pandocSubscriptTable" .s:fg_ptable.s:bg_none .s:fmt_none - -" Headings -" --------------------------------------------------------------------- -let s:fg_phead = s:fg_orange -exe "hi! pandocHeading" .s:fg_phead .s:bg_none.s:fmt_bold -exe "hi! pandocHeadingMarker" .s:fg_yellow.s:bg_none.s:fmt_bold -exe "hi! pandocEmphasisHeading" .s:fg_phead .s:bg_none.s:fmt_bldi -exe "hi! pandocEmphasisNestedHeading" .s:fg_phead .s:bg_none.s:fmt_bldi -exe "hi! pandocStrongEmphasisHeading" .s:fg_phead .s:bg_none.s:fmt_bold -exe "hi! pandocStrongEmphasisNestedHeading" .s:fg_phead .s:bg_none.s:fmt_bldi -exe "hi! pandocStrongEmphasisEmphasisHeading".s:fg_phead .s:bg_none.s:fmt_bldi -exe "hi! pandocStrikeoutHeading" .s:fg_phead .s:bg_none.s:fmt_revr -exe "hi! pandocVerbatimInlineHeading" .s:fg_phead .s:bg_none.s:fmt_bold -exe "hi! pandocSuperscriptHeading" .s:fg_phead .s:bg_none.s:fmt_bold -exe "hi! pandocSubscriptHeading" .s:fg_phead .s:bg_none.s:fmt_bold - -" Links -" --------------------------------------------------------------------- -exe "hi! pandocLinkDelim" .s:fg_base01 .s:bg_none .s:fmt_none -exe "hi! pandocLinkLabel" .s:fg_blue .s:bg_none .s:fmt_undr -exe "hi! pandocLinkText" .s:fg_blue .s:bg_none .s:fmt_undb -exe "hi! pandocLinkURL" .s:fg_base00 .s:bg_none .s:fmt_undr -exe "hi! pandocLinkTitle" .s:fg_base00 .s:bg_none .s:fmt_undi -exe "hi! pandocLinkTitleDelim" .s:fg_base01 .s:bg_none .s:fmt_undi .s:sp_base00 -exe "hi! pandocLinkDefinition" .s:fg_cyan .s:bg_none .s:fmt_undr .s:sp_base00 -exe "hi! pandocLinkDefinitionID" .s:fg_blue .s:bg_none .s:fmt_bold -exe "hi! pandocImageCaption" .s:fg_violet .s:bg_none .s:fmt_undb -exe "hi! pandocFootnoteLink" .s:fg_green .s:bg_none .s:fmt_undr -exe "hi! pandocFootnoteDefLink" .s:fg_green .s:bg_none .s:fmt_bold -exe "hi! pandocFootnoteInline" .s:fg_green .s:bg_none .s:fmt_undb -exe "hi! pandocFootnote" .s:fg_green .s:bg_none .s:fmt_none -exe "hi! pandocCitationDelim" .s:fg_magenta.s:bg_none .s:fmt_none -exe "hi! pandocCitation" .s:fg_magenta.s:bg_none .s:fmt_none -exe "hi! pandocCitationID" .s:fg_magenta.s:bg_none .s:fmt_undr -exe "hi! pandocCitationRef" .s:fg_magenta.s:bg_none .s:fmt_none - -" Main Styles -" --------------------------------------------------------------------- -exe "hi! pandocStyleDelim" .s:fg_base01 .s:bg_none .s:fmt_none -exe "hi! pandocEmphasis" .s:fg_base0 .s:bg_none .s:fmt_ital -exe "hi! pandocEmphasisNested" .s:fg_base0 .s:bg_none .s:fmt_bldi -exe "hi! pandocStrongEmphasis" .s:fg_base0 .s:bg_none .s:fmt_bold -exe "hi! pandocStrongEmphasisNested" .s:fg_base0 .s:bg_none .s:fmt_bldi -exe "hi! pandocStrongEmphasisEmphasis" .s:fg_base0 .s:bg_none .s:fmt_bldi -exe "hi! pandocStrikeout" .s:fg_base01 .s:bg_none .s:fmt_revr -exe "hi! pandocVerbatimInline" .s:fg_yellow .s:bg_none .s:fmt_none -exe "hi! pandocSuperscript" .s:fg_violet .s:bg_none .s:fmt_none -exe "hi! pandocSubscript" .s:fg_violet .s:bg_none .s:fmt_none - -exe "hi! pandocRule" .s:fg_blue .s:bg_none .s:fmt_bold -exe "hi! pandocRuleLine" .s:fg_blue .s:bg_none .s:fmt_bold -exe "hi! pandocEscapePair" .s:fg_red .s:bg_none .s:fmt_bold -exe "hi! pandocCitationRef" .s:fg_magenta.s:bg_none .s:fmt_none -exe "hi! pandocNonBreakingSpace" . s:fg_red .s:bg_none .s:fmt_revr -hi! link pandocEscapedCharacter pandocEscapePair -hi! link pandocLineBreak pandocEscapePair - -" Embedded Code -" --------------------------------------------------------------------- -exe "hi! pandocMetadataDelim" .s:fg_base01 .s:bg_none .s:fmt_none -exe "hi! pandocMetadata" .s:fg_blue .s:bg_none .s:fmt_none -exe "hi! pandocMetadataKey" .s:fg_blue .s:bg_none .s:fmt_none -exe "hi! pandocMetadata" .s:fg_blue .s:bg_none .s:fmt_bold -hi! link pandocMetadataTitle pandocMetadata - -"}}} -" Utility autocommand "{{{ -" --------------------------------------------------------------------- -" In cases where Solarized is initialized inside a terminal vim session and -" then transferred to a gui session via the command `:gui`, the gui vim process -" does not re-read the colorscheme (or .vimrc for that matter) so any `has_gui` -" related code that sets gui specific values isn't executed. -" -" Currently, Solarized sets only the cterm or gui values for the colorscheme -" depending on gui or terminal mode. It's possible that, if the following -" autocommand method is deemed excessively poor form, that approach will be -" used again and the autocommand below will be dropped. -" -" However it seems relatively benign in this case to include the autocommand -" here. It fires only in cases where vim is transferring from terminal to gui -" mode (detected with the script scope s:vmode variable). It also allows for -" other potential terminal customizations that might make gui mode suboptimal. -" -autocmd GUIEnter * if (s:vmode != "gui") | exe "colorscheme " . g:colors_name | endif -"}}} -" Highlight Trailing Space {{{ -" Experimental: Different highlight when on cursorline -function! s:SolarizedHiTrail() - if g:solarized_hitrail==0 - hi! clear solarizedTrailingSpace - else - syn match solarizedTrailingSpace "\s*$" - exe "hi! solarizedTrailingSpace " .s:fmt_undr .s:fg_red .s:bg_none .s:sp_red - endif -endfunction -augroup SolarizedHiTrail - autocmd! - if g:solarized_hitrail==1 - autocmd! Syntax * call s:SolarizedHiTrail() - autocmd! ColorScheme * if g:colors_name == "solarized" | call s:SolarizedHiTrail() | else | augroup! s:SolarizedHiTrail | endif - endif -augroup END -" }}} -" Menus "{{{ -" --------------------------------------------------------------------- -" Turn off Solarized menu by including the following assignment in your .vimrc: -" -" let g:solarized_menu=0 - -function! s:SolarizedOptions() - new "new buffer - setf vim "vim filetype - let failed = append(0, s:defaults_list) - let failed = append(0, s:colorscheme_list) - let failed = append(0, s:options_list) - let failed = append(0, s:lazycat_list) - 0 "jump back to the top -endfunction -if !exists(":SolarizedOptions") - command SolarizedOptions :call s:SolarizedOptions() -endif - -function! SolarizedMenu() - if exists("g:loaded_solarized_menu") - try - silent! aunmenu Solarized - endtry - endif - let g:loaded_solarized_menu = 1 - - if g:colors_name == "solarized" && g:solarized_menu != 0 - - amenu &Solarized.&Contrast.&Low\ Contrast :let g:solarized_contrast="low" \| colorscheme solarized - amenu &Solarized.&Contrast.&Normal\ Contrast :let g:solarized_contrast="normal" \| colorscheme solarized - amenu &Solarized.&Contrast.&High\ Contrast :let g:solarized_contrast="high" \| colorscheme solarized - an &Solarized.&Contrast.-sep- - amenu &Solarized.&Contrast.&Help:\ Contrast :help 'solarized_contrast' - - amenu &Solarized.&Visibility.&Low\ Visibility :let g:solarized_visibility="low" \| colorscheme solarized - amenu &Solarized.&Visibility.&Normal\ Visibility :let g:solarized_visibility="normal" \| colorscheme solarized - amenu &Solarized.&Visibility.&High\ Visibility :let g:solarized_visibility="high" \| colorscheme solarized - an &Solarized.&Visibility.-sep- - amenu &Solarized.&Visibility.&Help:\ Visibility :help 'solarized_visibility' - - amenu &Solarized.&Background.&Toggle\ Background :ToggleBG - amenu &Solarized.&Background.&Dark\ Background :set background=dark \| colorscheme solarized - amenu &Solarized.&Background.&Light\ Background :set background=light \| colorscheme solarized - an &Solarized.&Background.-sep- - amenu &Solarized.&Background.&Help:\ ToggleBG :help togglebg - - if g:solarized_bold==0 | let l:boldswitch="On" | else | let l:boldswitch="Off" | endif - exe "amenu &Solarized.&Styling.&Turn\\ Bold\\ ".l:boldswitch." :let g:solarized_bold=(abs(g:solarized_bold-1)) \\| colorscheme solarized" - if g:solarized_italic==0 | let l:italicswitch="On" | else | let l:italicswitch="Off" | endif - exe "amenu &Solarized.&Styling.&Turn\\ Italic\\ ".l:italicswitch." :let g:solarized_italic=(abs(g:solarized_italic-1)) \\| colorscheme solarized" - if g:solarized_underline==0 | let l:underlineswitch="On" | else | let l:underlineswitch="Off" | endif - exe "amenu &Solarized.&Styling.&Turn\\ Underline\\ ".l:underlineswitch." :let g:solarized_underline=(abs(g:solarized_underline-1)) \\| colorscheme solarized" - - amenu &Solarized.&Diff\ Mode.&Low\ Diff\ Mode :let g:solarized_diffmode="low" \| colorscheme solarized - amenu &Solarized.&Diff\ Mode.&Normal\ Diff\ Mode :let g:solarized_diffmode="normal" \| colorscheme solarized - amenu &Solarized.&Diff\ Mode.&High\ Diff\ Mode :let g:solarized_diffmode="high" \| colorscheme solarized - - if g:solarized_hitrail==0 | let l:hitrailswitch="On" | else | let l:hitrailswitch="Off" | endif - exe "amenu &Solarized.&Experimental.&Turn\\ Highlight\\ Trailing\\ Spaces\\ ".l:hitrailswitch." :let g:solarized_hitrail=(abs(g:solarized_hitrail-1)) \\| colorscheme solarized" - an &Solarized.&Experimental.-sep- - amenu &Solarized.&Experimental.&Help:\ HiTrail :help 'solarized_hitrail' - - an &Solarized.-sep1- - - amenu &Solarized.&Autogenerate\ options :SolarizedOptions - - an &Solarized.-sep2- - - amenu &Solarized.&Help.&Solarized\ Help :help solarized - amenu &Solarized.&Help.&Toggle\ Background\ Help :help togglebg - amenu &Solarized.&Help.&Removing\ This\ Menu :help solarized-menu - - an 9999.77 &Help.&Solarized\ Colorscheme :help solarized - an 9999.78 &Help.&Toggle\ Background :help togglebg - an 9999.79 &Help.-sep3- - - endif -endfunction - -autocmd ColorScheme * if g:colors_name != "solarized" | silent! aunmenu Solarized | else | call SolarizedMenu() | endif - -"}}} -" License "{{{ -" --------------------------------------------------------------------- -" -" Copyright (c) 2011 Ethan Schoonover -" -" Permission is hereby granted, free of charge, to any person obtaining a copy -" of this software and associated documentation files (the "Software"), to deal -" in the Software without restriction, including without limitation the rights -" to use, copy, modify, merge, publish, distribute, 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 PARTICULAR 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 CONTRACT, TORT OR OTHERWISE, ARISING FROM, -" OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -" THE SOFTWARE. -" -" vim:foldmethod=marker:foldlevel=0 -"}}} diff --git a/_old/vim/init.vim b/_old/vim/init.vim deleted file mode 120000 index 90104ae..0000000 --- a/_old/vim/init.vim +++ /dev/null @@ -1 +0,0 @@ -/home/tsouza/.vimrc \ No newline at end of file diff --git a/_old/vim/nvim b/_old/vim/nvim deleted file mode 120000 index 5eb6985..0000000 --- a/_old/vim/nvim +++ /dev/null @@ -1 +0,0 @@ -/home/tsouza/.config/nvim \ No newline at end of file diff --git a/_old/vim/vim b/_old/vim/vim deleted file mode 120000 index f4109ac..0000000 --- a/_old/vim/vim +++ /dev/null @@ -1 +0,0 @@ -/home/tsouza/Documents/gitlab/tyrelsouza/dotfiles/vim \ No newline at end of file diff --git a/_old/vimrc b/_old/vimrc deleted file mode 100644 index 7a2cac6..0000000 --- a/_old/vimrc +++ /dev/null @@ -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 - -" Easier tab changing -nnoremap rr :bprevious -nnoremap tt :bnext - -" 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
  • and

    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 pb :CtrlPBuffer -nmap :CtrlPBuffer - -" Easy bindings for its various modes -nmap bb :CtrlPBuffer -nmap bm :CtrlPMixed -nmap bs :CtrlPMRU - -" Tagbar -nmap :TagbarToggle -nmap :CtrlPTag - - -" To open a new empty buffer -" This replaces :tabnew which I used to bind to this mapping -nmap t :enew - -" Move to the next buffer -nmap l :bnext - -" Move to the previous buffer -nmap h :bprevious - -" Close the current buffer and move to the previous one -nmap bq :bp bd # - -" FUCK EX MODE -map q: -nnoremap Q - - -" Toggle line numbers with F1 - no more stupid help! -"nmap :set invnumber -nmap :exec &nu==&rnu? "se nu!" : "se rnu!" -autocmd StdinReadPre * let s:std_in=1 -hi Normal ctermbg=none -" Local config -let g:go_fmt_command = "goimports" -nnoremap :buffers:buffer -set background=dark -let vim_markdown_preview_hotkey='' -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 diff --git a/_old/vimrc.bundles b/_old/vimrc.bundles deleted file mode 100644 index 2039094..0000000 --- a/_old/vimrc.bundles +++ /dev/null @@ -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 diff --git a/git_template/hooks/post-checkout b/git_template/hooks/post-checkout deleted file mode 100755 index 0b12578..0000000 --- a/git_template/hooks/post-checkout +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -#if [ -e bin/update_dependencies.sh ]; then -# bin/update_dependencies.sh -#fi diff --git a/git_template/hooks/post-merge b/git_template/hooks/post-merge deleted file mode 100755 index 0b12578..0000000 --- a/git_template/hooks/post-merge +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -#if [ -e bin/update_dependencies.sh ]; then -# bin/update_dependencies.sh -#fi diff --git a/git_template/hooks/pre-push b/git_template/hooks/pre-push deleted file mode 100755 index b8970e8..0000000 --- a/git_template/hooks/pre-push +++ /dev/null @@ -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 diff --git a/bin/CPSP b/home/bin/CPSP similarity index 100% rename from bin/CPSP rename to home/bin/CPSP diff --git a/bin/Markdown.pl b/home/bin/Markdown.pl similarity index 100% rename from bin/Markdown.pl rename to home/bin/Markdown.pl diff --git a/bin/SCmd b/home/bin/SCmd similarity index 100% rename from bin/SCmd rename to home/bin/SCmd diff --git a/bin/datecalc.py b/home/bin/datecalc.py similarity index 100% rename from bin/datecalc.py rename to home/bin/datecalc.py diff --git a/bin/emax b/home/bin/emax similarity index 100% rename from bin/emax rename to home/bin/emax diff --git a/bin/git-clean.sh b/home/bin/git-clean.sh similarity index 100% rename from bin/git-clean.sh rename to home/bin/git-clean.sh diff --git a/bin/git-fuck b/home/bin/git-fuck similarity index 100% rename from bin/git-fuck rename to home/bin/git-fuck diff --git a/bin/git_undo_everything.sh b/home/bin/git_undo_everything.sh similarity index 100% rename from bin/git_undo_everything.sh rename to home/bin/git_undo_everything.sh diff --git a/bin/gochk b/home/bin/gochk similarity index 100% rename from bin/gochk rename to home/bin/gochk diff --git a/bin/goland.sh b/home/bin/goland.sh similarity index 100% rename from bin/goland.sh rename to home/bin/goland.sh diff --git a/bin/golangci-lint b/home/bin/golangci-lint similarity index 100% rename from bin/golangci-lint rename to home/bin/golangci-lint diff --git a/bin/gstate b/home/bin/gstate similarity index 100% rename from bin/gstate rename to home/bin/gstate diff --git a/bin/json2yaml b/home/bin/json2yaml similarity index 100% rename from bin/json2yaml rename to home/bin/json2yaml diff --git a/bin/keybase_download_gpg_keys.sh b/home/bin/keybase_download_gpg_keys.sh similarity index 100% rename from bin/keybase_download_gpg_keys.sh rename to home/bin/keybase_download_gpg_keys.sh diff --git a/bin/killtransmission.sh b/home/bin/killtransmission.sh similarity index 100% rename from bin/killtransmission.sh rename to home/bin/killtransmission.sh diff --git a/bin/last_status.py b/home/bin/last_status.py similarity index 100% rename from bin/last_status.py rename to home/bin/last_status.py diff --git a/bin/mov_to_gif.sh b/home/bin/mov_to_gif.sh similarity index 100% rename from bin/mov_to_gif.sh rename to home/bin/mov_to_gif.sh diff --git a/bin/mysql_in_ram.sh b/home/bin/mysql_in_ram.sh similarity index 100% rename from bin/mysql_in_ram.sh rename to home/bin/mysql_in_ram.sh diff --git a/bin/oh_fuck.sh b/home/bin/oh_fuck.sh similarity index 100% rename from bin/oh_fuck.sh rename to home/bin/oh_fuck.sh diff --git a/bin/old.py b/home/bin/old.py similarity index 100% rename from bin/old.py rename to home/bin/old.py diff --git a/bin/packages/homebrew-casks.txt b/home/bin/packages/homebrew-casks.txt similarity index 100% rename from bin/packages/homebrew-casks.txt rename to home/bin/packages/homebrew-casks.txt diff --git a/bin/packages/homebrew.txt b/home/bin/packages/homebrew.txt similarity index 100% rename from bin/packages/homebrew.txt rename to home/bin/packages/homebrew.txt diff --git a/bin/packages/pip.txt b/home/bin/packages/pip.txt similarity index 100% rename from bin/packages/pip.txt rename to home/bin/packages/pip.txt diff --git a/bin/pycharm.sh b/home/bin/pycharm.sh similarity index 100% rename from bin/pycharm.sh rename to home/bin/pycharm.sh diff --git a/bin/release_package.sh b/home/bin/release_package.sh similarity index 100% rename from bin/release_package.sh rename to home/bin/release_package.sh diff --git a/bin/restart_bluetooth b/home/bin/restart_bluetooth similarity index 100% rename from bin/restart_bluetooth rename to home/bin/restart_bluetooth diff --git a/bin/rubymine.sh b/home/bin/rubymine.sh similarity index 100% rename from bin/rubymine.sh rename to home/bin/rubymine.sh diff --git a/bin/sc b/home/bin/sc similarity index 100% rename from bin/sc rename to home/bin/sc diff --git a/bin/scf b/home/bin/scf similarity index 100% rename from bin/scf rename to home/bin/scf diff --git a/bin/spoof_mac.sh b/home/bin/spoof_mac.sh similarity index 100% rename from bin/spoof_mac.sh rename to home/bin/spoof_mac.sh diff --git a/bin/sshc b/home/bin/sshc similarity index 100% rename from bin/sshc rename to home/bin/sshc diff --git a/bin/startemacs.sh b/home/bin/startemacs.sh similarity index 100% rename from bin/startemacs.sh rename to home/bin/startemacs.sh diff --git a/bin/startup_i3.sh b/home/bin/startup_i3.sh similarity index 100% rename from bin/startup_i3.sh rename to home/bin/startup_i3.sh diff --git a/bin/update-neovim.sh b/home/bin/update-neovim.sh similarity index 100% rename from bin/update-neovim.sh rename to home/bin/update-neovim.sh diff --git a/bin/upload_and_copy b/home/bin/upload_and_copy similarity index 100% rename from bin/upload_and_copy rename to home/bin/upload_and_copy diff --git a/bin/vimv b/home/bin/vimv similarity index 100% rename from bin/vimv rename to home/bin/vimv diff --git a/bin/virtualenv-auto-activate.sh b/home/bin/virtualenv-auto-activate.sh similarity index 100% rename from bin/virtualenv-auto-activate.sh rename to home/bin/virtualenv-auto-activate.sh diff --git a/bin/watch.py b/home/bin/watch.py similarity index 100% rename from bin/watch.py rename to home/bin/watch.py diff --git a/bin/water_reminder b/home/bin/water_reminder similarity index 100% rename from bin/water_reminder rename to home/bin/water_reminder diff --git a/config/fish/config.fish b/home/config/fish/config.fish similarity index 100% rename from config/fish/config.fish rename to home/config/fish/config.fish diff --git a/config/fish/everquote.fish b/home/config/fish/everquote.fish similarity index 100% rename from config/fish/everquote.fish rename to home/config/fish/everquote.fish diff --git a/home/config/fish/fish_variables b/home/config/fish/fish_variables new file mode 100644 index 0000000..b96d260 --- /dev/null +++ b/home/config/fish/fish_variables @@ -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 diff --git a/config/fish/shell_aliases.fish b/home/config/fish/shell_aliases.fish similarity index 100% rename from config/fish/shell_aliases.fish rename to home/config/fish/shell_aliases.fish diff --git a/config/fish/shell_funcs.fish b/home/config/fish/shell_funcs.fish similarity index 100% rename from config/fish/shell_funcs.fish rename to home/config/fish/shell_funcs.fish diff --git a/config/htop/htoprc b/home/config/htop/htoprc similarity index 100% rename from config/htop/htoprc rename to home/config/htop/htoprc diff --git a/config/i3/config b/home/config/i3/config similarity index 100% rename from config/i3/config rename to home/config/i3/config diff --git a/config/i3/rofi b/home/config/i3/rofi similarity index 100% rename from config/i3/rofi rename to home/config/i3/rofi diff --git a/config/i3/rofi_window b/home/config/i3/rofi_window similarity index 100% rename from config/i3/rofi_window rename to home/config/i3/rofi_window diff --git a/config/karabiner/assets/complex_modifications/1672600379.json b/home/config/karabiner/assets/complex_modifications/1672600379.json similarity index 100% rename from config/karabiner/assets/complex_modifications/1672600379.json rename to home/config/karabiner/assets/complex_modifications/1672600379.json diff --git a/config/karabiner/karabiner.json b/home/config/karabiner/karabiner.json similarity index 100% rename from config/karabiner/karabiner.json rename to home/config/karabiner/karabiner.json diff --git a/config/nvim/init.vim b/home/config/nvim/init.vim similarity index 100% rename from config/nvim/init.vim rename to home/config/nvim/init.vim diff --git a/config/polybar/battery-combined-shell.sh b/home/config/polybar/battery-combined-shell.sh similarity index 100% rename from config/polybar/battery-combined-shell.sh rename to home/config/polybar/battery-combined-shell.sh diff --git a/config/polybar/config b/home/config/polybar/config similarity index 100% rename from config/polybar/config rename to home/config/polybar/config diff --git a/config/polybar/i3wmthemer_bar_launch.sh b/home/config/polybar/i3wmthemer_bar_launch.sh similarity index 100% rename from config/polybar/i3wmthemer_bar_launch.sh rename to home/config/polybar/i3wmthemer_bar_launch.sh diff --git a/config/tmuxinator/tidelift.yml b/home/config/tmuxinator/tidelift.yml similarity index 100% rename from config/tmuxinator/tidelift.yml rename to home/config/tmuxinator/tidelift.yml diff --git a/gitconfig b/home/gitconfig similarity index 100% rename from gitconfig rename to home/gitconfig diff --git a/gitignore b/home/gitignore similarity index 100% rename from gitignore rename to home/gitignore diff --git a/hushlogin b/home/hushlogin similarity index 100% rename from hushlogin rename to home/hushlogin diff --git a/pythonstartup.py b/home/pythonstartup.py similarity index 100% rename from pythonstartup.py rename to home/pythonstartup.py diff --git a/shell_aliases b/home/shell_aliases similarity index 100% rename from shell_aliases rename to home/shell_aliases diff --git a/shell_funcs b/home/shell_funcs similarity index 100% rename from shell_funcs rename to home/shell_funcs diff --git a/tmux.conf b/home/tmux.conf similarity index 93% rename from tmux.conf rename to home/tmux.conf index f1a2c64..fb96764 100644 --- a/tmux.conf +++ b/home/tmux.conf @@ -18,8 +18,6 @@ set -g @batt_discharging_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 -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-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 + +# Initialize TMUX plugin manager (keep this line at the very bottom of tmux.conf) +run '~/.tmux/plugins/tpm/tpm' diff --git a/hosts/ts-tl-mbp/home-manager.nix b/hosts/ts-tl-mbp/home-manager.nix index b490ff2..6f04acf 100644 --- a/hosts/ts-tl-mbp/home-manager.nix +++ b/hosts/ts-tl-mbp/home-manager.nix @@ -11,9 +11,9 @@ }; home.packages = with pkgs; [ + bat ctags exa - bat fzf ripgrep wget @@ -22,13 +22,17 @@ programs.tmux = { enable = true; }; - #home.file.".tmux".source = "../../tmux"; - #home.file.".tmux.conf".source = "../../tmux.conf"; + home.file = { + ".tmux.conf" = { + source = ../../home/tmux.conf; + recursive = true; + }; + }; programs.git = { enable = true; includes = [ - { path = "~/code/tyrel.dev/dotfiles/gitconfig"; } + { path = "~/code/tyrel.dev/dotfiles/home/gitconfig"; } ]; aliases = { ap = "add -p"; @@ -41,22 +45,10 @@ programs.neovim = { enable = true; }; - xdg.configFile = { - "nvim" = { - source = ../../config/nvim; - recursive = true; - }; - }; - programs.fish = { enable = true; }; - xdg.configFile = { - "fish" = { - source = ../../config/fish; - recursive = true; - }; - }; + programs.htop = { @@ -64,18 +56,25 @@ }; #xdg.configFile = { # "htop" = { - # source = ../../config/htop; + # source = ../../home/config/htop; # recursive = true; # }; #}; - - # Brew's XDG CONFIGS + # XDG CONFIGS xdg.configFile = { + "nvim" = { + source = ../../home/config/nvim; + recursive = true; + }; + "fish" = { + source = ../../home/config/fish; + recursive = true; + }; "karabiner" = { - source = ../../config/karabiner; + source = ../../home/config/karabiner; recursive = true; }; }; diff --git a/rebuild.sh b/rebuild.sh index 6c313f7..6c6af87 100755 --- a/rebuild.sh +++ b/rebuild.sh @@ -1,4 +1,4 @@ #!/bin/bash git add . # YOLO -./result/sw/bin/darwin-rebuild switch --flake . +./result/sw/bin/darwin-rebuild switch --flake _macos diff --git a/tmux/plugins/tmux-battery b/tmux/plugins/tmux-battery deleted file mode 160000 index 09be78c..0000000 --- a/tmux/plugins/tmux-battery +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 09be78c35ee84f858f724442b94ad045ade23eb0 diff --git a/tmux/plugins/tmux-continuum b/tmux/plugins/tmux-continuum deleted file mode 160000 index 90f4a00..0000000 --- a/tmux/plugins/tmux-continuum +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 90f4a00c41de094864dd4e29231253bcd80d4409 diff --git a/tmux/plugins/tmux-sensible b/tmux/plugins/tmux-sensible deleted file mode 160000 index e91b178..0000000 --- a/tmux/plugins/tmux-sensible +++ /dev/null @@ -1 +0,0 @@ -Subproject commit e91b178ff832b7bcbbf4d99d9f467f63fd1b76b5 diff --git a/tmux/plugins/tmux-themepack b/tmux/plugins/tmux-themepack deleted file mode 160000 index 748ab16..0000000 --- a/tmux/plugins/tmux-themepack +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 748ab165adf6b5f74ed10d6a416dc55cd1906033 diff --git a/tmux/plugins/tpm b/tmux/plugins/tpm deleted file mode 160000 index 95f7833..0000000 --- a/tmux/plugins/tpm +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 95f78336c3972f3e6648b7b3db754f2224320a5e