diff --git a/.bash_profile b/.bash_profile index b72d4f8..78ce026 100644 --- a/.bash_profile +++ b/.bash_profile @@ -8,4 +8,6 @@ PATH=$PATH:~/scripts PATH=$PATH:~/.local/bin export PATH -xset r rate 200 70 +if [ -z "$DISPLAY" ] && [ "$XDG_VTNR" = 1 ]; then + exec startx +fi diff --git a/.bashrc b/.bashrc index 6a665ef..f53ec19 100644 --- a/.bashrc +++ b/.bashrc @@ -16,6 +16,15 @@ function mgrep() eval ${CMD%| } } +function ediff +{ + if [ -d $1 ]; then + emacsclient -q -eval "(ztree-diff \"$1\" \"$2\")" + else + emacsclient -q -eval "(ediff-files \"$1\" \"$2\")" + fi +} + function vterm_printf() { if [ -n "$TMUX" ] && ([ "${TERM%%-*}" = "tmux" ] || [ "${TERM%%-*}" = "screen" ]); then # Tell tmux to pass the escape sequences through diff --git a/.xinitrc b/.xinitrc index 7fc40db..17876af 100755 --- a/.xinitrc +++ b/.xinitrc @@ -32,6 +32,9 @@ if [ -d /etc/X11/xinit/xinitrc.d ] ; then unset f fi +# increase repeat rate +xset r rate 200 70 + #twm & #xclock -geometry 50x50-1+1 & #xterm -geometry 80x50+494+51 &