From 263aeed08f93230018963f57e9f41651c8f41b6c Mon Sep 17 00:00:00 2001 From: Mahesh Asolkar Date: Sun, 20 Apr 2025 10:22:13 -0700 Subject: [PATCH] Editor setup changes --- root.bashrc | 26 ++++++++++++-------------- user.bash_aliases | 19 ++++++++++--------- 2 files changed, 22 insertions(+), 23 deletions(-) diff --git a/root.bashrc b/root.bashrc index 35f6ca7..414e89a 100644 --- a/root.bashrc +++ b/root.bashrc @@ -3,14 +3,22 @@ # -------------------------------- # Shell RC # -------------------------------- -PS1='${debian_chroot:+($debian_chroot)}\[\033[01;41m\]$(hostname)\[\033[00m\]\[\033[01;34m\] \w\[\033[00m\] \$ ' +PS1='${debian_chroot:+($debian_chroot)}\[\033[01;41m\]$(hostnamectl hostname)\[\033[00m\]\[\033[01;34m\] \w\[\033[00m\] \$ ' # # Variables # -export EDITOR=n export PATH=~/bin:$PATH +# +# Editor setup +# +function n () { + /opt/neovim/nvim $* || nvim $* +} + +export EDITOR=n + # # Aliases # @@ -18,20 +26,10 @@ alias ls='ls -al --color' alias q=exit alias a=clear alias h=history -alias e=$EDITOR # # Functions # -function myvim () { - gvim $1 >& /dev/null & - disown %1 -} - -function n () { - /opt/neovim/nvim $* || nvim $* -} - function hgrep () { history | grep $1 } @@ -42,10 +40,10 @@ function pgrep () { function u2d () { ~mahesh/git/snips/get_neovim.sh - ~mahesh/git/snips/get_wezterm.sh + # ~mahesh/git/snips/get_wezterm.sh cd if [ -e /etc/arch-release ]; then - pacman -Syu + pacman --sync --refresh --sysupgrade --noconfirm elif [ -e /etc/debian_version ]; then apt update && apt full-upgrade -y && apt autoremove -y else diff --git a/user.bash_aliases b/user.bash_aliases index bac003d..327a1e8 100644 --- a/user.bash_aliases +++ b/user.bash_aliases @@ -17,9 +17,17 @@ PS1='${debian_chroot:+($debian_chroot)}\[\033[01;92m\]$(hostnamectl hostname)\[\ # # Variables # -#export EDITOR=vim -export EDITOR=nvim export PATH=~/bin:~/.local/bin:$PATH +export IGNOREEOF=50 # Ignore first 50 Ctrl-D on shell + +# +# Editor setup +# +function n () { + /opt/neovim/nvim $* || nvim $* +} + +export EDITOR=n # # Aliases @@ -28,18 +36,11 @@ alias ls='ls -altrh --color' alias q=exit alias a=clear alias h=history -alias e=$EDITOR -alias n=$EDITOR alias gn='neovide --fork' # # Functions # -function myvim () { - gvim $1 >& /dev/null & - disown %1 -} - function pyedit () { gedit $1 >& /dev/null & disown %1