diff --git a/bashrc b/bashrc index f135476..afc58ba 100755 --- a/bashrc +++ b/bashrc @@ -49,7 +49,7 @@ export GIT_EDITOR="$EDITOR" null type stty && { stty stop undef # unbind C-s to stop displaying output - test -z "$TMUX" && stty erase '^h' + # test -z "$TMUX" && stty erase '^h' } if iswindows; then diff --git a/conkyrc.2 b/conkyrc.2 index 533239c..e1dfd0e 100644 --- a/conkyrc.2 +++ b/conkyrc.2 @@ -18,7 +18,7 @@ own_window_colour hotpink own_window_hints undecorated,below,skip_taskbar,sticky,skip_pager minimum_size 200 -#maximum_width 1000 +#maximum_width 2000 draw_shades no draw_outline no draw_borders no diff --git a/emacs.el b/emacs.el index b001bf9..d5fa6bb 100644 --- a/emacs.el +++ b/emacs.el @@ -1111,6 +1111,7 @@ return nil if LIB unfound and downloading failed, otherwise the path of LIB." ;; (define-key dired-mode-map "P" 'my-dired-do-pack-or-unpack) (define-key dired-mode-map "/" 'dired-isearch-filenames) (define-key dired-mode-map (kbd "DEL") 'dired-up-directory) + (define-key dired-mode-map (kbd "C-h") 'dired-up-directory) (substitute-key-definition 'dired-next-line 'my-dired-next-line dired-mode-map) (substitute-key-definition 'dired-previous-line 'my-dired-previous-line dired-mode-map) (define-key dired-mode-map (kbd "") 'my-dired-scroll-up) diff --git a/tmux.conf b/tmux.conf index d0091e4..28a3679 100644 --- a/tmux.conf +++ b/tmux.conf @@ -1,5 +1,8 @@ unbind C-b set -g prefix C-z bind-key C-z send-prefix + set -g default-command /bin/bash set -g default-terminal screen-256color +#set -g status-left "" +set -g status-right "#H | %a, %d %b %Y %T %z "