Skip to content

Commit

Permalink
Some updates to my dotfiles of various sorts...
Browse files Browse the repository at this point in the history
  • Loading branch information
Josh Adams committed Aug 7, 2014
1 parent 7bc2c17 commit d8b1474
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 16 deletions.
2 changes: 2 additions & 0 deletions bash/aliases
Original file line number Diff line number Diff line change
Expand Up @@ -64,3 +64,5 @@ alias synclient='synergyc -n chromebook 192.168.1.136'
alias erl='rlwrap -a erl' # give erl readline support
alias iex='rlwrap -a iex' # give iex readline support
alias servedir='ruby -run -e httpd . -p 9091' # serve current dir files on port 9091
alias starcraft='/opt/cxoffice/bin/cxrun --bottle=StarCraft_II_Heart_of_the_Swarm --command="/home/jadams/.cxoffice/StarCraft_II_Heart_of_the_Swarm/dosdevices/c:/Program Files/StarCraft II/StarCraft II.exe"'
alias subcountb='banner `subcount`|less'
8 changes: 8 additions & 0 deletions bash/bashrc
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,11 @@ export AUTOFEATURE=true
# Titanium Developer
export TIPATH=~/.titanium

export ANDROID_HOME=~/software/android/android-studio/sdk

export PATH=$PATH:$ANDROID_TOOLS
export PATH=$PATH:$ANDROID_HOME/platform-tools
export PATH=$PATH:~/software/gradle-1.12/bin

# check the window size after each command and, if necessary,
# update the values of LINES and COLUMNS.
Expand Down Expand Up @@ -99,4 +102,9 @@ export RUBYOPT="rubygems"

PATH=$PATH:$HOME/.rvm/bin # Add RVM to PATH for scripting

. ~/erlang/erlangs/17.0/activate

#xmodmap ~/.xmodmap-esc

### Added by the Heroku Toolbelt
export PATH="/usr/local/heroku/bin:$PATH"
2 changes: 1 addition & 1 deletion bin/subcount
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash

cd ~/elixir/dpd_active_subscriber_counter
mix run ./bin/get_subscribers_count_from_client
mix run ./bin/get_subscribers_count_from_client.exs
19 changes: 8 additions & 11 deletions synergy/synergy.conf
Original file line number Diff line number Diff line change
@@ -1,16 +1,13 @@
section: screens
aye-seven:
jibbajabba:
end

section: aliases
jibbajabba:
192.168.1.53
thunderpants:
192.168.1.72
aye-seven:
192.168.1.136
end

section: links
aye-seven:
right = jibbajabba
jibbajabba:
right = thunderpants
thunderpants:
left = aye-seven
end
end
4 changes: 2 additions & 2 deletions tmux/teamocil/uspto.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ session:
- name: "servers"
root: "~/projects/uspto/"
panes:
- cmd: "cd dir_search/solr; ./localsolr.sh run"
- cmd: "cd jboss-5.1.0.GA; ./bin/run.sh"
- cmd: "cd USPTO_solr; ./localsolr.sh run"
- cmd: "cd jboss-eap-6.1; ./bin/standalone.sh"
- name: "api"
root: "~/projects/uspto/USPTO_dir_api"
panes:
Expand Down
6 changes: 4 additions & 2 deletions vim/vimrc
Original file line number Diff line number Diff line change
Expand Up @@ -46,15 +46,17 @@ Bundle 'vim-ruby/vim-ruby'
Bundle 'vim-scripts/SyntaxRange'
Bundle 'walm/jshint.vim'
Bundle 'wavded/vim-stylus'
Bundle 'groenewege/vim-less'
Bundle 'rodjek/vim-puppet'
Bundle 'tpope/vim-vinegar'
Bundle 'rking/ag.vim'
Bundle 'zweifisch/pipe2eval'
Bundle 'leshill/vim-json'
Bundle 'mustache/vim-mustache-handlebars'

let g:airline_theme='luna'
let g:airline_powerline_fonts=1

let g:markdown_fenced_languages=['ruby', 'javascript', 'elixir', 'clojure', 'sh', 'html', 'sass', 'scss']
let g:markdown_fenced_languages=['ruby', 'javascript', 'elixir', 'clojure', 'sh', 'html', 'sass', 'scss', 'json']
Bundle 'tpope/vim-markdown'
Bundle 'jtratner/vim-flavored-markdown'

Expand Down

0 comments on commit d8b1474

Please sign in to comment.