Skip to content

Commit

Permalink
Merge pull request #11 from AndrewJudson/ajudson/add_square_suggestions
Browse files Browse the repository at this point in the history
Added square suggested aliases
  • Loading branch information
AndrewJudson committed Jun 5, 2015
2 parents 48dd5ef + 9de832c commit dc44618
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 2 deletions.
6 changes: 6 additions & 0 deletions dotfiles/.emacs.d/init.el
Original file line number Diff line number Diff line change
Expand Up @@ -56,3 +56,9 @@
(global-set-key (kbd "\C-x\p") 'move-cursor-previous-pane)

;;set mouse once I can get it to default to rectangle mode.

;; set ido mode everythwere
(setq ido-enable-flex-matching t)
(setq ido-everywhere t)
(ido-mode 1)
(setq ido-create-new-buffer 'always)
2 changes: 1 addition & 1 deletion install.sh
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ cat other/.bashrc-master >> ~/.bashrc
# TODO: Make this more programatic (once there are more files)
cp other/.bash_aliases ~/.bash_aliases
cp other/.git-completion-patch.bash ~/.git-completion-patch.bash
cp -r dotfiles/git
cp -r dotfiles/git ~/.git
cp dotfiles/.tmux.conf ~/.tmux.conf
cp -r dotfiles/.emacs.d ~/.emacs.d
21 changes: 20 additions & 1 deletion other/.bash_aliases
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,34 @@ alias e='emacs -nw'
alias i='ipython'
alias t='tmux'
alias p='python'
alias c='cd'


# git
alias gb='git branch'
alias gsno='git show --name-only'
alias gri='git rebase -i'
alias gca='git commit -a --amend --no-edit'
alias gco='git checkout'
function gco {
if [[ $# == 0 ]]; then
git checkout master
else
git checkout "$@"
fi
}

# git aliases
git config --global alias.lg "log --color --graph \
--pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset \
%s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --"

#random aliases
alias pg="ps ax | grep -v grep | grep -i "
function profile {
$EDITOR ~/.bash_profile && source ~/.bash_profile
}
function aliases {
$EDITOR ~/.aliases && source ~/.aliases
}
alias df='df -h'
alias ducks='du -cksh * | sort -rn|head -11' # Lists folders and files sizes in the current folder

0 comments on commit dc44618

Please sign in to comment.