From 452e1be6ab22da5698c2014a2d07bd979823ffdf Mon Sep 17 00:00:00 2001
From: rxyhn <rayhankafipratama333@gmail.com>
Date: Thu, 10 Mar 2022 03:31:10 +0700
Subject: [PATCH] fix: some stuff

---
 config/awesome/signal/uptime.lua   | 31 +++++++++++++++---------------
 config/awesome/ui/notifs/popup.lua | 23 +++++++++++++---------
 2 files changed, 29 insertions(+), 25 deletions(-)

diff --git a/config/awesome/signal/uptime.lua b/config/awesome/signal/uptime.lua
index e685165..f8db4c7 100644
--- a/config/awesome/signal/uptime.lua
+++ b/config/awesome/signal/uptime.lua
@@ -6,24 +6,23 @@ local naughty = require("naughty")
 
 local uptime_script = [[
   sh -c "
-  cmd=$(uptime)
+    cmd=$(uptime)
 
-hr=$( echo $cmd | cut -d \":\" -f3 | awk '{print $NF}') 
-mt=$( echo $cmd | cut -d \":\" -f4 | cut -c1-2 )
-day=$(echo $cmd | grep day)
-
-if [ -z \"$day\" ]; then
-    hour=$(uptime -p | grep hour)
-  if [ -z \"$hour\" ]; then
-    uptime -p | awk '{print $2$3}' | cut -c1-3
-  else
-    echo \"${hr}h ${mt}m\"
-  fi
-else
-    day=$(echo $day | cut -d \" \" -f3)
-    echo \"${day}d ${hr}h ${mt}m\"
-fi
+    hr=$( echo $cmd | cut -d \":\" -f3 | awk '{print $NF}') 
+    mt=$( echo $cmd | cut -d \":\" -f4 | cut -c1-2 )
+    day=$(echo $cmd | grep day)
 
+    if [ -z \"$day\" ]; then
+      hour=$(uptime -p | grep hour)
+    if [ -z \"$hour\" ]; then
+      uptime -p | awk '{print $2$3}' | cut -c1-3
+    else
+      echo \"${hr}h ${mt}m\"
+    fi
+    else
+      day=$(echo $day | cut -d \" \" -f3)
+      echo \"${day}d ${hr}h ${mt}m\"
+    fi
   "]]
 
 local update_interval = 60
diff --git a/config/awesome/ui/notifs/popup.lua b/config/awesome/ui/notifs/popup.lua
index 56f8e3f..993042b 100644
--- a/config/awesome/ui/notifs/popup.lua
+++ b/config/awesome/ui/notifs/popup.lua
@@ -82,18 +82,23 @@ local function toggle_pop()
     end
 end
 
+local vol_first_time = true
 awesome.connect_signal("signal::volume", function(value, muted)
-    pop_icon.markup = ""
-    pop_bar.value = value
-
-    if muted then
-        pop_icon.markup = ""
-        pop_bar.color = beautiful.xcolor8
+    if vol_first_time then
+        vol_first_time = false
     else
-        pop_bar.color = beautiful.pop_vol_color
-    end
+        pop_icon.markup = ""
+        pop_bar.value = value
 
-    toggle_pop()
+        if muted then
+            pop_icon.markup = ""
+            pop_bar.color = beautiful.xcolor8
+        else
+            pop_bar.color = beautiful.pop_vol_color
+        end
+
+        toggle_pop()
+    end
 end)
 
 awesome.connect_signal("signal::brightness", function(value)