From 499c012601404faa22e9e02b71d35fcd0c087154 Mon Sep 17 00:00:00 2001 From: Tobias Reisinger Date: Mon, 2 Jan 2023 21:08:50 +0100 Subject: [PATCH] Fix autostart, sourcing and shellcheck issues --- .bashrc | 2 +- .bin/autostart-manage | 3 +++ .config/bspwm/bspwmrc | 4 ---- .config/environment | 2 +- .shellcheckrc | 3 ++- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.bashrc b/.bashrc index 89b82e8..a6ab826 100644 --- a/.bashrc +++ b/.bashrc @@ -97,7 +97,7 @@ shopt -s checkwinsize source "$HOME/.config/environment" source "$HOME/.config/completionsrc" -[ -f "$HOME/.config/aliasrc" ] && source "$HOME/.config/aliasrc" +source "$HOME/.config/aliasrc" [ -x "$(command -v thefuck)" ] && eval "$(thefuck --alias)" [ -x "$(command -v starship)" ] && eval "$(starship init bash)" diff --git a/.bin/autostart-manage b/.bin/autostart-manage index 15d8a6f..d876dfb 100755 --- a/.bin/autostart-manage +++ b/.bin/autostart-manage @@ -81,6 +81,9 @@ _autostart_run_xorg () { xrdb "$HOME/.Xresources" + pgrep -x sxhkd > /dev/null || sxhkd & + pgrep -x xcompmgr > /dev/null || xcompmgr -cnfFn -D3 & + start-audio pipewire wait-for-service "network-online.target" diff --git a/.config/bspwm/bspwmrc b/.config/bspwm/bspwmrc index a92e79e..8062c34 100755 --- a/.config/bspwm/bspwmrc +++ b/.config/bspwm/bspwmrc @@ -2,10 +2,6 @@ . "$HOME/.config/environment" -pgrep -x sxhkd > /dev/null || sxhkd & -pgrep -x xcompmgr > /dev/null || xcompmgr -cnfFn -D3 & - - bspc config remove_disabled_monitors true bspc config remove_unplugged_monitors true diff --git a/.config/environment b/.config/environment index 63cd061..5939242 100644 --- a/.config/environment +++ b/.config/environment @@ -1,7 +1,7 @@ #!/bin/sh set -a -. "/etc/profile" +#. "/etc/profile" . "$HOME/.config/user-dirs.dirs" . "$XDG_CONFIG_HOME/locale.conf" set +a diff --git a/.shellcheckrc b/.shellcheckrc index 5104d2e..6531439 100644 --- a/.shellcheckrc +++ b/.shellcheckrc @@ -1 +1,2 @@ -disable=1091 +disable=SC1091 +disable=SC2016