diff --git a/README.md b/README.md index cee1717..0a1defd 100644 --- a/README.md +++ b/README.md @@ -15,4 +15,5 @@ Linux-only tools: - luakit OS X-only tools: -- Amethyst +- Slate +- ... diff --git a/bootstrap-mac.sh b/bootstrap-mac.sh index e04f809..32dd3ee 100644 --- a/bootstrap-mac.sh +++ b/bootstrap-mac.sh @@ -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,19 +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 @@ -55,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 @@ -65,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!" diff --git a/config.fish b/config.fish index 0591c7e..994ce16 100644 --- a/config.fish +++ b/config.fish @@ -5,14 +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" @@ -23,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 diff --git a/fonts/Menlo Regular for Powerline.otf b/fonts/Meslo+LG+M+Regular+for+Powerline.otf similarity index 85% rename from fonts/Menlo Regular for Powerline.otf rename to fonts/Meslo+LG+M+Regular+for+Powerline.otf index a7cb478..c3f5f77 100644 Binary files a/fonts/Menlo Regular for Powerline.otf and b/fonts/Meslo+LG+M+Regular+for+Powerline.otf differ diff --git a/fonts/Meslo+LG+S+Regular+for+Powerline.otf b/fonts/Meslo+LG+S+Regular+for+Powerline.otf new file mode 100644 index 0000000..710d5b1 Binary files /dev/null and b/fonts/Meslo+LG+S+Regular+for+Powerline.otf differ diff --git a/symlinks.sh b/symlinks.sh index aa901f4..187279b 100644 --- a/symlinks.sh +++ b/symlinks.sh @@ -11,4 +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 diff --git a/tmux.conf b/tmux.conf index 127c4a7..1e7fcc2 100644 --- a/tmux.conf +++ b/tmux.conf @@ -45,6 +45,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"' diff --git a/vimrc b/vimrc index ce8a33f..3dfc4bf 100644 --- a/vimrc +++ b/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 @@ -275,26 +280,4 @@ nnoremap hi :HdevtoolsInfo " Vim-move let g:move_key_modifier = 'C' -" Open URLs -ruby << EOF - def open_uri - re = %r{(?i)\b((?:[a-z][\w-]+:(?:/{1,3}|[a-z0-9%])|www\d{0,3}[.]|[a-z0-9.\-]+[.][a-z]{2,4}/)(?:[^\s()<>]+|\(([^\s()<>]+|(\([^\s()<>]+\)))*\))+(?:\(([^\s()<>]+|(\([^\s()<>]+\)))*\)|[^\s`!()\[\]{};:'".,<>?«»“”‘’]))} - - line = VIM::Buffer.current.line - - if url = line[re] - system("open", url) - VIM::message(url) - else - VIM::message("No URI found in line.") - end - end -EOF - -if !exists("*OpenURI") - function! OpenURI() - :ruby open_uri - endfunction -endif - -nnoremap b :call OpenURI() +nnoremap b :OpenUrl