diff options
| -rw-r--r-- | .bash_profile | 10 | ||||
| -rw-r--r-- | .bashrc | 7 | ||||
| -rwxr-xr-x | scripts/bookmarks | 2 |
3 files changed, 12 insertions, 7 deletions
diff --git a/.bash_profile b/.bash_profile index 7ffd304..3401696 100644 --- a/.bash_profile +++ b/.bash_profile @@ -3,10 +3,14 @@ # Set up the home environment profile. if [ -f ~/.profile ]; then source ~/.profile; fi +# Honor per-interactive-shell startup file +if [ -f ~/.bashrc ]; then source ~/.bashrc; fi + export SUDO="doas" export TERMINAL="foot" -export BROWSER="librewolf" +export WEB_BROWSER="librewolf" export EDITOR="kak" +export PAGER="less" export XDG_CURRENT_DESKTOP="sway" export XDG_CONFIG_HOME="$HOME/.config" export XDG_DATA_HOME="$HOME/.local/share" @@ -28,6 +32,4 @@ export MBSYNCRC="$XDG_CONFIG_HOME/mbsync/config" export MANPATH="$MANPATH:$XDG_DATA_HOME/man" export _JAVA_AWT_WM_NONREPARENTING="1" export PATH="$CARGO_HOME/bin:$HOME/.local/bin:$HOME/scripts:$PATH" - -# Honor per-interactive-shell startup file -if [ -f ~/.bashrc ]; then source ~/.bashrc; fi +export SDL_JOYSTICK_HIDAPI_GAMECUBE=0 # dolphin-emu gamecube adapter @@ -9,8 +9,8 @@ alias ll="ls -la" alias j="jobs" alias e="$EDITOR" alias ee="$SUDO $EDITOR" -alias nt="$BROWSER --new-tab" -alias nw="$BROWSER --new-window" +alias nt="$WEB_BROWSER --new-tab" +alias nw="$WEB_BROWSER --new-window" alias cp="cp -iv" alias mv="mv -iv" alias rm="rm -vI" @@ -29,8 +29,11 @@ alias make="make -j$(nproc)" # Export 'SHELL' to child processes. Programs such as 'screen' # honor it and otherwise use /bin/sh. export SHELL +export HISTFILE=$HOME/.bash_history export HISTSIZE=5000 +set -o noclobber + [ -f /etc/bash/bashrc ] && source /etc/bash/bashrc complete -F _command doas diff --git a/scripts/bookmarks b/scripts/bookmarks index bdff6bf..a6540b2 100755 --- a/scripts/bookmarks +++ b/scripts/bookmarks @@ -1,4 +1,4 @@ #!/bin/sh url=$(cat $MENULAUNCHER_DIR/bookmarks | fuzzel --dmenu -p "Bookmark: " | sed 's/^.*: //g') -[ ! -z "$url" ] && $BROWSER --new-tab $url +[ ! -z "$url" ] && $WEB_BROWSER --new-tab $url |