Merge branch 'master' of https://github.com/dustinswan/dotfiles
This commit is contained in:
Dustin Swan
commit
dc650bde3d
7 changed files with 51 additions and 17 deletions
|
|
@ -7,6 +7,7 @@ ruby -e "$(curl -fsSL https://raw.github.com/Homebrew/homebrew/go/install)"
|
|||
brew update
|
||||
brew upgrade
|
||||
#brew tap homebrew/versions
|
||||
brew tap homebrew/dupes
|
||||
brew tap phinze/homebrew-cask
|
||||
|
||||
brew install coreutils
|
||||
|
|
@ -14,18 +15,23 @@ brew install findutils
|
|||
brew install aspell
|
||||
brew install git
|
||||
brew install tmux
|
||||
brew install vim --override-system-vi
|
||||
brew install wget --enable-iri
|
||||
brew install weechat --with-aspell --with-python --with-ruby
|
||||
brew install bash
|
||||
brew install fish
|
||||
brew install ack
|
||||
brew innstall openssl
|
||||
brew innstall openssh --with-brewed-openssl
|
||||
brew install ssh-copy-id
|
||||
brew install ffind
|
||||
brew install node
|
||||
brew install chruby
|
||||
brew install ruby-install
|
||||
# brew install chruby
|
||||
brew install python --with-brewed-openssl
|
||||
brew install vim --override-system-vi
|
||||
brew install msmtp
|
||||
brew install mutt
|
||||
brew install urlview
|
||||
brew install isync
|
||||
brew install mosh
|
||||
brew install haskell-platform
|
||||
|
|
@ -33,7 +39,7 @@ brew install brew-cask
|
|||
brew cask install rdio
|
||||
brew cask install alfred
|
||||
brew cask alfred link
|
||||
brew cask install amethyst
|
||||
brew cask install slate
|
||||
brew cask install google-chrome
|
||||
brew cask install charles
|
||||
brew cask install dropbox
|
||||
|
|
@ -54,8 +60,23 @@ brew cask install asepsis
|
|||
brew cask install keyremap4macbook
|
||||
brew cleanup
|
||||
|
||||
# Symlinks
|
||||
bash ~/dotfiles/symlinks.sh
|
||||
|
||||
# Python
|
||||
pip install --upgrade setuptools
|
||||
pip install --upgrade pip
|
||||
pip install git+git://github.com/Lokaltog/powerline
|
||||
|
||||
# Ruby TODO -- set up chruby, ruby-install some stuff
|
||||
# https://github.com/JeanMertz/chruby-fish
|
||||
ruby-install ruby 1.9
|
||||
ruby-install ruby 2.1
|
||||
chruby 1.9
|
||||
|
||||
# Gems TODO
|
||||
gem install earthquake
|
||||
|
||||
# Node packages TODO
|
||||
# Cabal packages TODO
|
||||
|
||||
|
|
@ -64,11 +85,10 @@ brew cleanup
|
|||
echo "/usr/local/bin/fish" | sudo tee -a /etc/shells
|
||||
chsh -s /usr/local/bin/fish dustinswan
|
||||
|
||||
# Symlinks
|
||||
bash ~/dotfiles/symlinks.sh
|
||||
|
||||
# Sane OS X defaults
|
||||
bash ~/dotfiles/osx
|
||||
|
||||
# Run some of these: Alfred, slate, asepsis, keyremap4macbook, etc.
|
||||
|
||||
# App Store
|
||||
echo "Install Xcode and Pixelmator from the App Store!"
|
||||
|
|
|
|||
|
|
@ -5,13 +5,16 @@ alias ta "tmux attach"
|
|||
alias dustinswan "mosh dustinswan@dustinswan.org"
|
||||
set -x EDITOR "vim"
|
||||
set -x TERM "screen-256color"
|
||||
# TODO fix this for linux
|
||||
set -x BROWSER "open"
|
||||
|
||||
# PATH
|
||||
set -x PATH /usr/local/bin /usr/local/sbin $PATH# Homebrew
|
||||
set -x PATH /usr/local/bin /usr/local/sbin $PATH # Homebrew
|
||||
set -x PATH $PATH $HOME/Library/Haskell/bin # Haskell
|
||||
set -x PATH $PATH $HOME/dotfiles/bin # Dotfiles bin
|
||||
set -x PATH $PATH /usr/local/share/npm/bin # npm
|
||||
set -x NODE_PATH $NODE_PATH /usr/local/lib/node
|
||||
set -x PYTHONPATH $PYTHONPATH /usr/local/lib/python2.7/site-packages
|
||||
|
||||
# IOCOM stuff
|
||||
set -x P4USER "dswan"
|
||||
|
|
@ -22,7 +25,9 @@ alias visidev "ssh root@visidev.iocom.com 'cd /; p4 sync'; scp /opt/iocom/user/w
|
|||
alias dswan "ssh root@dswan.insors.net"
|
||||
alias webdev 'ssh -t root@webdev.insors.net "cd /var/www/html; /bin/bash -i"'
|
||||
|
||||
# TODO chruby fish
|
||||
# chruby-fish: https://github.com/JeanMertz/chruby-fish
|
||||
. /usr/local/share/chruby/chruby.fish
|
||||
# source /usr/local/share/chruby/auto.fish # SERIOUSY BROKEN
|
||||
|
||||
# GPG
|
||||
~/dotfiles/bin/gpg-agent.sh
|
||||
|
|
|
|||
Binary file not shown.
BIN
fonts/Meslo+LG+S+Regular+for+Powerline.otf
Normal file
BIN
fonts/Meslo+LG+S+Regular+for+Powerline.otf
Normal file
Binary file not shown.
|
|
@ -1,9 +1,9 @@
|
|||
#!/bin/bash
|
||||
|
||||
rm ~/.ackrc; ln -s ~/dotfiles/ackrc ~/.ackrc
|
||||
mkdir -p ~/.config/fish; ln -s ~/dotfiles/config.fish ~/.config/fish/config.fish
|
||||
rm -rf ~/.config/fish; mkdir -p ~/.config/fish; ln -s ~/dotfiles/config.fish ~/.config/fish/config.fish
|
||||
rm ~/.gemrc; ln -s ~/dotfiles/gemrc ~/.gemrc
|
||||
mkdir ~/.ghc; rm ~/.ghc/ghci.conf; ln -s ~/dotfiles/ghci.conf ~/.ghc/ghci.conf
|
||||
rm -rf ~/.ghc; mkdir ~/.ghc; ln -s ~/dotfiles/ghci.conf ~/.ghc/ghci.conf
|
||||
rm ~/.gitconfig; ln -s ~/dotfiles/gitconfig ~/.gitconfig
|
||||
rm ~/.mbsyncrc; ln -s ~/dotfiles/mbsyncrc ~/.mbsyncrc
|
||||
rm ~/.msmtprc; ln -s ~/dotfiles/msmtprc ~/.msmtprc
|
||||
|
|
@ -11,3 +11,7 @@ rm ~/.ruby-version; ln -s ~/dotfiles/ruby-version ~/.ruby-version
|
|||
rm ~/.tmux.conf; ln -s ~/dotfiles/tmux.conf ~/.tmux.conf
|
||||
rm ~/.vimrc; ln -s ~/dotfiles/vimrc ~/.vimrc
|
||||
rm -rf ~/.vim; ln -s ~/dotfiles/vim ~/.vim
|
||||
|
||||
# TODO mac only
|
||||
rm ~/.slate.js; ln -s ~/dotfiles/slate.js ~/.slate.js
|
||||
rm ~/.urlview; ln -s ~/dotfiles/urlview.mac ~/.urlview
|
||||
|
|
|
|||
|
|
@ -41,6 +41,8 @@ set -g status-utf8 on
|
|||
source '/usr/local/lib/python2.7/site-packages/powerline/bindings/tmux/powerline.conf'
|
||||
# Linux
|
||||
source '/usr/share/tmux/powerline.conf'
|
||||
# Centos..
|
||||
source '/root/.local/lib/python2.6/site-packages/powerline/bindings/tmux/powerline.conf'
|
||||
|
||||
# Browse URLs
|
||||
bind-key u capture-pane \; save-buffer /tmp/tmux-buffer \; new-window -n "urlview" '$SHELL -c "urlview < /tmp/tmux-buffer"'
|
||||
|
|
|
|||
17
vimrc
17
vimrc
|
|
@ -54,11 +54,12 @@ Bundle 'bitc/vim-hdevtools'
|
|||
" Bundle 'Shougo/neocomplcache'
|
||||
Bundle 'airblade/vim-gitgutter'
|
||||
Bundle 'qstrahl/vim-matchmaker'
|
||||
Bundle 'bling/vim-airline'
|
||||
"Bundle 'bling/vim-airline'
|
||||
Bundle 'matze/vim-move'
|
||||
Bundle 'bruno-/vim-vertical-move'
|
||||
Bundle 'tpope/vim-vinegar'
|
||||
Bundle 'itchyny/calendar.vim'
|
||||
Bundle 'openurl.vim'
|
||||
|
||||
let $GIT_SSL_NO_VERIFY = 'true'
|
||||
|
||||
|
|
@ -156,13 +157,17 @@ endif
|
|||
" Powerline
|
||||
"set rtp+=/usr/local/lib/python2.7/site-packages/powerline/bindings/vim
|
||||
"set rtp+=/usr/lib/python2.7/site-packages/powerline/bindings/vim
|
||||
python from powerline.vim import setup as powerline_setup
|
||||
python powerline_setup()
|
||||
python del powerline_setup
|
||||
|
||||
|
||||
" Airline
|
||||
"let g:airline_left_sep=''
|
||||
"let g:airline_right_sep=''
|
||||
" let g:airline_theme='solarized'
|
||||
let g:airline_powerline_fonts=1
|
||||
let g:airline#extensions#tabline#enabled=1
|
||||
"let g:airline_powerline_fonts=1
|
||||
"let g:airline#extensions#tabline#enabled=1
|
||||
|
||||
" Colors
|
||||
set background=dark
|
||||
|
|
@ -233,10 +238,6 @@ nnoremap <leader>l :ls<cr>:b<space>
|
|||
"let g:ctrlp_max_files = 10000
|
||||
let g:ctrlp_clear_cache_on_exit = 0
|
||||
|
||||
" Workflowish stuff. Search for #todo
|
||||
nnoremap <silent><leader>T :vimgrep /\v^\s*\*+.*#todo.*/i %<cr>:copen<cr>:30wincmd _<cr>
|
||||
nnoremap <silent><leader>TT /\v^\s*\*+.*#todo.*/i<cr>
|
||||
|
||||
" Vimux stuff
|
||||
nnoremap <silent><leader><leader>vp :VimuxPromptCommand<cr>
|
||||
nnoremap <silent><leader><leader>vl :VimuxRunLastCommand<cr>
|
||||
|
|
@ -278,3 +279,5 @@ nnoremap <leader>hi :HdevtoolsInfo<cr>
|
|||
|
||||
" Vim-move
|
||||
let g:move_key_modifier = 'C'
|
||||
|
||||
nnoremap <leader>b :OpenUrl<cr>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue