update

.config/bspwm/bspwmrc

@@ -1,7 +1,4 @@
-#! /bin/sh
-
-pgrep -x sxhkd > /dev/null || sxhkd &
-pgrep -x polybar > /dev/null || polybar &
+#!/bin/sh
 
 bspc monitor -d I II III IV V VI VII VIII IX X
 
@@ -13,3 +10,12 @@ bspc config borderless_monocle   true
 bspc config gapless_monocle      true
 
 xsetroot -solid "#000000"
+
+for i in /sys/class/hwmon/hwmon*/temp*_input; do 
+    if [ "$(<$(dirname $i)/name): $(cat ${i%_*}_label 2>/dev/null || echo $(basename ${i%_*}))" = "coretemp: Package id 0" ]; then
+        export HWMON_PATH="$i"
+    fi
+done
+
+pgrep -x sxhkd > /dev/null || sxhkd &
+pgrep -x polybar > /dev/null || polybar -r &

.config/polybar/config.ini

@@ -1,21 +1,3 @@
-;==========================================================
-;
-;
-;   ██████╗  ██████╗ ██╗  ██╗   ██╗██████╗  █████╗ ██████╗
-;   ██╔══██╗██╔═══██╗██║  ╚██╗ ██╔╝██╔══██╗██╔══██╗██╔══██╗
-;   ██████╔╝██║   ██║██║   ╚████╔╝ ██████╔╝███████║██████╔╝
-;   ██╔═══╝ ██║   ██║██║    ╚██╔╝  ██╔══██╗██╔══██║██╔══██╗
-;   ██║     ╚██████╔╝███████╗██║   ██████╔╝██║  ██║██║  ██║
-;   ╚═╝      ╚═════╝ ╚══════╝╚═╝   ╚═════╝ ╚═╝  ╚═╝╚═╝  ╚═╝
-;
-;
-;   To learn more about how to configure Polybar
-;   go to https://github.com/polybar/polybar
-;
-;   The README contains a lot of information
-;
-;==========================================================
-
 [colors]
 background = #282A2E
 background-alt = #373B41
@@ -25,48 +7,30 @@ secondary = #8ABEB7
 alert = #A54242
 disabled = #707880
 
-[bar/example]
-width = 100%
-height = 16pt
-radius = 0
+[settings]
+screenchange-reload = true
+pseudo-transparency = true
 
-; dpi = 96
+[bar/main]
+height = 16pt
+line-size = 1pt
+font-0 = monospace;2
 
 background = ${colors.background}
 foreground = ${colors.foreground}
 
-line-size = 3pt
-
-border-size = 0pt
-border-color = #00000000
-
-padding-left = 0
-padding-right = 0
-
-module-margin = 0
-
 separator = |
 separator-foreground = ${colors.disabled}
 
-font-0 = monospace;2
-
-modules-left = xworkspaces xwindow
-modules-right = filesystem network memory cpu temperature pulseaudio xkeyboard date
-
 cursor-click = pointer
 cursor-scroll = ns-resize
 
-enable-ipc = true
-
-; tray-position = right
-
-; wm-restack = generic
+tray-position = right
 wm-restack = bspwm
-; wm-restack = i3
-
-; override-redirect = true
+enable-ipc = true
 
-tray-position = right
+modules-left = xworkspaces xwindow
+modules-right = network filesystem memory cpu temperature pulseaudio xkeyboard date
 
 [module/xworkspaces]
 type = internal/xworkspaces
@@ -91,82 +55,88 @@ label-empty-padding = 1
 type = internal/xwindow
 label = %title:0:60:...%
 
+[module/network]
+type = internal/network
+interface-type = wired
+
+label-connected = %{F#F0C674}%local_ip%%{F-} %netspeed%
+
+label-disconnected = %ifname% disconnected
+label-disconnected-foreground = ${colors.disabled}
+
 [module/filesystem]
 type = internal/fs
-interval = 25
+spacing = 1
+warn-percentage = 95
 
 mount-0 = /
 mount-1 = /media
 
 label-mounted = %{F#F0C674}%mountpoint%%{F-} %percentage_used%%
 
-label-unmounted = %mountpoint% not mounted
-label-unmounted-foreground = ${colors.disabled}
+label-warn = %mountpoint% %percentage_used%%
+label-warn-foreground = ${colors.alert}
+format-warn = <label-warn>
+
+[module/memory]
+type = internal/memory
+warn-percentage = 95
+
+format-prefix = "MEM "
+format-prefix-foreground = ${colors.primary}
+
+label-warn = MEM %percentage_used%%
+label-warn-foreground = ${colors.alert}
+format-warn = <label-warn>
+
+[module/cpu]
+type = internal/cpu
+warn-percentage = 95
+
+format-prefix = "CPU "
+format-prefix-foreground = ${colors.primary}
+
+label-warn = CPU %percentage%%
+label-warn-foreground = ${colors.alert}
+format-warn = <label-warn>
+
+[module/temperature]
+type = internal/temperature
+hwmon-path = ${env:HWMON_PATH}
+warn-temperature = 85
+
+format-prefix = "TEMP "
+format-prefix-foreground = ${colors.primary}
+
+label-warn = TEMP %temperature-c%
+label-warn-foreground = ${colors.alert}
 
 [module/pulseaudio]
 type = internal/pulseaudio
+use-ui-max = false
 
 format-volume-prefix = "VOL "
 format-volume-prefix-foreground = ${colors.primary}
-format-volume = <label-volume>
 
 label-volume = %percentage%%
+format-volume = <label-volume>
 
 label-muted = muted
 label-muted-foreground = ${colors.disabled}
 
 [module/xkeyboard]
 type = internal/xkeyboard
-blacklist-0 = num lock
 
-label-layout = %layout%
 label-layout-foreground = ${colors.primary}
 
-label-indicator-padding = 2
-label-indicator-margin = 1
-label-indicator-foreground = ${colors.background}
-label-indicator-background = ${colors.secondary}
-
-[module/memory]
-type = internal/memory
-interval = 2
-format-prefix = "RAM "
-format-prefix-foreground = ${colors.primary}
-label = %percentage_used:2%%
-
-[module/cpu]
-type = internal/cpu
-interval = 2
-format-prefix = "CPU "
-format-prefix-foreground = ${colors.primary}
-label = %percentage:2%%
-
-[module/temperature]
-type = internal/temperature
-thermal-zone = 1
-format-prefix = "TEMP "
-format-prefix-foreground = ${colors.primary}
-
-[module/network]
-type = internal/network
-interface-type = wired
-format-connected = <label-connected>
-format-disconnected = <label-disconnected>
-label-connected = %{F#F0C674}%local_ip%%{F-} %netspeed%
-label-disconnected = %{F#F0C674}%ifname%%{F#707880} disconnected
-
 [module/date]
 type = internal/date
-interval = 1
 
-date = %H:%M
-date-alt = %Y-%m-%d %H:%M:%S
+date = %d/%m/%Y
+time = %H:%M
 
-label = %date%
-label-foreground = ${colors.primary}
+date-alt = %A, %d %B %Y
+time-alt = %H:%M:%S
 
-[settings]
-screenchange-reload = true
-pseudo-transparency = true
-
-; vim:ft=dosini
+label = %date% %time%
+label-foreground = ${colors.primary}

.scripts/arch/alhp-install

@@ -18,7 +18,6 @@ fi
 
 echo "Supported architecture: $ARCH"
 
-pkgs sync
 pkgs install alhp-keyring alhp-mirrorlist
 
 PACMAN_CONF="/etc/pacman.conf"
@@ -28,5 +27,6 @@ grep -qxF "[core-$ARCH]" "$PACMAN_CONF" || sudo sed -i "/^[^#]*\[core\]/i [core-
 grep -qxF "[extra-$ARCH]" "$PACMAN_CONF" || sudo sed -i "/^[^#]*\[extra\]/i [extra-$ARCH]\nInclude = $ALHP_MIRRORLIST\n" "$PACMAN_CONF"
 grep -qxF "[multilib-$ARCH]" "$PACMAN_CONF" || sudo sed -i "/^[^#]*\[multilib\]/i [multilib-$ARCH]\nInclude = $ALHP_MIRRORLIST\n" "$PACMAN_CONF"
 
-sudo pacman -Suy --noconfirm
+pkgs upgrade
+
 echo "alhp-install done."

.scripts/arch/archlinuxcn-install

@@ -2,6 +2,8 @@
 
 PACMAN_CONF="/etc/pacman.conf"
 grep -qxF "[archlinuxcn]" "$PACMAN_CONF" || sudo sed -i '$a\\n[archlinuxcn]\nServer = https://repo.archlinuxcn.org/$arch' $PACMAN_CONF
-sudo pacman -Sy --noconfirm --needed archlinuxcn-keyring
+
+pkgs update
+pkgs install archlinuxcn-keyring
 
 echo "archlinuxcn-install done."

.scripts/arch/base-setup

@@ -8,14 +8,17 @@ fzf lf \
 
 PREFERED_SHELL="/usr/bin/zsh"
 
-pkgs sync
 pkgs install "$PACKAGES"
 
 if [ "$SHELL" != "$PREFERED_SHELL" ] && [ -f "$PREFERED_SHELL" ]; then
   echo "Changing current shell $SHELL to $PREFERED_SHELL" 
   chsh -s "$PREFERED_SHELL"
 fi
 
+if [ -f "/boot/loader/loader.conf" ]; then
+  sudo sed -i "s/^timeout.*/timeout 0/" /boot/loader/loader.conf
+fi
+
 # mitigations off
 echo "Setting mitigations off"
 boot-options set mitigations off

.scripts/arch/chaotic-aur-install

@@ -6,6 +6,7 @@ sudo pacman -U --noconfirm --needed 'https://cdn-mirror.chaotic.cx/chaotic-aur/c
 
 PACMAN_CONF="/etc/pacman.conf"
 grep -qxF "[chaotic-aur]" "$PACMAN_CONF" || sudo sed -i '$a\\n[chaotic-aur]\nInclude = /etc/pacman.d/chaotic-mirrorlist' $PACMAN_CONF
-sudo pacman -Sy
+
+pkgs update
 
 echo "chaotic-aur-install done."

.scripts/arch/desktop-setup

@@ -20,7 +20,6 @@ FLATPAK_PACKAGES=" \
 discord \
 "
 
-pkgs sync
 pkgs install "$PACKAGES"
 
 flatpak install "$FLATPAK_PACKAGES"

.scripts/arch/full-setup

@@ -1,12 +1,8 @@
 #!/bin/sh -e
 
-repos-install
-
+repos-setup
 base-setup
 desktop-setup
-
-extra-install all
-cups-install
-obs-install
+meta-install all
 
 echo "full-setup done."