diff --git a/private_dot_bashrc.tmpl b/private_dot_bashrc.tmpl index 0a2762f..2a84ea0 100755 --- a/private_dot_bashrc.tmpl +++ b/private_dot_bashrc.tmpl @@ -1,5 +1,4 @@ #!/usr/bin/env bash -# vim: set ft=bash : # don't put duplicate lines or those starting with spacein history export HISTCONTROL=ignorespace:ignoredups @@ -24,36 +23,18 @@ if [[ "$PATH" != *"$HOME/bin"* ]]; then fi bind 'set mark-symlinked-directories on' - export EDITOR='/usr/bin/env nvim' export VISUAL='/usr/bin/env nvim' if command -v fzf >/dev/null; then eval "$(fzf --bash)" >/dev/null else - printf "\33[90mfzf not installed; shell integration not available.\33[0m\n" + printf "%sfzf not installed; shell integration not available.%s\n" "\[\e[90m\]" "$reset" fi -export XDG_CONFIG_HOME="${XDG_CONFIG_HOME:-$HOME/.config}" function conf() { - test -s "$1" && source "$1" + fname="${XDG_CONFIG_HOME:-$HOME/.config}/$1" + test -f "$fname" && source "$fname" } -conf "$XDG_CONFIG_HOME/bash/cmds.bash" - -{{- if has "indeed" .class }} -# Setup INDEED_ENV_DIR earlier. -if [ -z "${INDEED_ENV_DIR}" ]; then - export INDEED_ENV_DIR="/home/rperce/env" -fi - -# Single-brace syntax because this is required in bash and sh alike -if [ -e "${INDEED_ENV_DIR}/etc/indeedrc" ]; then - . "${INDEED_ENV_DIR}/etc/indeedrc" -fi -# END env Setup -- Managed by Ansible DO NOT EDIT. - -conf "$HOME/.indeed-kube-profile" -conf "$HOME/.cargo/env" -export PATH="${KREW_ROOT:-$HOME/.krew}/bin:$PATH" -{{- end }} +conf bash/cmds.bash diff --git a/private_dot_config/private_alacritty/alacritty.toml b/private_dot_config/private_alacritty/alacritty.toml index d0d22d8..7a19552 100644 --- a/private_dot_config/private_alacritty/alacritty.toml +++ b/private_dot_config/private_alacritty/alacritty.toml @@ -1,6 +1,5 @@ [window] padding = { x = 4, y = 8 } -opacity = 0.95 [font] normal = { family = "Fantasque Sans Mono", style = "Regular" } diff --git a/private_dot_config/private_tmux/private_tmux.conf.tmpl b/private_dot_config/private_tmux/private_tmux.conf.tmpl index 4212108..227f1c7 100644 --- a/private_dot_config/private_tmux/private_tmux.conf.tmpl +++ b/private_dot_config/private_tmux/private_tmux.conf.tmpl @@ -20,10 +20,6 @@ bind r source-file ~/.config/tmux/tmux.conf set -g mouse on -set-window-option -g mode-keys vi -bind -Tcopy-mode-vi 'v' send -X begin-selection -bind -Tcopy-mode-vi 'y' send -X copy-selection-and-cancel - set -g status on set -g status-style bg=colour235,fg=brightblack set -g status-left-length 50