From 9de832cf590ad02e97e1b058b67e9905e6c4d556 Mon Sep 17 00:00:00 2001 From: Andrew Judson Date: Fri, 5 Jun 2015 12:02:21 -0700 Subject: [PATCH] Added square suggested aliases --- dotfiles/.emacs.d/init.el | 6 ++++++ install.sh | 2 +- other/.bash_aliases | 21 ++++++++++++++++++++- 3 files changed, 27 insertions(+), 2 deletions(-) mode change 100644 => 100755 install.sh diff --git a/dotfiles/.emacs.d/init.el b/dotfiles/.emacs.d/init.el index b1a86fe..ce710ea 100644 --- a/dotfiles/.emacs.d/init.el +++ b/dotfiles/.emacs.d/init.el @@ -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) diff --git a/install.sh b/install.sh old mode 100644 new mode 100755 index c37e326..6803eca --- a/install.sh +++ b/install.sh @@ -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 diff --git a/other/.bash_aliases b/other/.bash_aliases index a9e8f3b..abf1864 100644 --- a/other/.bash_aliases +++ b/other/.bash_aliases @@ -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