diff options
Diffstat (limited to 'old')
| -rw-r--r-- | old/config/fish/config.fish | 6 | ||||
| -rw-r--r-- | old/config/fish/functions/__format_time.fish | 27 | ||||
| -rw-r--r-- | old/config/fish/functions/__parse_current_folder.fish | 3 | ||||
| -rw-r--r-- | old/config/fish/functions/__parse_git_branch.fish | 4 | ||||
| -rw-r--r-- | old/config/fish/functions/fish_prompt.fish | 69 | ||||
| -rw-r--r-- | old/config/fish/functions/insert_cmd.fish | 3 | ||||
| -rwxr-xr-x | old/vimrc | 109 |
7 files changed, 221 insertions, 0 deletions
diff --git a/old/config/fish/config.fish b/old/config/fish/config.fish new file mode 100644 index 0000000..885e7bd --- /dev/null +++ b/old/config/fish/config.fish @@ -0,0 +1,6 @@ +bind \ec insert_cmd + +set -x EDITOR nvim +set -x TZ 'America/New_York' +set -x PATH "$HOME/bin" $PATH + diff --git a/old/config/fish/functions/__format_time.fish b/old/config/fish/functions/__format_time.fish new file mode 100644 index 0000000..298e4cb --- /dev/null +++ b/old/config/fish/functions/__format_time.fish @@ -0,0 +1,27 @@ +function __format_time -d "Format milliseconds to a human readable format" + set -l milliseconds $argv[1] + set -l seconds (math "$milliseconds / 1000 % 60") + set -l minutes (math "$milliseconds / 60000 % 60") + set -l hours (math "$milliseconds / 3600000 % 24") + set -l days (math "$milliseconds / 86400000") + set -l time + set -l threshold 5 + + if test $days -gt 0 + set time (command printf "$time%sd " $days) + end + + if test $hours -gt 0 + set time (command printf "$time%sh " $hours) + end + + if test $minutes -gt 0 + set time (command printf "$time%sm " $minutes) + end + + if test $seconds -gt $threshold + set time (command printf "$time%ss " $seconds) + end + + echo -e $time +end diff --git a/old/config/fish/functions/__parse_current_folder.fish b/old/config/fish/functions/__parse_current_folder.fish new file mode 100644 index 0000000..031b53e --- /dev/null +++ b/old/config/fish/functions/__parse_current_folder.fish @@ -0,0 +1,3 @@ +function __parse_current_folder -d "Replace '$HOME' with '~'" + pwd | sed "s|$HOME|~|" +end diff --git a/old/config/fish/functions/__parse_git_branch.fish b/old/config/fish/functions/__parse_git_branch.fish new file mode 100644 index 0000000..42b46fb --- /dev/null +++ b/old/config/fish/functions/__parse_git_branch.fish @@ -0,0 +1,4 @@ +function __parse_git_branch -d "Parse current Git branch name" + command git symbolic-ref --short HEAD ^/dev/null; + or command git show-ref --head -s --abbrev | head -n1 ^/dev/null +end diff --git a/old/config/fish/functions/fish_prompt.fish b/old/config/fish/functions/fish_prompt.fish new file mode 100644 index 0000000..bd142dd --- /dev/null +++ b/old/config/fish/functions/fish_prompt.fish @@ -0,0 +1,69 @@ +function fish_prompt --description 'Write out the prompt' + set -l last_status $status + + # Just calculate this once, to save a few cycles when displaying the prompt + if not set -q __fish_prompt_hostname + set -g __fish_prompt_hostname (hostname|cut -d . -f 1) + end + + set -l normal (set_color normal) + + # Hack; fish_config only copies the fish_prompt function (see #736) + if not set -q -g __fish_classic_git_functions_defined + set -g __fish_classic_git_functions_defined + + function __fish_repaint_user --on-variable fish_color_user --description "Event handler, repaint when fish_color_user changes" + if status --is-interactive + commandline -f repaint ^/dev/null + end + end + + function __fish_repaint_host --on-variable fish_color_host --description "Event handler, repaint when fish_color_host changes" + if status --is-interactive + commandline -f repaint ^/dev/null + end + end + + function __fish_repaint_status --on-variable fish_color_status --description "Event handler; repaint when fish_color_status changes" + if status --is-interactive + commandline -f repaint ^/dev/null + end + end + + function __fish_repaint_bind_mode --on-variable fish_key_bindings --description "Event handler; repaint when fish_key_bindings changes" + if status --is-interactive + commandline -f repaint ^/dev/null + end + end + + # initialize our new variables + if not set -q __fish_classic_git_prompt_initialized + set -qU fish_color_user; or set -U fish_color_user -o green + set -qU fish_color_host; or set -U fish_color_host -o cyan + set -qU fish_color_status; or set -U fish_color_status red + set -U __fish_classic_git_prompt_initialized + end + end + + set -l color_cwd + set -l prefix + switch $USER + case root toor + if set -q fish_color_cwd_root + set color_cwd $fish_color_cwd_root + else + set color_cwd $fish_color_cwd + end + set suffix '#' + case '*' + set color_cwd $fish_color_cwd + set suffix '>' + end + + set -l prompt_status + if test $last_status -ne 0 + set prompt_status ' ' (set_color $fish_color_status) "[$last_status]" "$normal" + end + + echo -n -s (set_color $fish_color_user) "$USER" $normal @ (set_color $fish_color_host) "$__fish_prompt_hostname" $normal ' ' (set_color $color_cwd) (prompt_pwd) $normal (__fish_vcs_prompt) $normal $prompt_status "> " +end diff --git a/old/config/fish/functions/insert_cmd.fish b/old/config/fish/functions/insert_cmd.fish new file mode 100644 index 0000000..b167734 --- /dev/null +++ b/old/config/fish/functions/insert_cmd.fish @@ -0,0 +1,3 @@ +function insert_cmd + commandline -i (pwd) +end diff --git a/old/vimrc b/old/vimrc new file mode 100755 index 0000000..32e6fc5 --- /dev/null +++ b/old/vimrc @@ -0,0 +1,109 @@ +let mapleader = "," +syntax on + +filetype off +set rtp+=~/.vim/bundle/Vundle.vim +call vundle#begin() +" TODO(orbekk): Try ctrlp.vim instead. +" Plugin 'wincent/command-t' +" Plugin 'ctrlpvim/ctrlp.vim' +Plugin 'chriskempson/base16-vim' +Plugin 'chriskempson/vim-tomorrow-theme' +Plugin 'gmarik/Vundle.vim' +Plugin 'Shougo/vimproc.vim' +Plugin 'Shougo/unite.vim' +Plugin 'Shougo/unite-outline' +Plugin 'Shougo/neomru.vim' +call vundle#end() + +set modeline +set tabpagemax=20 +set autoread +set noswapfile +set timeoutlen=1000 +set ignorecase +set expandtab +set shiftwidth=2 +set softtabstop=2 +set smarttab +set smartcase +set incsearch +set autoindent +set formatoptions=crt +setglobal fileencoding=utf-8 +set fileencodings=ucs-bomb,utf-8,latin1 +set virtualedit=block +set hidden +set confirm +inoremap <C-c> <nop> +set hlsearch + +filetype plugin on +filetype indent on + +setlocal complete+=ktags + +nmap <silent> <C-N> :silent noh<CR> +map <leader>cd :cd %:p:h<CR>:pwd<CR> + +if executable('ag') +let g:unite_source_grep_command = 'ag' +let g:unite_source_grep_default_opts = +\ '-i --vimgrep --ignore ' . +\ '''.hg'' --ignore ''.svn'' --ignore ''.git'' --ignore ''.bzr''' +endif + +let g:unite_source_history_yank_enable = 1 +call unite#filters#matcher_default#use(['matcher_fuzzy']) +nnoremap <leader>t :<C-u>Unite -no-split -buffer-name=files -start-insert file_mru file_rec/async:.<cr> +nnoremap <leader>r :<C-u>Unite -no-split -buffer-name=mru -start-insert file_rec/git<cr> +nnoremap <leader>O :<C-u>Unite -no-split -buffer-name=outline outline<cr> +nnoremap <leader>y :<C-u>Unite -no-split -buffer-name=yank history/yank<cr> +nnoremap <leader>b :<C-u>Unite -no-split -buffer-name=buffer buffer bookmark<cr> +nnoremap <leader>g :<C-u>Unite -no-split -buffer-name=grep -start-insert grep:.<cr> + +" map <leader>t :CtrlP<CR> +" map <leader>b :CtrlPBuffer<CR> +" map <leader>r :CtrlPMRU<CR> + +set wildignore+=*.class,target/*,project/* + +"set guifont=DroidSansMono\ 10 +set guifont="Source Code Pro 10" +set guioptions-=m +set guioptions-=M +set guioptions-=T +set guioptions-=r +set guioptions-=L + +set colorcolumn=81 + +map <leader>R :source ~/.vimrc<CR> + +function! GetFileBase() + return substitute(expand("%"), + \ '\(.\{-}\)\(_test\|_unittest\)\?\.\(h\|cc\)$', '\1', "") +endfunction + +" Switch between cc, h, test/unittest files. +function! EditCc() + exec "edit " . fnameescape(GetFileBase() . ".cc") +endfunction +map <leader>cc :silent :call EditCc()<CR> + +function! EditH() + exec "edit " . fnameescape(GetFileBase() . ".h") +endfunction +map <leader>h :silent :call EditH()<CR> + +function! EditTest() + let file_base = GetFileBase() + if (filereadable(file_base . "_unittest.cc")) + exec "edit " . fnameescape(file_base . "_unittest.cc") + else + exec "edit " . fnameescape(file_base . "_test.cc") + endif +endfunction +map <leader>te :silent :call EditTest()<CR> + +source ~/.vimrc.local |