diff options
| -rw-r--r-- | brew_packages.txt | 10 | ||||
| -rw-r--r-- | configs/.vimrc | 19 | ||||
| -rw-r--r-- | configs/.zsh_profile | 5 | ||||
| -rw-r--r-- | configs/tmux-256color-italic | 3 | ||||
| -rw-r--r-- | functions/git_functions.sh | 2 | ||||
| -rw-r--r-- | functions/misc_functions.sh | 8 | ||||
| -rw-r--r-- | functions/vim_functions.sh | 4 | ||||
| -rw-r--r-- | tmux-256color-italic.ti | 29 |
8 files changed, 62 insertions, 18 deletions
diff --git a/brew_packages.txt b/brew_packages.txt index bbd183c96163..5ae15c74fd90 100644 --- a/brew_packages.txt +++ b/brew_packages.txt @@ -1,5 +1,4 @@ ack -arpack autojump bash-completion bdw-gc @@ -30,14 +29,12 @@ giflib gl2ps glib global -glpk gmp gnu-sed gnupg gnuplot go graphicsmagick -hdf5 httpie imagemagick isl @@ -56,11 +53,9 @@ libyaml little-cms2 lua macvim -metis mpfr nethogs newsbeuter -octave oniguruma openssl par @@ -76,8 +71,6 @@ pup pyqt5 python python3 -qhull -qrupdate qscintilla2 qt5 readline @@ -88,15 +81,12 @@ sassc shc sip sqlite -suite-sparse szip tbb texinfo tig tmux -transfig tree -veclibfort vim w3m webp diff --git a/configs/.vimrc b/configs/.vimrc index a40b3d62983c..b8c20d732fcf 100644 --- a/configs/.vimrc +++ b/configs/.vimrc @@ -77,6 +77,10 @@ Plugin 'neomake/neomake' Plugin 'flazz/vim-colorschemes' +" Dash integration (macOS only) +Plugin 'rizzatti/dash.vim' + + call vundle#end() " required filetype plugin indent on " required " Put your non-Plugin stuff after this line @@ -101,6 +105,10 @@ let g:neomake_elixir_credo_maker = { \ } +" Alchemist settings +let g:alchemist#elixir_erlang_src = '/usr/local/share/src' + + " Airline Settings " Enables the list of buffers. let g:airline#extensions#tabline#enabled = 1 @@ -130,7 +138,6 @@ nmap <F8> :8b<CR> nmap <F9> :9b<CR> - " It's the twenty-first century...no swaps. set noswapfile @@ -186,6 +193,14 @@ vnoremap <C-/> gc let mapleader = " " +" Lookup Dash word under cursor in Dash +nnoremap <leader>j :Dash<CR> + + +" Save shortcut +nnoremap <C-s> :w<CR> + + " Switch to MRU'd buffer nnoremap <leader><leader> <C-^> @@ -309,6 +324,8 @@ set background=dark syntax enable colorscheme hybrid +set termguicolors + set history=1000 set undolevels=1000 diff --git a/configs/.zsh_profile b/configs/.zsh_profile index 72200b436491..ab7f2b423004 100644 --- a/configs/.zsh_profile +++ b/configs/.zsh_profile @@ -3,6 +3,11 @@ export PATH=$HOME/bin:/opt/local/bin:/opt/local/sbin:/usr/local/go/bin:/usr/loca # make vim the default editor for commit messages etc export EDITOR=$(which vim) + +# Adds a newline after the prompt to increase linespace for commands. +PS1="${PS1} + " + echo "Welcome back, $USER" # display the space available on each mounted Volume diff --git a/configs/tmux-256color-italic b/configs/tmux-256color-italic new file mode 100644 index 000000000000..f6f795e42377 --- /dev/null +++ b/configs/tmux-256color-italic @@ -0,0 +1,3 @@ +tmux-256color-italic|tmux with 256 colors and italic, + sitm=\ePtmux;\e\E[3m\e\\, ritm=\ePtmux;\e\E[23m\e\\, + use=screen-256color, diff --git a/functions/git_functions.sh b/functions/git_functions.sh index 6ed195a81253..02be2ff5fbae 100644 --- a/functions/git_functions.sh +++ b/functions/git_functions.sh @@ -60,7 +60,7 @@ function wgjira { # wgcheckout combined with a fuzzy search function wgfcheckout { - branchname=$(trim $(git branch | fzf)) + branchname=$(trim $(git branch | fzf-tmux)) [ ! -z "$branchname" ] && wgcheckout "$branchname" || return } diff --git a/functions/misc_functions.sh b/functions/misc_functions.sh index 5e36733f791b..31b421065a48 100644 --- a/functions/misc_functions.sh +++ b/functions/misc_functions.sh @@ -1,12 +1,12 @@ # fuzzily-find-file function wgff { - echo $(find . -type f | fzf) + echo $(find . -type f | fzf-tmux) } # fuzzily-find-branch function wgfb { - echo $(git branch -a | fzf) + echo $(git branch -a | fzf-tmux) } @@ -28,13 +28,13 @@ function wspcheck { # fuzzily search through dirs stack function wfd { - dir=$(dirname $(fzf)) && pushd "$dir" >/dev/null + dir=$(dirname $(fzf-tmux)) && pushd "$dir" >/dev/null } # pushd into a directory on your dirs stack function wpushd { - dir="$(dirs | tr ' ' '\n' | fzf)" && pushd "$dir" + dir="$(dirs | tr ' ' '\n' | fzf-tmux)" && pushd "$dir" } diff --git a/functions/vim_functions.sh b/functions/vim_functions.sh index 70aed74df9bd..561695d206a5 100644 --- a/functions/vim_functions.sh +++ b/functions/vim_functions.sh @@ -13,10 +13,10 @@ function vfzopen() { if [ ! -z "$exclude_dirs" ]; then filename=$(find . -type f -name "$filetype" | \ - xargs grep -l "$search_query" | fzf) + xargs grep -l "$search_query" | fzf-tmux) else filename=$(find . -type f -name "$filetype" -not -path "./${exclude_dir}/*" \ - | xargs grep -l "$search_query" | fzf) + | xargs grep -l "$search_query" | fzf-tmux) fi diff --git a/tmux-256color-italic.ti b/tmux-256color-italic.ti new file mode 100644 index 000000000000..e90737d85029 --- /dev/null +++ b/tmux-256color-italic.ti @@ -0,0 +1,29 @@ +# Reconstructed via infocmp from file: /Users/wpcarro/.terminfo/74/tmux-256color-italic +tmux-256color-italic|tmux with 256 colors and italic, + am, km, mir, msgr, xenl, + colors#256, cols#80, it#8, lines#24, ncv#3, pairs#32767, + acsc=++\,\,--..00``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, + bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, civis=\E[?25l, + clear=\E[H\E[J, cnorm=\E[34h\E[?25h, cr=^M, + csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H, + cud=\E[%p1%dB, cud1=^J, cuf=\E[%p1%dC, cuf1=\E[C, + cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\EM, + cvvis=\E[34l, dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, + dl1=\E[M, ed=\E[J, el=\E[K, el1=\E[1K, enacs=\E(B\E)0, + flash=\Eg, home=\E[H, ht=^I, hts=\EH, ich=\E[%p1%d@, + il=\E[%p1%dL, il1=\E[L, ind=^J, is2=\E)0, kbs=\177, kcbt=\E[Z, + kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, + kdch1=\E[3~, kend=\E[4~, kf1=\EOP, kf10=\E[21~, + kf11=\E[23~, kf12=\E[24~, kf2=\EOQ, kf3=\EOR, kf4=\EOS, + kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, + khome=\E[1~, kich1=\E[2~, kmous=\E[M, knp=\E[6~, kpp=\E[5~, + nel=\EE, op=\E[39;49m, rc=\E8, rev=\E[7m, ri=\EM, + ritm=\EPtmux;\E\E[23m\E\\, rmacs=^O, rmcup=\E[?1049l, + rmir=\E[4l, rmkx=\E[?1l\E>, rmso=\E[23m, rmul=\E[24m, + rs2=\Ec\E[?1000l\E[?25h, sc=\E7, + setab=\E[%?%p1%{8}%<%t4%p1%d%e%p1%{16}%<%t10%p1%{8}%-%d%e48;5;%p1%d%;m, + setaf=\E[%?%p1%{8}%<%t3%p1%d%e%p1%{16}%<%t9%p1%{8}%-%d%e38;5;%p1%d%;m, + sgr=\E[0%?%p6%t;1%;%?%p1%t;3%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;m%?%p9%t\016%e\017%;, + sgr0=\E[m\017, sitm=\EPtmux;\E\E[3m\E\\, smacs=^N, + smcup=\E[?1049h, smir=\E[4h, smkx=\E[?1h\E=, smso=\E[3m, + smul=\E[4m, tbc=\E[3g, |