diff --git a/home/dot_bashrc b/home/dot_bashrc index 5db35d21..d20689f9 100644 --- a/home/dot_bashrc +++ b/home/dot_bashrc @@ -1,6 +1,12 @@ #!/usr/bin/env bash # shellcheck disable=SC1090,SC1091 +# If not running interactively, don't do anything +case $- in + *i*) ;; + *) return;; +esac + # Prefer US English export LANG="en_US" if [[ "$(hostname)" != *'-minimal' ]]; then diff --git a/home/dot_zshrc b/home/dot_zshrc index 17edc63a..f43bc65b 100644 --- a/home/dot_zshrc +++ b/home/dot_zshrc @@ -1,5 +1,11 @@ # shellcheck disable=SC1090,SC1091,SC2034,SC2154,SC2296 +# If not running interactively, don't do anything +case $- in + *i*) ;; + *) return;; +esac + ### Language / Fonts export LANG="en_US" export LC_ALL="en_US.UTF-8" diff --git a/home/private_dot_config/shell/aliases.sh.tmpl b/home/private_dot_config/shell/aliases.sh.tmpl index 17a1917d..b04a2acf 100644 --- a/home/private_dot_config/shell/aliases.sh.tmpl +++ b/home/private_dot_config/shell/aliases.sh.tmpl @@ -25,14 +25,11 @@ alias ip='ip --color=auto' alias pacman='pacman --color=auto' ### TOP - order based on preference of "top" application (last item will always be chosen if installed, e.g. glances) -command -v htop > /dev/null && alias top='htop' -command -v gotop > /dev/null && alias top='gotop -p $([ "$COLOR_SCHEME" = "light" ] && echo "-c default-dark")' -command -v ytop > /dev/null && alias top='ytop -p $([ "$COLOR_SCHEME" = "light" ] && echo "-c default-dark")' -command -v btm > /dev/null && alias top='btm $([ "$COLOR_SCHEME" = "light" ] && echo "--color default-light")' -# themes for light/dark color-schemes inside ~/.config/bashtop; Press ESC to open the menu and change the theme -command -v bashtop > /dev/null && alias top='bashtop' -command -v bpytop > /dev/null && alias top='bpytop' -command -v glances > /dev/null && alias top='glances' +if command -v glances > /dev/null; then + alias top='glances' +elif command -v htop > /dev/null; then + alias top='bashtop' +fi ### bat if command -v bat > /dev/null; then @@ -67,9 +64,11 @@ if command -v gping > /dev/null; then alias ping='gping' fi -alias xclip='xclip -selection c' -command -v vim > /dev/null && alias vi='vim' -command -v vim > /dev/null && alias v='vim' +### VIM +if command -v vim > /dev/null; then + alias vi='vim' + alias v='vim' +fi ### mitmproxy / mitmweb if command -v mitmproxy > /dev/null; then @@ -84,8 +83,14 @@ if command -v rg &> /dev/null; then alias rgrep='rg --color=auto' fi +### xclip +alias xclip='xclip -selection c' + ### VSCodium if command -v codium > /dev/null; then + if command -v code > /dev/null; then + alias vscode="$(which code)" + fi alias code='codium' fi diff --git a/home/private_dot_config/shell/exports.sh.tmpl b/home/private_dot_config/shell/exports.sh.tmpl index f57e941b..bd848a2d 100644 --- a/home/private_dot_config/shell/exports.sh.tmpl +++ b/home/private_dot_config/shell/exports.sh.tmpl @@ -111,6 +111,17 @@ export PATH="$PATH:$CARGO_HOME/bin" ### Bash export BASH_COMPLETION_USER_FILE="$XDG_CONFIG_HOME/bash-completion/bash_completion" +### Bash It +# Don't check mail when opening terminal. +unset MAILCHECK +export GIT_HOSTING='git@gitlab.com' +if command -v irssi > /dev/null; then + export IRC_CLIENT='irssi' +fi +# Set this to the command you use for todo.txt-cli TODO -- figure this out with Standard Notes / Lepton / or nb +export TODO="t" +export SCM_CHECK=true + ### BitWarden # https://bitwarden.com/help/cli/#using-an-api-key # BW_CLIENTID client_id @@ -310,11 +321,14 @@ export HISTCONTROL=ignoreboth export HISTSIZE=1000000000 export HISTFILESIZE=$HISTSIZE export HIST_STAMPS=mm/dd/yyyy -export SAVEHIST=5000 +export SAVEHIST=50000 ### Editor {{ if not .host.headless }} -if command -v code > /dev/null; then +if command -v codium > /dev/null; then + export EDITOR='codium --wait' + export VISUAL="$EDITOR" +elif command -v code > /dev/null; then export EDITOR='code --wait' export VISUAL="$EDITOR" else @@ -339,4 +353,4 @@ fi # export LIBGL_ALWAYS_INDIRECT="1" # export BROWSER='/mnt/c/Program\ Files\ \(x86\)/Google/Chrome/Application/chrome.exe' -export BROWSER=google-chrome +export BROWSER=librewolf diff --git a/software.yml b/software.yml index 59bd3a0c..9d5fd253 100644 --- a/software.yml +++ b/software.yml @@ -6496,6 +6496,19 @@ softwarePackages: cask: teamviewer choco: teamviewer yay: teamviewer + irssi: + _bin: irssi + _desc: Irssi is a modular text mode chat client. It comes with IRC support built in, and there are third party ICB, SILC, XMPP (Jabber), PSYC and Quassel protocol modules available. + _docs: https://irssi.org/documentation/ + _github: https://github.com/irssi/irssi + _home: https://irssi.org/ + _name: irssi + _type: cli + apt: irssi + brew: irssi + dnf: irssi + pacman: irssi + port: irssi teleport: _bin: teleport _desc: '[Teleport](https://goteleport.com/) is a free and open-source tool that allows engineers and security professionals to unify access for SSH servers, Kubernetes clusters, web applications, and databases across all environments. It is an identity-aware, multi-protocol access proxy which understands SSH, HTTPS, Kubernetes API, MySQL and PostgreSQL wire protocols.'