Skip to content

Commit

Permalink
restore accidentally deleted ediff function from bashrc
Browse files Browse the repository at this point in the history
migrate increased repeat rate form bash_profile to xinitrc
add autostartx to bash_profile
  • Loading branch information
PalaceChan authored and PalaceChan committed Dec 10, 2024
1 parent 1c3c99f commit 320ad6f
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 1 deletion.
4 changes: 3 additions & 1 deletion .bash_profile
Original file line number Diff line number Diff line change
Expand Up @@ -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
9 changes: 9 additions & 0 deletions .bashrc
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions .xinitrc
Original file line number Diff line number Diff line change
Expand Up @@ -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 &
Expand Down

0 comments on commit 320ad6f

Please sign in to comment.