Permalink
Browse files

tmux command leader change

And other misc config changes I haven't checked in yet.
  • Loading branch information...
redinger committed Apr 5, 2013
1 parent 7bb429e commit 5e023b363bb7d0c636cbd356bbcdf0901d929781
Showing with 39 additions and 18 deletions.
  1. +3 −1 .bash_aliases
  2. +4 −0 .bashrc
  3. +0 −1 .emacs.d/redinger/cosmetics.el
  4. +27 −4 .gitconfig
  5. +2 −2 .profile
  6. +2 −9 .sshconfig
  7. +1 −1 .tmux.conf
View
@@ -1,7 +1,9 @@
alias ls="ls -G"
alias emacs="open -a /Applications/Emacs.app/"
-alias e="/Applications/Emacs.app/Contents/MacOS/Emacs -nw"
+alias e="/Applications/Emacs.app/Contents/MacOS/bin/emacsclient -n"
+alias emacsclient=e
+alias eterm="/Applications/Emacs.app/Contents/MacOS/Emacs -nw"
alias ll="ls -lh"
alias la="ls -a"
View
@@ -92,3 +92,7 @@ export CC=/usr/bin/gcc
[[ -s $HOME/.tmuxinator/scripts/tmuxinator ]] && source $HOME/.tmuxinator/scripts/tmuxinator
PATH=$PATH:$HOME/.rvm/bin # Add RVM to PATH for scripting
+
+
+shopt -s histappend
+PROMPT_COMMAND='history -a'
@@ -89,4 +89,3 @@
(setq completion-ignore-case 1)
(setq show-trailing-whitespace t)
(set-default 'fill-column 80)
-
View
@@ -1,14 +1,24 @@
[user]
initials = cr
- name = Christopher Redinger
+ name = Chris Redinger
email = redinger@gmail.com
+[core]
+ excludesfile = $HOME/.gitignore
+ editor = "/Applications/Emacs.app/Contents/MacOS/bin/emacsclient -n"
+
[alias]
ci = commit
co = checkout
st = status
br = branch
di = diff
+ lp = log -p
lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%Creset' --abbrev-commit --date=relative
+ lol = log --graph --decorate --pretty=oneline --abbrev-commit
+ lola = log --graph --decorate --pretty=oneline --abbrev-commit --all
+ ls = ls-files
+ # show files ignored by git
+ ign = ls-files -o -i --exclude-standard
# show difference between the HEAD and the index
staged = diff --cached
@@ -29,6 +39,7 @@
diff = auto
interactive = auto
status = auto
+ ui = auto
[color "branch"]
current = yellow reverse
local = yellow
@@ -43,9 +54,6 @@
changed = green
untracked = cyan
-[core]
- excludesfile = $HOME/.gitignore
-
[github]
user = redinger
@@ -61,3 +69,18 @@
account = redinger
[credential]
helper = osxkeychain
+
+[url "git@github.com:"]
+ insteadOf = "gh:"
+ pushInsteadOf = "github:"
+ pushInsteadOf = "git://github.com/"
+[url "git://github.com/"]
+ insteadOf = "github:"
+[url "git@gist.github.com:"]
+ insteadOf = "gst:"
+ pushInsteadOf = "gist:"
+ pushInsteadOf = "git://gist.github.com/"
+[url "git://gist.github.com/"]
+ insteadOf = "gist:"
+[url "git@heroku.com:"]
+ insteadOf = "heroku:"
View
@@ -1,6 +1,6 @@
export PATH=/usr/local/bin:$PATH:$ETC_PATH/scripts:/usr/local/sbin:~/.cljr/bin:~/.lein/bin:~/bin:~/node_modules/.bin
-export EDITOR='/Applications/Emacs.app/Contents/MacOS/Emacs -nw'
-export GIT_EDITOR='/Applications/Emacs.app/Contents/MacOS/Emacs -nw'
+export EDITOR='/Applications/Emacs.app/Contents/MacOS/bin/emacsclient -n'
+export GIT_EDITOR='/Applications/Emacs.app/Contents/MacOS/bin/emacsclient -n'
export CDPATH=.:$HOME/src
export PAGER=less
View
@@ -1,5 +1,6 @@
Host agiledisciple.com
- User root
+ User redinger
+ Port 1701
Host heroku.redinger
HostName heroku.com
@@ -11,14 +12,6 @@ Host heroku.chris
IdentityFile ~/.ssh/identity
IdentitiesOnly yes
-Host stulb
- HostName 192.168.2.157
- User stu
-
-Host lbdell
- HostName 192.168.1.67
- User redinger
-
Host *
KeepAlive yes
controlmaster auto
View
@@ -6,7 +6,7 @@ bind C-d detach
bind C-e neww 'exec emacs -nw'
bind r source-file ~/.tmux.conf
-set -g prefix C-q
+set -g prefix `
unbind C-b
bind C-q send-prefix
bind-key S command-prompt -p ssh: "new-window -n %1 'ssh %1'"

0 comments on commit 5e023b3

Please sign in to comment.