merging main
This commit is contained in:
commit
f918767ec8
1 changed files with 5 additions and 13 deletions
18
bash/.bashrc
18
bash/.bashrc
|
@ -10,10 +10,8 @@
|
||||||
|
|
||||||
|
|
||||||
# Set some defaults.
|
# Set some defaults.
|
||||||
export EDITOR="emacsclient -t"
|
export EDITOR="nvim"
|
||||||
export VISUAL="emacsclient -c -a emacs"
|
export PATH=".:~/bin:~/.local/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin"
|
||||||
export ALTERNATE_EDITOR=""
|
|
||||||
export PATH=".:~/bin:~/.local/bin:~/.emacs.d/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin"
|
|
||||||
export LSCOLORS="ExGxBxDxCxEgEdxbxgxcxd"
|
export LSCOLORS="ExGxBxDxCxEgEdxbxgxcxd"
|
||||||
|
|
||||||
# XDG
|
# XDG
|
||||||
|
@ -202,12 +200,10 @@ alias nano='nano -ciw '
|
||||||
alias tm="tmux new-session -A -s main"
|
alias tm="tmux new-session -A -s main"
|
||||||
|
|
||||||
# always use nvim
|
# always use nvim
|
||||||
#alias vim='nvim'
|
alias vim='nvim'
|
||||||
#alias vi='nvim'
|
alias vi='nvim'
|
||||||
#alias nv='nvim'
|
alias nv='nvim'
|
||||||
|
|
||||||
# emacsclient
|
|
||||||
alias ec="emacsclient -n -c -a emacs"
|
|
||||||
|
|
||||||
if [[ HAS_GNOME ]]; then
|
if [[ HAS_GNOME ]]; then
|
||||||
alias nosleep="gnome-session-inhibit --inhibit idle sleep infinity"
|
alias nosleep="gnome-session-inhibit --inhibit idle sleep infinity"
|
||||||
|
@ -266,10 +262,6 @@ function mt {
|
||||||
mosh $1 -- tmux new-session -A -s main
|
mosh $1 -- tmux new-session -A -s main
|
||||||
}
|
}
|
||||||
|
|
||||||
# emacs client function
|
|
||||||
# function ec {
|
|
||||||
# emacsclient -c -a "emacs" $@ &
|
|
||||||
# }
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue