Merge branch 'master' of https://github.com/dustinswan/dotfiles
This commit is contained in:
commit
cfe5412767
4 changed files with 5 additions and 1 deletions
|
|
@ -50,6 +50,8 @@ brew cask install sketchup
|
||||||
#brew cask install vagrant
|
#brew cask install vagrant
|
||||||
#brew cask install bittorrent-sync
|
#brew cask install bittorrent-sync
|
||||||
#brew cask install truecrypt
|
#brew cask install truecrypt
|
||||||
|
brew cask install asepsis
|
||||||
|
brew cask install keyremap4macbook
|
||||||
brew cleanup
|
brew cleanup
|
||||||
|
|
||||||
# Ruby TODO -- set up chruby, ruby-install some stuff
|
# Ruby TODO -- set up chruby, ruby-install some stuff
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,7 @@
|
||||||
alias vi vim
|
alias vi vim
|
||||||
alias l "ls -la"
|
alias l "ls -la"
|
||||||
alias tmux "tmux -2"
|
alias tmux "tmux -2"
|
||||||
|
alias ta "tmux attach"
|
||||||
alias dustinswan "mosh dustinswan@dustinswan.org"
|
alias dustinswan "mosh dustinswan@dustinswan.org"
|
||||||
set -x EDITOR "vim"
|
set -x EDITOR "vim"
|
||||||
set -x TERM "screen-256color"
|
set -x TERM "screen-256color"
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
Subproject commit 2a494ff00fc10ed5725fbb99ec267ec2c9917817
|
Subproject commit f31aa52552ceb40240e56e475e6df89cc756507e
|
||||||
1
vimrc
1
vimrc
|
|
@ -58,6 +58,7 @@ Bundle 'bling/vim-airline'
|
||||||
Bundle 'matze/vim-move'
|
Bundle 'matze/vim-move'
|
||||||
Bundle 'bruno-/vim-vertical-move'
|
Bundle 'bruno-/vim-vertical-move'
|
||||||
Bundle 'tpope/vim-vinegar'
|
Bundle 'tpope/vim-vinegar'
|
||||||
|
Bundle 'itchyny/calendar.vim'
|
||||||
|
|
||||||
let $GIT_SSL_NO_VERIFY = 'true'
|
let $GIT_SSL_NO_VERIFY = 'true'
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue