diff --git a/tmux.conf b/tmux.conf index c0bd966..93dbe9a 100644 --- a/tmux.conf +++ b/tmux.conf @@ -30,11 +30,6 @@ set -g status on # Escape delay set -s escape-time 1 -# Open new windows in current directory -bind '"' split-window -c "#{pane_current_path}" -bind % split-window -h -c "#{pane_current_path}" -bind c new-window -c "#{pane_current_path}" - # Plugins set -g @plugin 'tmux-plugins/tpm' set -g @plugin 'tmux-plugins/tmux-sensible' @@ -45,30 +40,23 @@ set -g @plugin 'tmux-plugins/tmux-yank' set -g @plugin 'tmux-plugins/tmux-open' set -g @plugin 'tmux-plugins/tmux-pain-control' set -g @plugin 'jbnicolai/tmux-urlview' -# set -g @plugin 'tmux-plugins/tmux-battery' -# set -g @plugin 'tmux-plugins/tmux-maildir-counter' -# set -g @plugin 'seebi/tmux-colors-solarized' - -# set -g @maildir_counters '~/Mail/FastMail/INBOX/new|~/Mail/IOCOM/INBOX/new' +set -g @plugin 'christoomey/vim-tmux-navigator' -# set -g status-right '#{battery_icon} #{battery_percentage} | ✉ F:#{maildir_counter_1} I:#{maildir_counter_2} | %a %h-%d %H:%M ' -set -g status-right '' # '%a %h-%d %H:%M ' +set -g status-right '' set -g status-left '' # default statusbar colors -set-option -g status-bg default # '#222222' +set-option -g status-bg default set-option -g status-fg '#666666' set-option -g status-attr default # default window title colors set-window-option -g window-status-fg '#666666' set-window-option -g window-status-bg default -# set-window-option -g window-status-attr dim # active window title colors set-window-option -g window-status-current-fg white set-window-option -g window-status-current-bg default -#set-window-option -g window-status-current-attr bright set-window-option -g window-status-format ' #I #W' set-window-option -g window-status-current-format ' #I #W' @@ -77,8 +65,8 @@ set-window-option -g window-status-separator ' ' set-window-option -g base-index 1 # pane border -set-option -g pane-border-fg default -set-option -g pane-active-border-fg default +set-option -g pane-border-fg '#666666' +set-option -g pane-active-border-fg '#666666' # message text set-option -g message-bg black diff --git a/vimrc b/vimrc index 165d221..23650c2 100644 --- a/vimrc +++ b/vimrc @@ -2,86 +2,79 @@ set nocompatible call plug#begin('~/.vim/plugged') -Plug 'sheerun/vim-polyglot' -Plug 'terryma/vim-multiple-cursors' -Plug 'szw/vim-dict' -Plug 'burnettk/vim-angular' -Plug 'jQuery' -Plug 'tpope/vim-rails' +" Plug 'bling/vim-airline' +" Plug 'vim-airline/vim-airline-themes' Plug 'tpope/vim-repeat' Plug 'tpope/vim-surround' Plug 'tpope/vim-fugitive' Plug 'tpope/vim-endwise' Plug 'tpope/vim-vinegar' Plug 'tpope/vim-unimpaired' -Plug 'tpope/vim-characterize' +" Plug 'tpope/vim-characterize' Plug 'tpope/vim-speeddating' Plug 'tpope/vim-jdaddy' -Plug 'tpope/vim-eunuch' -"Plug 'tpope/vim-unimpared' -Plug 'mileszs/ack.vim' +" Plug 'w0rp/ale' " previously 'neomake/neomake, 'scrooloose/syntastic' +Plug 'SirVer/ultisnips' +Plug 'honza/vim-snippets' +Plug 'Shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins' } " previously YouCompleteMe +Plug 'carlitux/deoplete-ternjs', { 'do': 'npm install -g tern' } +Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --all' } +Plug 'junegunn/fzf.vim' +Plug 'christoomey/vim-tmux-navigator' +Plug 'terryma/vim-multiple-cursors' +Plug 'easymotion/vim-easymotion' Plug 'justinmk/vim-sneak' -Plug 'bkad/CamelCaseMotion' Plug 'majutsushi/tagbar' -Plug 'scrooloose/syntastic' Plug 'scrooloose/nerdcommenter' -"Plug 'w0ng/vim-hybrid' -"Plug 'sickill/vim-monokai' -Plug 'tomasr/molokai' -"Plug 'ervandew/supertab' -Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': 'yes \| ./install' } -Plug 'junegunn/fzf.vim' -Plug 'gregsexton/MatchTag' -"Plug 'kana/vim-smartinput' +Plug 'gregsexton/MatchTag' " highlight matching HTML tag Plug 'Raimondi/delimitMate' Plug 'rstacruz/sparkup', {'rtp': 'vim/'} Plug 'mbbill/undotree' Plug 'coderifous/textobj-word-column.vim' -Plug 'benmills/vimux' -Plug 'searchfold.vim' -Plug 'godlygeek/tabular' -Plug 'tommcdo/vim-lion' Plug 'kshenoy/vim-signature' -"Plug 'SirVer/ultisnips' -Plug 'honza/vim-snippets' -"Plug 'Valloric/YouCompleteMe', { 'do': './install.sh' } -Plug 'eagletmt/ghc-mod' -"Plug 'eagletmt/neco-ghc' -"Plug 'lukerandall/haskellmode-vim' -Plug 'bitc/vim-hdevtools' -Plug 'idris-hackers/idris-vim' -Plug 'qstrahl/vim-matchmaker' -" Plug 'bling/vim-airline' -Plug 'matze/vim-move' +Plug 'junegunn/vim-easy-align' +Plug 'qstrahl/vim-matchmaker' " highlight matching word under cursor Plug 'bruno-/vim-vertical-move' -Plug 'itchyny/calendar.vim' Plug 'lfilho/cosco.vim' Plug 'ntpeters/vim-better-whitespace' +Plug 'sbdchd/neoformat' Plug 'sdanielf/vim-stdtabs' -Plug 'airblade/vim-gitgutter' -Plug 'gcmt/wildfire.vim' -Plug 'lambdatoast/elm.vim' +Plug 'mhinz/vim-signify' " previously 'airblade/vim-gitgutter' +Plug 'terryma/vim-expand-region' " previously 'gcmt/wildfire.vim' +Plug 'tommcdo/vim-exchange' +Plug 'argtextobj.vim' +Plug 'matchit.zip' " % will match more things Plug 'AndrewRadev/splitjoin.vim' -Plug 'kien/rainbow_parentheses.vim' -Plug 'nathanaelkane/vim-indent-guides' +Plug 'utl.vim' Plug 'junegunn/goyo.vim' Plug 'EinfachToll/DidYouMean' Plug 'jceb/vim-orgmode' -Plug 'raichoo/purescript-vim' -Plug 'ctrlpvim/ctrlp.vim' + +" Languages & Syntax +Plug 'sheerun/vim-polyglot' +Plug 'idris-hackers/idris-vim' +Plug 'eagletmt/ghc-mod' +Plug 'bitc/vim-hdevtools' +"Plug 'eagletmt/neco-ghc' +"Plug 'lukerandall/haskellmode-vim' + +" Themes +"Plug 'w0ng/vim-hybrid' +"Plug 'sickill/vim-monokai' +Plug 'tomasr/molokai' call plug#end() " general goodness -set shell=/bin/bash " Syntastic breaks when trying to write to /var/folders +"set shell=/bin/bash " Syntastic breaks when trying to write to /var/folders syntax enable -let mapleader="," +let mapleader="\" +" let mapleader="," let maplocalleader="\\" set hidden " allow hidden unsaved buffers set history=1000 " longer history set noswapfile " turn off swapfiles set number " line numbers -" set relativenumber " TODO make a command to toggle this. n maybe.. set showcmd " show the command as it is typed set showmode set wildmenu @@ -100,15 +93,11 @@ set scrolloff=5 " Give us a few lines before and after the cursor set wrap set formatoptions=rqn1 set textwidth=80 -if version > 702 -"" set colorcolumn=80 -endif +" set colorcolumn=80 " persistent undo -if v:version > 703 - set undodir=~/.vim/undodir - set undofile -endif +set undodir=~/.vim/undodir +set undofile " indentation set autoindent @@ -123,10 +112,10 @@ set smartcase " if we include uppercase, it will be case sensitive set showmatch " matching brackets set matchtime=2 " blink brackets -" turn off highlighting -nnoremap :noh +" clear highlighting +nnoremap / :noh -" regex " thanks stevelosh +" regex set magic " tab stops @@ -137,21 +126,18 @@ set expandtab set smarttab " so we get html goodies in php files -au BufRead *.php set ft=php.html -au BufNewFile *.php set ft=php.html +"au BufRead *.php set ft=php.html +"au BufNewFile *.php set ft=php.html -set thesaurus+=~/.wordlists/mthesaur.txt +" set thesaurus+=~/.wordlists/mthesaur.txt set dictionary+=/usr/share/dict/words -" hide toolbar in macvim, etc +" hide toolbar, etc. if has("gui_running") set gfn=Terminus\ 8 set go=-t endif -" Git Gutter -let g:gitgutter_override_sign_column_highlight = 0 - " Colors " colorscheme monokai colorscheme molokai @@ -162,21 +148,6 @@ highlight LineNr ctermbg=NONE ctermfg=darkgrey " Tagbar nnoremap t :TagbarToggle -" disable tagbar in old Vim -if v:version < 703 - let g:loaded_tagbar=1 -endif - -" Syntastic -if v:version > 700 - let g:syntastic_enable_signs=1 - let g:syntastic_auto_loc_list=1 - let g:syntastic_html_tidy_ignore_errors=[" proprietary attribute \"ng-"] -else - let g:loaded_syntastic_plugin=1 -endif - -nnoremap S :SyntasticToggleMode " Supertab " let g:SuperTabDefaultCompletionType="context" @@ -189,19 +160,9 @@ let g:UltiSnipsJumpBackwardTrigger="" " open the current file for edit in Perforce nnoremap 4 :! p4 edit % -" open vsplit and switch to it +" open split and switch to it nnoremap v vl - -" Buffer selection -nnoremap l :ls:b - -" Vimux -nnoremap vp :VimuxPromptCommand -nnoremap vl :VimuxRunLastCommand -nnoremap vi :VimuxInspectRunner -nnoremap vq :VimuxCloseRunner -nnoremap vx :VimuxInterruptRunner -nnoremap vz :call VimuxZoomRunner() +nnoremap s sj " Haskellmode "let g:ghc = "/usr/bin/ghc" @@ -209,77 +170,82 @@ nnoremap vz :call VimuxZoomRunner() "let g:haddock_browser_callformat = "%s %s" " hdevtools -nnoremap ht :HdevtoolsType -nnoremap hc :HdevtoolsClear -nnoremap hi :HdevtoolsInfo - -autocmd BufEnter *.hs set formatprg=pointfree - -"let g:necoghc_enable_detailed_browse = 1 +" nnoremap ht :HdevtoolsType +" nnoremap hc :HdevtoolsClear +" nnoremap hi :HdevtoolsInfo +" autocmd BufEnter *.hs set formatprg=pointfree " automatically open and close the popup menu / preview window -au CursorMovedI,InsertLeave * if pumvisible() == 0|silent! pclose|endif -set completeopt=menu,preview,longest +" au CursorMovedI,InsertLeave * if pumvisible() == 0|silent! pclose|endif +" set completeopt=menu,preview,longest " Undotree nnoremap u :UndotreeToggle -" Move between splits -map l_ -map h_ - -" Vim-move -let g:move_key_modifier = 'C' - -" Matchmaker on +" Matchmaker let g:matchmaker_enable_startup = 1 -" Dict word under cursor -nnoremap d :Dict - " Cosco -autocmd FileType javascript,css nnoremap ,; :call cosco#commaOrSemiColon() -autocmd FileType javascript,css inoremap ,; :call cosco#commaOrSemiColon()"a +autocmd FileType javascript,css nmap ; (cosco-commaOrSemiColon) +autocmd FileType javascript,css imap ; (cosco-commaOrSemiColon) " Browser let g:netrw_browsex_viewer = "browser" -" Calendar -let g:calendar_google_calendar = 1 - -" Ack -"nnoremap a :Ack -" No wait, Ack motion! Thanks again sjl -nnoremap a :set opfunc=AckMotiong@ -xnoremap a :call AckMotion(visualmode()) - -function! s:CopyMotionForType(type) - if a:type ==# 'v' - silent execute "normal! `<" . a:type . "`>y" - elseif a:type ==# 'char' - silent execute "normal! `[v`]y" - endif -endfunction - -function! s:AckMotion(type) abort - let reg_save = @@ - - call s:CopyMotionForType(a:type) - - execute "normal! :Ack! --literal " . shellescape(@@) . "\" - - let @@ = reg_save -endfunction +" FZF +nnoremap a :Ag +nnoremap f :Files +nnoremap b :Buffers +nnoremap w :Windows +nnoremap c :Commands +nnoremap hf :History +nnoremap hc :History: +nnoremap hs :History/ +nnoremap l :BLines +nnoremap l :Lines +nnoremap t :BTags +nnoremap t :Tags +nnoremap gc :BCommits +nnoremap gc :Commits +nmap (fzf-maps-n) +xmap (fzf-maps-x) +omap (fzf-maps-o) +imap (fzf-complete-word) +imap (fzf-complete-path) +imap (fzf-complete-file-ag) +imap (fzf-complete-line) + +" Neoformat +" autocmd BufWritePre *.js Neoformat +" autocmd FileType javascript set formatprg=prettier\ --stdin + +" vim-easy-align +xmap ga (EasyAlign) +nmap ga (EasyAlign) + +" EasyMotion +let g:EasyMotion_smartcase = 1 + +" Deoplete +let g:deoplete#enable_at_startup = 1 +let g:deoplete#enable_smart_case = 1 + +" vim-tmux-navigator - needed due to a bug in MacOS terminfo +nnoremap :TmuxNavigateLeft + +" Tabs +nmap 1 1gt +nmap 2 2gt +nmap 3 3gt +nmap 4 4gt +nmap 5 5gt +nmap 6 6gt +nmap 7 7gt +nmap 8 8gt +nmap 9 9gt + +" Goyo +nmap g :Goyo " Airline -" let g:airline#extensions#tabline#enabled = 1 -" let g:airline_powerline_fonts = 1 - -" Powerline -" python from powerline.vim import setup as powerline_setup -" python powerline_setup() -" python del powerline_setup - -" FZF -nnoremap f :Files -nnoremap b :Buffers +let g:airline#extensions#tabline#enabled = 1 diff --git a/zshrc b/zshrc index f5cd4bf..597b360 100644 --- a/zshrc +++ b/zshrc @@ -17,6 +17,7 @@ bindkey -e alias l="ls -la" alias ta="tmux attach -d" alias e='emacsclient -a "" -t -nw' +alias emacs='emacs -q' # typing 'emacs' should not load any config alias weather='curl http://wttr.in' # nvim @@ -29,9 +30,6 @@ else export EDITOR=vim fi -# typing 'emacs' should not load any config -alias emacs='emacs -q' - # Mac only [ -x "$(command -v open)" ] && export BROWSER=open @@ -49,7 +47,6 @@ fi [ -e ~/dotfiles/bin ] && export PATH=$HOME/dotfiles/bin:$PATH [ -e ~/.local/bin ] && export PATH=$HOME/.local/bin:$PATH # Stack [ -e ~/.npm-packages/bin ] && export PATH=$HOME/.npm-packages/bin:$PATH # NPM -[ -e /usr/local/heroku/bin ] && export PATH=/usr/local/heroku/bin:$PATH # Heroku Toolbelt # Nix [ -f $HOME/.nix-profile/etc/profile.d/nix.sh ] && . $HOME/.nix-profile/etc/profile.d/nix.sh @@ -63,7 +60,7 @@ fi # Homebrew Github Token [ -x "$(command -v brew)" ] && alias brew='[[ $HOMEBREW_GITHUB_API_TOKEN ]] || export HOMEBREW_GITHUB_API_TOKEN=`gpg -d ~/.homebrew@github-password.gpg`; brew' [ -x "$(command -v carthage)" ] && alias carthage='[[ $HOMEBREW_GITHUB_API_TOKEN ]] || export HOMEBREW_GITHUB_API_TOKEN=`gpg -d ~/.homebrew@github-password.gpg`; carthage' -# + # FZF [ -f ~/.fzf.zsh ] && source ~/.fzf.zsh