From d6c2d853e5f255bb015decaa45dfce6cb4ef94a6 Mon Sep 17 00:00:00 2001 From: Andrew Scott Date: Sun, 2 Apr 2023 02:36:17 -0400 Subject: [PATCH] Removed .profile, updated bash dotfiles --- dot_bash_logout | 4 ++++ dot_bash_profile | 9 --------- dot_profile.tmpl => dot_bash_profile.tmpl | 17 ++++++++++++++++- dot_bashrc | 18 ++++++++---------- 4 files changed, 28 insertions(+), 20 deletions(-) create mode 100644 dot_bash_logout delete mode 100644 dot_bash_profile rename dot_profile.tmpl => dot_bash_profile.tmpl (85%) diff --git a/dot_bash_logout b/dot_bash_logout new file mode 100644 index 0000000..252a7b7 --- /dev/null +++ b/dot_bash_logout @@ -0,0 +1,4 @@ +# +# ~/.bash_logout +# +clear_console diff --git a/dot_bash_profile b/dot_bash_profile deleted file mode 100644 index c7c22af..0000000 --- a/dot_bash_profile +++ /dev/null @@ -1,9 +0,0 @@ -# -# ~/.bash_profile -# -[[ -f ~/.profile ]] && . ~/.profile - -[[ -f ~/.bashrc ]] && . ~/.bashrc - -[[ -z "${DISPLAY}" && "${XDG_VTNR}" -eq 1 ]] && exec startx - diff --git a/dot_profile.tmpl b/dot_bash_profile.tmpl similarity index 85% rename from dot_profile.tmpl rename to dot_bash_profile.tmpl index d0b4ee3..4a9f63f 100644 --- a/dot_profile.tmpl +++ b/dot_bash_profile.tmpl @@ -1,7 +1,10 @@ # -# ~/.profile +# ~/.bash_profile # +export EDITOR=nvim +export VISUAL=emacs + # Ensure XDG env vars are set correctly export XDG_CACHE_HOME="$HOME/.cache" export XDG_CONFIG_HOME="$HOME/.config" @@ -14,6 +17,9 @@ export PATH="$HOME/.local/bin:$PATH" # make Java behave when not using a DE export _JAVA_AWT_WM_NONREPARENTING=1 +# Sometimes needed for gpg passphrase prompt +export GPG_TTY=$(tty) + # xsecurelock settings export XSECURELOCK_AUTH=auth_x11 export XSECURELOCK_AUTHPROTO=authproto_pam @@ -64,3 +70,12 @@ export WINEPREFIX="$XDG_DATA_HOME"/wine # Xorg export XINITRC="$XDG_CONFIG_HOME"/X11/xinitrc export XAUTHORITY="$XDG_RUNTIME_DIR"/Xauthority + +# Source other dotfiles +[[ -f ~/.profile ]] && . ~/.profile + +[[ -f ~/.bashrc ]] && . ~/.bashrc + +# startx +[[ -z "${DISPLAY}" && "${XDG_VTNR}" -eq 1 ]] && exec startx + diff --git a/dot_bashrc b/dot_bashrc index 85426bc..d0636c9 100644 --- a/dot_bashrc +++ b/dot_bashrc @@ -2,20 +2,18 @@ # ~/.bashrc # -# If not running interactively, don't do anything +# Return if non-interactive [[ $- != *i* ]] && return +PS1='[\e[38;5;107m\u\e[0m@\h \e[38;5;74m\w\e[0m]\$ ' + +alias diff='diff --color=auto' +alias grep='grep --color=auto' +alias ip='ip -color=auto' alias ls='ls --color=auto' -PS1='[\u@\h \W]\$ ' -export GPG_TTY=$(tty) -export EDITOR=nvim - -alias nv=nvim -alias r="urxvt -name Ranger -e ranger & disown" +alias vim=nvim +alias r="kitty --class=Ranger ranger & disown" alias kssh="/usr/bin/kitty +kitten ssh" alias wget=wget --hsts-file="$XDG_STATE_HOME/wget-hsts" -neofetch - -[ -f /opt/miniconda3/etc/profile.d/conda.sh ] && source /opt/miniconda3/etc/profile.d/conda.sh