Merge branch 'master' of git.9iron.club:salt/home

This commit is contained in:
Salt 2020-08-25 14:00:19 -05:00
commit fe42daff81
2 changed files with 11 additions and 8 deletions

View File

@ -66,7 +66,7 @@ border-top-size = ${res/config.border-size}
tray-position = right tray-position = right
modules-left = i3 bspwm | date modules-left = i3 bspwm | date
modules-center = xwindow modules-center = xwindow
modules-right = backlight pulse | modules-right = backlight pulse battery |
#[bar/primary-2] #[bar/primary-2]
#monitor = ${env:PB_MONITOR:eDP-1} #monitor = ${env:PB_MONITOR:eDP-1}
@ -106,15 +106,18 @@ full-at = 100
time-format = %H:%M time-format = %H:%M
interval = 15 interval = 15
format-charging = <bar-capacity> format-charging = <label-charging>
format-charging-prefix = "Charging: " format-charging-prefix = "Charging: "
format-charging-prefix-foreground = ${res/colors.green} format-charging-prefix-foreground = ${res/colors.green}
format-discharging = <bar-capacity> format-discharging = <label-discharging>
format-discharging-prefix = "Battery: " format-discharging-prefix = "Battery: "
format-discharging-prefix-foreground = ${res/colors.green} format-discharging-prefix-foreground = ${res/colors.green}
format-full = <bar-capacity> format-full = <label-full>
format-full-prefix = "Battery: " format-full-prefix = "Battery: "
format-full-prefix-foreground = ${res/colors.green} format-full-prefix-foreground = ${res/colors.green}
label-charging = %percentage%%
label-discharging = %percentage%%
label-full = Full
bar-capacity-width = ${res/config.bar-width} bar-capacity-width = ${res/config.bar-width}
bar-capacity-fill = ${res/config.bar-fill} bar-capacity-fill = ${res/config.bar-fill}
bar-capacity-fill-foreground = ${res/colors.green} bar-capacity-fill-foreground = ${res/colors.green}

View File

@ -355,16 +355,16 @@ _ps1bash() {
fi fi
# Show read-only status in certain directories # Show read-only status in certain directories
if [ "$UID" = 0 ]; then if [ "$UID" = 0 ]; then
# Fuck you I'm root # Root gets the usual "#" prompt
prompt="${fg_red}#${r}" prompt="${fg_red}#${r}"
elif ! [ -d "$PWD" ]; then elif ! [ -d "$PWD" ]; then
# What the fuck happened to my directory # Something very bad has happened to our PWD, probably got deleted
prompt="${bg_red}${fg_black}!${r}" prompt="${bg_red}${fg_black}!${r}"
elif ! [ -r "$PWD" ]; then elif ! [ -r "$PWD" ]; then
# Can't read is worst case # Guess we lost privileges
prompt="${fg_red}"'$'"${r}" prompt="${fg_red}"'$'"${r}"
elif ! [ -x "$PWD" ]; then elif ! [ -x "$PWD" ]; then
# Can read it but can't search it is weird but also bad # Missing execution perms
if [ -w "$PWD" ]; then if [ -w "$PWD" ]; then
# Fixable # Fixable
prompt="${bg_blue}${fg_black}"'$'"${r}" prompt="${bg_blue}${fg_black}"'$'"${r}"