diff --git a/dconf/.config/dconf/user b/dconf/.config/dconf/user index cce2c24f4..3de2751ed 100644 Binary files a/dconf/.config/dconf/user and b/dconf/.config/dconf/user differ diff --git a/flexiflow/.config/flexiflow/autostart.sh b/flexiflow/.config/flexiflow/autostart.sh index 175b32650..3f0c89780 100755 --- a/flexiflow/.config/flexiflow/autostart.sh +++ b/flexiflow/.config/flexiflow/autostart.sh @@ -12,7 +12,7 @@ #Created: # Mon 22 November 2021, 03:15:54 PM [GMT] #Modified: -# Sun 06 August 2023, 11:46:15 AM [GMT+1] +# Tue 15 August 2023, 07:29:53 PM [GMT+1] # #Description: # @@ -21,60 +21,78 @@ # # -if command -v /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 &>/dev/null; then - if ! pgrep -f "/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1" >/dev/null; then - /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 & +if command -v /usr/libexec/polkit-gnome-authentication-agent-1 &>/dev/null; then + if ! pgrep -f "/usr/libexec/polkit-gnome-authentication-agent-1" >/dev/null; then + /usr/libexec/polkit-gnome-authentication-agent-1 & else echo "polkit-gnome already Running" fi fi -if ! command -v feh &>/dev/null; then - echo "feh could not be found" +if command -v picom &>/dev/null; then + if ! pgrep -x "picom" >/dev/null; then + picom --config "$HOME"/.config/picom/picom.conf & + else + echo "picom already Running" + fi else + echo "picom could not be found" +fi + +#################### +## Fix Background ## +#################### +if command -v feh &>/dev/null; then if ! test -f "$HOME/.fehbg"; then echo "$HOME/.fehbg could not be found" else sh "$HOME/.fehbg" - sleep 2s - sh "$HOME/.fehbg" + ( + sleep 2s + sh "$HOME/.fehbg" + ) & fi -fi - -if ! command -v picom &>/dev/null; then - echo "picom could not be found" - exit else - if ! pgrep -x "picom" >/dev/null; then - picom --config $HOME/.config/repowm/picom.conf & - else - echo "picom already Running" - fi + echo "feh could not be found" fi -# ############### -# ## Auto Lock ## -# ############### +############### +## Auto Lock ## +############### if command -v xautolock &>/dev/null; then - # shellcheck disable=SC2155 - if ! pgrep -x "xautolock" >/dev/null; then - ( - sleep 2s - xautolock \ - -time 15 -locker "multimonitorlock -l -- --time-str=%I:%M:%S %p" \ - -detectsleep - ) & - else - echo "xautolock already Running" - fi + # shellcheck disable=SC2155 + if ! pgrep -x "xautolock" >/dev/null; then + ( + sleep 2s + xautolock \ + -time 15 -locker "multimonitorlock -l -- --time-str=%I:%M:%S %p" \ + -detectsleep + ) & + else + echo "xautolock already Running" + fi else - echo "xautolock could not be found" + echo "xautolock could not be found" fi -# ################ -# ## Other Junk ## -# ################ +if command -v xss-lock &>/dev/null; then + # shellcheck disable=SC2155 + if ! pgrep -x "xss-lock" >/dev/null; then + ( + sleep 2s + xss-lock -- multimonitorlock -l -- --time-str="%I:%M:%S %p" + ) & + else + echo "xss-lock already Running" + fi +else + echo "xss-lock could not be found" +fi + +################ +## Other Junk ## +################ systemctl --user import-environment DISPLAY XAUTHORITY @@ -82,9 +100,9 @@ if command -v dbus-update-activation-environment >/dev/null 2>&1; then dbus-update-activation-environment DISPLAY XAUTHORITY fi -# # see https://wiki.archlinux.org/title/GNOME/Keyring#xinitrc +# see https://wiki.archlinux.org/title/GNOME/Keyring#xinitrc eval "$(/usr/bin/gnome-keyring-daemon --start)" export SSH_AUTH_SOCK -# # see https://github.com/NixOS/nixpkgs/issues/14966#issuecomment-520083836 +# see https://github.com/NixOS/nixpkgs/issues/14966#issuecomment-520083836 mkdir -p "$HOME"/.local/share/keyrings diff --git a/flexiflow_bar/.local/bin/flexiflow_bar/bar_updates b/flexiflow_bar/.local/bin/flexiflow_bar/bar_updates index c307aa006..f11ca7b12 100755 --- a/flexiflow_bar/.local/bin/flexiflow_bar/bar_updates +++ b/flexiflow_bar/.local/bin/flexiflow_bar/bar_updates @@ -7,14 +7,14 @@ get_updates() { updates=$(yay -Pn) timestamp=$(date +%s) - icon=" " + icon="  " if [ -z "$updates" ]; then - updatecount="Fully Updated" + updatecount=" Fully Updated" elif [ "$updates" -ge "1" ]; then - updatecount="$updates Update" + updatecount=" $updates Update" else - updatecount="$updates Updates" + updatecount=" $updates Updates" fi [[ -f $configFile ]] && . $configFile if [ -z "$LastUsed" ] || [ -z "$Message" ]; then diff --git a/picom/.config/picom/picom.conf b/picom/.config/picom/picom.conf index c9df77de2..98c33201b 100644 --- a/picom/.config/picom/picom.conf +++ b/picom/.config/picom/picom.conf @@ -162,8 +162,8 @@ rounded-corners-exclude = [ "class_g = 'Pavucontrol'", "class_g = 'discord'", # Window Manager Stuff - "class_g = 'repowm'", - "class_g = 'repowmsystray'", + "class_g = 'flexiflow'", + "class_g = 'flexiflowsystray'", "class_g = 'scratchpad_terminal'", "class_g = 'Software Management - dnfdragora'", "QTILE_INTERNAL:32c = 1"