From 97da57d7dd8055d4ab147d4340dcd7da410624c2 Mon Sep 17 00:00:00 2001 From: pgfm Date: Tue, 15 Feb 2022 06:08:48 -0600 Subject: [PATCH] Minor fixes --- i3/config | 2 +- shell/bashrc | 13 ++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/i3/config b/i3/config index 4866865..d199df4 100644 --- a/i3/config +++ b/i3/config @@ -41,7 +41,7 @@ bindsym XF86AudioMicMute exec --no-startup-id pactl set-source-mute @DEFAULT_SOU floating_modifier $mod # start a terminal -bindsym $mod+Return exec primary-terminal +bindsym $mod+Return exec urxvt # kill focused window bindsym $mod+Shift+q kill diff --git a/shell/bashrc b/shell/bashrc index fce727f..c301acf 100644 --- a/shell/bashrc +++ b/shell/bashrc @@ -25,7 +25,6 @@ shopt -s histappend HISTSIZE=1000 HISTFILESIZE=2000 shopt -s checkwinsize -[ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)" if ! shopt -oq posix; then if [ -f /usr/share/bash-completion/bash_completion ]; then @@ -42,7 +41,7 @@ ps1_startup_file="$HOME/.startup/ps1" if [ -f "$ps1_startup_file" ]; then source $ps1_startup_file else - if logging_enabled; then + if $logging_enabled; then echo "[warn] Custom PS1 for bash missing at " \ "'$ps1_startup_file': " \ "see git@git.sr.ht:~eidolon/scripts" >> $log_file @@ -87,7 +86,7 @@ ssh_agent_startup_file="$HOME/.startup/start-ssh-agent" if [ -f "$ssh_agent_startup_file" ]; then source "$ssh_agent_startup_file" else - if logging_enabled; then + if $logging_enabled; then echo "[warn] SSH Agent startup code missing at " \ "'$ssh_agent_startup_file': " \ "see git@git.sr.ht:~eidolon/scripts" >> $log_file @@ -97,18 +96,18 @@ fi # ============================================================================= # Aliases # ============================================================================= -if [ `which exa` ]; then +if command -v exa > /dev/null 2>&1; then alias ls='exa' else - if logging_enabled; then + if $logging_enabled; then echo "[warn] exa is not setup! Using the system ls" >> $log_file fi fi -if [ `which nvim` ]; then +if command -v nvim > /dev/null 2>&1; then alias vim='nvim' else - if logging_enabled; then + if $logging_enabled; then echo "[warn] Neovim is not setup! Using the system vim" >> $log_file fi fi