Browse Source

Merge branch 'master' of github.com:10sr/dotfiles

pull/1/head
10sr 11 years ago
parent
commit
6ad9d12cac
2 changed files with 23 additions and 13 deletions
  1. +22
    -10
      bashrc
  2. +1
    -3
      emacs.el

+ 22
- 10
bashrc View File

@@ -223,7 +223,7 @@ null type paco && alias pc="sudo \paco -D"
alias pycalc="python -i -c 'from math import *' "
null type python3 && alias py3=python3
null type python2 && alias py2=python2
alias _reloadrc="test -f ~/.bashrc && source ~/.bashrc"
alias _reloadrc="exec \"$SHELL\""
# alias mytime="date +%Y%m%d-%H%M%S"
alias sh="ENV=$HOME/.shrc PS1=\$\ PROMPT_COMMAND="" sh"
# type trash >/dev/null 2>&1 && alias rm=trash
@@ -478,18 +478,30 @@ input(){
echo $foo
}

tmux(){
# tmux(){
# if test $# -eq 0
# then
# (cd ~; command tmux start;)
# if command tmux has -t main
# then
# command tmux attach -t main
# else
# (cd ~; command tmux new -s main;)
# fi
# else
# command tmux "$@"
# fi
# }
tx(){
if test $# -eq 0
then
(cd ~; command tmux start;)
if command tmux has -t main
then
command tmux attach -t main
else
(cd ~; command tmux new -s main;)
fi
tmux ls
echo "tx <session> to attach."
elif tmux has -t "$1"
then
tmux attach -t "$1"
else
command tmux "$@"
tmux new -s "$1"
fi
}



+ 1
- 3
emacs.el View File

@@ -687,9 +687,7 @@ found, otherwise returns nil."
"https://raw.github.com/10sr/emacs-lisp/master/remember-major-modes-mode.el")
(require 'remember-major-modes-mode nil t)
(remember-major-modes-mode 1)
(add-hook 'after-change-major-mode-hook
'remember-major-modes-remember))

)

;; Detect file type from shebang and set major-mode.
(add-to-list 'interpreter-mode-alist


Loading…
Cancel
Save