polybar restructure

22 files changed, 55 insertions, 92 deletions

diff --git a/.config/polybar/forest/bars.ini b/.config/polybar/bars.ini
index 06b6eda..06b6eda 100644
--- a/.config/polybar/forest/bars.ini
+++ b/.config/polybar/bars.ini
diff --git a/.config/polybar/forest/colors.ini b/.config/polybar/colors.ini
index ee5ea30..ee5ea30 100644
--- a/.config/polybar/forest/colors.ini
+++ b/.config/polybar/colors.ini
diff --git a/.config/polybar/forest/config.ini b/.config/polybar/config.ini
index f5a2437..f5a2437 100644
--- a/.config/polybar/forest/config.ini
+++ b/.config/polybar/config.ini
diff --git a/.config/polybar/forest/launch.sh b/.config/polybar/forest/launch.sh
deleted file mode 100755
index 2c31c90..0000000
--- a/.config/polybar/forest/launch.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env bash
-
-# Add this script to your wm startup file.
-
-DIR="$HOME/.config/polybar/forest"
-
-# Terminate already running bar instances
-killall -q polybar
-
-# Wait until the processes have been shut down
-while pgrep -u $UID -x polybar >/dev/null; do sleep 1; done
-
-# Launch the bar
-polybar -q main -c "$DIR"/config.ini &
diff --git a/.config/polybar/launch.sh b/.config/polybar/launch.sh
index c2da5b7..68ca15b 100755
--- a/.config/polybar/launch.sh
+++ b/.config/polybar/launch.sh
@@ -1,81 +1,14 @@
 #!/usr/bin/env bash
 
-dir="$HOME/.config/polybar"
-themes=(`ls --hide="launch.sh" $dir`)
+# Add this script to your wm startup file.
 
-launch_bar() {
-	# Terminate already running bar instances
-	killall -q polybar
+DIR="$HOME/.config/polybar"
 
-	# Wait until the processes have been shut down
-	while pgrep -u $UID -x polybar >/dev/null; do sleep 1; done
+# Terminate already running bar instances
+killall -q polybar
 
-	# Launch the bar
-	if [[ "$style" == "hack" || "$style" == "cuts" ]]; then
-		polybar -q top -c "$dir/$style/config.ini" &
-		polybar -q bottom -c "$dir/$style/config.ini" &
-	elif [[ "$style" == "pwidgets" ]]; then
-		bash "$dir"/pwidgets/launch.sh --main
-	else
-		polybar -q main -c "$dir/$style/config.ini" &	
-	fi
-}
+# Wait until the processes have been shut down
+while pgrep -u $UID -x polybar >/dev/null; do sleep 1; done
 
-if [[ "$1" == "--material" ]]; then
-	style="material"
-	launch_bar
-
-elif [[ "$1" == "--shades" ]]; then
-	style="shades"
-	launch_bar
-
-elif [[ "$1" == "--hack" ]]; then
-	style="hack"
-	launch_bar
-
-elif [[ "$1" == "--docky" ]]; then
-	style="docky"
-	launch_bar
-
-elif [[ "$1" == "--cuts" ]]; then
-	style="cuts"
-	launch_bar
-
-elif [[ "$1" == "--shapes" ]]; then
-	style="shapes"
-	launch_bar
-
-elif [[ "$1" == "--grayblocks" ]]; then
-	style="grayblocks"
-	launch_bar
-
-elif [[ "$1" == "--blocks" ]]; then
-	style="blocks"
-	launch_bar
-
-elif [[ "$1" == "--colorblocks" ]]; then
-	style="colorblocks"
-	launch_bar
-
-elif [[ "$1" == "--forest" ]]; then
-	style="forest"
-	launch_bar
-
-elif [[ "$1" == "--pwidgets" ]]; then
-	style="pwidgets"
-	launch_bar
-
-elif [[ "$1" == "--panels" ]]; then
-	style="panels"
-	launch_bar
-
-else
-	cat <<- EOF
-	Usage : launch.sh --theme
-		
-	Available Themes :
-	--blocks    --colorblocks    --cuts      --docky
-	--forest    --grayblocks     --hack      --material
-	--panels    --pwidgets       --shades    --shapes
-	EOF
-fi
+# Launch the bar
+polybar -q main -c "$DIR"/config.ini &
diff --git a/.config/polybar/forest/modules.ini b/.config/polybar/modules.ini
index 6347b51..b286b08 100644
--- a/.config/polybar/forest/modules.ini
+++ b/.config/polybar/modules.ini
@@ -123,8 +123,8 @@ full-at = 99
 
 ; Use the following command to list batteries and adapters:
 ; $ ls -1 /sys/class/power_supply/
-battery = BAT0 
-adapter = AC 
+battery = macsmc-battery
+adapter =  macsmc-ac
 
 ; If an inotify event haven't been reported in this many
 ; seconds, manually poll for new values.
@@ -755,10 +755,54 @@ interface = eth0
 type = internal/network
 interface = wlp2s0
 
+[module/vpn]
+type = internal/network
+interface = wg0 
+; Seconds to sleep between updates
+; Default: 1
+interval = 1.0
+
+unknown-as-up = true
+; Available tags:
+;   <label-connected> (default)
+;   <ramp-signal>
+format-connected = <label-connected>
+format-connected-prefix = 
+format-connected-prefix-foreground = ${color.yellow}
+
+; Available tags:
+;   <label-disconnected> (default)
+format-disconnected = <label-disconnected>
+format-disconnected-prefix = 
+format-disconnected-prefix-foreground = ${color.orange}
+
+; Available tags:
+;   <label-connected> (default)
+;   <label-packetloss>
+;   <animation-packetloss>
+;;format-packetloss = <animation-packetloss> <label-connected>
+
+; Available tokens:
+;   %ifname%    [wireless+wired]
+;   %local_ip%  [wireless+wired]
+;   %local_ip6% [wireless+wired]
+;   %essid%     [wireless]
+;   %signal%    [wireless]
+;   %upspeed%   [wireless+wired]
+;   %downspeed% [wireless+wired]
+;   %linkspeed% [wired]
+; Default: %ifname% %local_ip%
+label-connected = "%{A1:networkmanager_dmenu &:} %essid% %{F#6C77BB}"
+
+; Available tokens:
+;   %ifname%    [wireless+wired]
+; Default: (none)
+label-disconnected = "%{A1:networkmanager_dmenu &:} Disconnected %{A}"
+
 ; Normal Module
 [module/network]
 type = internal/network
-interface = wlp2s0 
+interface = wlan0 
 
 ; Seconds to sleep between updates
 ; Default: 1
diff --git a/.config/polybar/forest/preview.ini b/.config/polybar/preview.ini
index bcd553f..bcd553f 100644
--- a/.config/polybar/forest/preview.ini
+++ b/.config/polybar/preview.ini
diff --git a/.config/polybar/forest/preview.sh b/.config/polybar/preview.sh
index 695d051..695d051 100755
--- a/.config/polybar/forest/preview.sh
+++ b/.config/polybar/preview.sh
diff --git a/.config/polybar/forest/scripts/checkupdates b/.config/polybar/scripts/checkupdates
index 4d8a5e8..4d8a5e8 100755
--- a/.config/polybar/forest/scripts/checkupdates
+++ b/.config/polybar/scripts/checkupdates
diff --git a/.config/polybar/forest/scripts/launcher.sh b/.config/polybar/scripts/launcher.sh
index 92a7c99..92a7c99 100755
--- a/.config/polybar/forest/scripts/launcher.sh
+++ b/.config/polybar/scripts/launcher.sh
diff --git a/.config/polybar/forest/scripts/powermenu.sh b/.config/polybar/scripts/powermenu.sh
index 271006d..271006d 100755
--- a/.config/polybar/forest/scripts/powermenu.sh
+++ b/.config/polybar/scripts/powermenu.sh
diff --git a/.config/polybar/forest/scripts/rofi/colors.rasi b/.config/polybar/scripts/rofi/colors.rasi
index 94eaebe..94eaebe 100644
--- a/.config/polybar/forest/scripts/rofi/colors.rasi
+++ b/.config/polybar/scripts/rofi/colors.rasi
diff --git a/.config/polybar/forest/scripts/rofi/confirm.rasi b/.config/polybar/scripts/rofi/confirm.rasi
index 0db4b79..0db4b79 100644
--- a/.config/polybar/forest/scripts/rofi/confirm.rasi
+++ b/.config/polybar/scripts/rofi/confirm.rasi
diff --git a/.config/polybar/forest/scripts/rofi/launcher.rasi b/.config/polybar/scripts/rofi/launcher.rasi
index 5a80370..5a80370 100644
--- a/.config/polybar/forest/scripts/rofi/launcher.rasi
+++ b/.config/polybar/scripts/rofi/launcher.rasi
diff --git a/.config/polybar/forest/scripts/rofi/message.rasi b/.config/polybar/scripts/rofi/message.rasi
index 4c7ef7f..4c7ef7f 100644
--- a/.config/polybar/forest/scripts/rofi/message.rasi
+++ b/.config/polybar/scripts/rofi/message.rasi
diff --git a/.config/polybar/forest/scripts/rofi/networkmenu.rasi b/.config/polybar/scripts/rofi/networkmenu.rasi
index 012e1ea..012e1ea 100644
--- a/.config/polybar/forest/scripts/rofi/networkmenu.rasi
+++ b/.config/polybar/scripts/rofi/networkmenu.rasi
diff --git a/.config/polybar/forest/scripts/rofi/powermenu.rasi b/.config/polybar/scripts/rofi/powermenu.rasi
index 4a63489..4a63489 100644
--- a/.config/polybar/forest/scripts/rofi/powermenu.rasi
+++ b/.config/polybar/scripts/rofi/powermenu.rasi
diff --git a/.config/polybar/forest/scripts/rofi/styles.rasi b/.config/polybar/scripts/rofi/styles.rasi
index 6b7bd30..6b7bd30 100644
--- a/.config/polybar/forest/scripts/rofi/styles.rasi
+++ b/.config/polybar/scripts/rofi/styles.rasi
diff --git a/.config/polybar/forest/scripts/style-switch.sh b/.config/polybar/scripts/style-switch.sh
index e0188f3..e0188f3 100755
--- a/.config/polybar/forest/scripts/style-switch.sh
+++ b/.config/polybar/scripts/style-switch.sh
diff --git a/.config/polybar/forest/scripts/styles.sh b/.config/polybar/scripts/styles.sh
index 35899a9..35899a9 100755
--- a/.config/polybar/forest/scripts/styles.sh
+++ b/.config/polybar/scripts/styles.sh
diff --git a/.config/polybar/forest/scripts/updates.sh b/.config/polybar/scripts/updates.sh
index 70edf26..70edf26 100755
--- a/.config/polybar/forest/scripts/updates.sh
+++ b/.config/polybar/scripts/updates.sh
diff --git a/.config/polybar/forest/user_modules.ini b/.config/polybar/user_modules.ini
index 5d6fa18..5d6fa18 100644
--- a/.config/polybar/forest/user_modules.ini
+++ b/.config/polybar/user_modules.ini