Browse Source

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

pull/1/head
10sr 12 years ago
parent
commit
80b2914a79
4 changed files with 19 additions and 7 deletions
  1. +3
    -3
      bashrc
  2. +11
    -2
      emacs.el
  3. +1
    -0
      setup.sh
  4. +4
    -2
      tmux.conf

+ 3
- 3
bashrc View File

@@ -39,7 +39,7 @@ then
else
export PAGER="less"
fi
export LESS="-iRMXF"
export LESS="-iRMX"

if null type vim
then
@@ -51,7 +51,7 @@ export LANG=ja_JP.UTF-8
export LC_MESSAGES=C
# export CDPATH=".:~"
export VISUAL="$EDITOR"
export GIT_PAGER="$PAGER"
export GIT_PAGER="less -F"
export GIT_EDITOR="$EDITOR"
echo "$TERM" | grep '^screen' >/dev/null 2>&1 || export TERM_ORIG=$TERM
test "$TERM" = screen && test "$TERM_ORIG" = xterm-256color && TERM=screen-256color
@@ -105,7 +105,7 @@ iswindows && alias grep="grep -n"
# alias ll="ls -l"
# alias la="ls -A"
# alias lla="ls -Al"
# alias less=""
alias less="less -F"
alias em="emacs -nw"
null type vim && alias vi=vim
alias pstree="LANG=C pstree"


+ 11
- 2
emacs.el View File

@@ -282,7 +282,7 @@ otherwise the path where the library installed."
(setq completion-ignore-case t
read-file-name-completion-ignore-case t
read-buffer-completion-ignore-case t)
(setq resize-mini-window t)
(setq resize-mini-windows t)
(temp-buffer-resize-mode 1)
(savehist-mode 1)

@@ -994,7 +994,16 @@ delete; o: select other; j, l: enlarge; h, k: shrink; q: quit."
(define-key term-raw-map
"\C-x" (lookup-key (current-global-map) "\C-x"))
(define-key term-raw-map
"\C-z" (lookup-key (current-global-map) "\C-z")))
"\C-z" (lookup-key (current-global-map) "\C-z"))
)
;; (define-key term-raw-map "\C-xl" 'term-line-mode)
;; (define-key term-mode-map "\C-xc" 'term-char-mode)
(define-key term-raw-map (kbd "<up>")
(lambda () (interactive) (scroll-down 1)))
(define-key term-raw-map (kbd "<down>")
(lambda () (interactive) (scroll-up 1)))
(define-key term-raw-map (kbd "<right>") 'scroll-up)
(define-key term-raw-map (kbd "<left>") 'scroll-down)
(define-key term-raw-map (kbd "C-p") 'term-send-raw)
(define-key term-raw-map (kbd "C-n") 'term-send-raw)
(define-key term-raw-map "q" 'my-term-quit-or-send-raw)


+ 1
- 0
setup.sh View File

@@ -71,6 +71,7 @@ git_config(){
# git config --global alias.ll "!git ls-files | xargs ls -l -CFG --color=auto --time-style=long-iso"
git config --global alias.addi "add -i"
git config --global alias.clean-p "!test -z \"\$(git status -s -uno)\""
# git config --global push.default "simple"
if _iswindows; then
git config --global core.fileMode false
fi


+ 4
- 2
tmux.conf View File

@@ -12,6 +12,7 @@ set -g default-command /bin/bash
#set -g default-terminal screen-256color
#set -g default-terminal screen-16color
set default-path "${HOME}" # not work as i expected
set -g set-titles on

#set -g status-left ""
#set -g status-right "#H | %a, %d %b %Y %T %z #(tmux -V)"
@@ -19,8 +20,6 @@ set -g status-right "${USER}@#H | #(tmux -V) "
set message-bg black
set message-fg yellow

set -g set-titles on

set -g status-bg green
set -g status-fg white
if "test `hostname` = arch-aspireone" \
@@ -34,3 +33,6 @@ if "test `hostname` = newkiwi" \
setw -g window-status-current-fg black
setw -g window-status-current-bg white
setw -g window-status-current-attr bold

set -g mode-bg white
set -g mode-fg black

Loading…
Cancel
Save