update

12 files changed, 80 insertions, 194 deletions

diff --git a/.config/waybar/config b/.config/waybar/config
index 6ab4771..96c66c5 100644
--- a/.config/waybar/config
+++ b/.config/waybar/config
@@ -5,7 +5,7 @@
     "reload_style_on_change": true,
     "modules-left": ["hyprland/workspaces", "hyprland/window"],
     "modules-center": [],
-    "modules-right": ["network", "custom/weather","memory", "pulseaudio","wireplumber", "clock","tray"],
+    "modules-right": ["custom/memory","custom/doppler","custom/forecast","custom/nettraf","custom/microphone","custom/volume","custom/clock","custom/internet"],
     
     "hyprland/window": {
         "format": "{}",
@@ -18,105 +18,85 @@
         "all-outputs": true,
         "on-click": "activate",
         "format": "{name}",
-	      "format-icons": {
-		        "1": "",
-		        "2": "",
-		        "3": "",
-		        "4": "",
-		        "5": "",
-		        "default": ""
-	      },
     },
-    "network": {
-        "interface": "wg0",
-        "tooltip": false,
-        "format": "VPN",
-        "format-disconnected": "VPN",
-        "on-click": "~/.config/waybar/scripts/vpn-toggle",
-    },
-    "tray": {
-        "spacing": 10
-    },
-    "clock": {
-	      "interval": 60,
-	      "format": "{:%Y %b %d (%a) 🕙 %H:%M}",
-        "tooltip-format": "{:%a %d %b}"
-    },
-    "mpris": {
-        "tooltip": false,
-	      "format": "{player_icon} {artist} - {title}",
-	      "format-paused": "{status_icon} <b>{artist} - {title}</b>",
-	      "player-icons": {
-		    "default": "▶",
-        "spotify_player": "",
-	  },
-	      "status-icons": {
-		       "paused": "󰏤",
-           "stopped": "",
-	      },
-	      "ignored-players": ["firefox"]
-    },
-    "cpu": {
-        "interval": 10,
-	      "format": " {usage}%",       
-	      "tooltip": false,
-	      "spacing": 0
-    },
-    "memory": {
-        "tooltip": false,
-        "format": " {used:0.01f}Gb",
-	      "interval": 10,
-    },
-    "temperature": {
-        "tooltip": false,
-        "thermal-zone": 2,
-        "format": " {temperatureC}°C",
-	      "interval": 10,
+
+    "custom/memory" : {
+      "tooltip": false,
+      "format": "{}",
+      "signal": 14,
+      "exec" : "sb-memory",
+      "interval": 10,
+      "on-click": "sb-memory 1",
+      "on-click-right": "sb-memory 3",
+      "on-click-middle": "sb-memory 2"
     },
-    "image":{
-        "exec":"~/.config/waybar/scripts/album_art.sh",
-       //"path": "/tmp/cover.jpeg",
-       "size": 32,
-        "interval": 5,  
+
+    "custom/doppler" : {
+      "tooltip": false,
+      "format": "{}",
+      "signal": 13,
+      "exec" : "sb-doppler",
+      "on-click": "sb-doppler 1",
+      "on-click-right": "sb-doppler 3",
+      "on-click-middle": "pkill -RTMIN+13 waybar"
     },
-    "wireplumber": {
-        "format": "{icon} {volume}%",
-        "format-muted": "󰝟",
-        "on-click": "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle",
-        "format-icons": [" ", " ", " "]
+
+    "custom/forecast" : {
+      "tooltip": false,
+      "format": "{}",
+      "signal": 5,
+      "exec" : "sb-forecast",
+      "interval" : 1800,
+      "on-click": "sb-forecast 1",
+      "on-click-right": "sb-forecast 3",
+      "on-click-middle": "pkill -RTMIN+5 waybar"
     },
-    "pulseaudio": {
-        "tooltip" : false,
-        "format": "{format_source}",
-        "format-source": " {volume}%",
-        "format-source-muted": " ",
-        "on-click": "wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle"
+
+    "custom/nettraf" : {
+      "tooltip": false,
+      "format": "{}",
+      "signal": 16,
+      "exec" : "sb-nettraf",
+      "interval" : 1,
+      "on-click": "",
     },
-   "custom/weather" : {
-        "tooltip" : false,
-        "signal": 9,
-        "format" : "{}",
-        "interval" : 300,
-        "exec" : "~/.config/waybar/scripts/weather",
-        "on-click": "~/.config/waybar/scripts/hyprweather",
-        "on-click-right": "pkill -RTMIN+9 waybar"
+
+    "custom/microphone" : {
+      "tooltip": false,
+      "format": "{}",
+      "signal": 8,
+      "exec" : "sb-microphone",
+      "on-click": "wpctl set-mute @DEFAULT_SOURCE@ toggle; pkill -RTMIN+8 waybar",
+      "on-scroll-up": "wpctl set-volume @DEFAULT_SOURCE@ 0.01+; pkill -RTMIN+8 waybar",
+      "on-scroll-down": "wpctl set-volume @DEFAULT_SOURCE@ 0.01-; pkill -RTMIN+8 waybar",
     },
-    "custom/pacman" : {
-        "tooltip" : false,
-        "signal": 8,
-        "format"  : "{}",
-        "interval"  : 18000,
-        "exec"  : "~/.config/waybar/scripts/pacpackages",
-        "on-click" : "~/.config/waybar/scripts/pacupdate",
-        "on-click-right" : "pkill -RTMIN+8 waybar"
 
+    "custom/volume" : {
+      "tooltip": false,
+      "format": "{}",
+      "signal": 10,
+      "exec" : "sb-volume",
+      "on-click": "wpctl set-mute @DEFAULT_SINK@ toggle; pkill -RTMIN+10 waybar",
+      "on-scroll-up": "wpctl set-volume @DEFAULT_SINK@ 0.01+; pkill -RTMIN+10 waybar",
+      "on-scroll-down": "wpctl set-volume @DEFAULT_SINK@ 0.01-; pkill -RTMIN+10 waybar",
     },
-    "custom/separator" : {
-        "format" : " | ",
+
+    "custom/clock" : {
+      "tooltip": false,
+      "format": "{}",
+      "signal": 1,
+      "exec" : "sb-clock",
+      "interval" : 60,
+      "on-click": "",
     },
-    "custom/doppler" : {
-      "format": "🌅 ",
-      "on-click": "~/.config/waybar/scripts/hyprdoppler",
+
+    "custom/internet" : {
+      "tooltip": false,
+      "format": "{}",
+      "signal": 4,
+      "exec" : "sb-internet",
+      "on-click": "sb-internet 1; pkill -RTMIN+4 waybar",
+      "on-click-right": "sb-internet 3; pkill -RTMIN+4 waybar",
+      "on-click-middle": "pkill -RTMIN+4 waybar"
     }
 }
-
diff --git a/.config/waybar/scripts/album_art.sh b/.config/waybar/scripts/album_art.sh
deleted file mode 100755
index 5a8cdab..0000000
--- a/.config/waybar/scripts/album_art.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-album_art=$(playerctl -p spotify_player metadata mpris:artUrl)
-if [[ -z $album_art ]] 
-then
-   # spotify is dead, we should die too.
-   exit
-fi
-curl -s  "${album_art}" --output "/tmp/cover.jpeg"
-echo "/tmp/cover.jpeg"
diff --git a/.config/waybar/scripts/doppler b/.config/waybar/scripts/doppler
deleted file mode 100755
index 3d1b7dc..0000000
--- a/.config/waybar/scripts/doppler
+++ /dev/null
@@ -1 +0,0 @@
-curl -s "https://meteoinfo.ru/hmc-output/rmap/phenomena.gif" | imv - -H 1200 -W 1200
diff --git a/.config/waybar/scripts/hyprdoppler b/.config/waybar/scripts/hyprdoppler
deleted file mode 100755
index d383b32..0000000
--- a/.config/waybar/scripts/hyprdoppler
+++ /dev/null
@@ -1 +0,0 @@
-hyprctl dispatch exec "[float; size 1200 1200;]" '/home/awy/.config/waybar/scripts/doppler'
diff --git a/.config/waybar/scripts/hyprweather b/.config/waybar/scripts/hyprweather
deleted file mode 100755
index 6a1e698..0000000
--- a/.config/waybar/scripts/hyprweather
+++ /dev/null
@@ -1 +0,0 @@
-hyprctl dispatch exec "[float; size 1430 1100;]" 'foot "/home/awy/.config/waybar/scripts/onclick-weather"'
diff --git a/.config/waybar/scripts/onclick-weather b/.config/waybar/scripts/onclick-weather
deleted file mode 100755
index 9592932..0000000
--- a/.config/waybar/scripts/onclick-weather
+++ /dev/null
@@ -1,2 +0,0 @@
-curl wttr.in
-read -p "Press Enter to continue..."
diff --git a/.config/waybar/scripts/pacpackages b/.config/waybar/scripts/pacpackages
deleted file mode 100755
index e362ee2..0000000
--- a/.config/waybar/scripts/pacpackages
+++ /dev/null
@@ -1,2 +0,0 @@
-doas pacman -Sy > /dev/null 2>&1
-pacman -Qu | grep -Fcv "[ignored]" | sed "s/^/📦 /;s/^📦 0$//g"
diff --git a/.config/waybar/scripts/pacupdate b/.config/waybar/scripts/pacupdate
deleted file mode 100755
index 0bdf32e..0000000
--- a/.config/waybar/scripts/pacupdate
+++ /dev/null
@@ -1,4 +0,0 @@
-doas pacman -Syu --noconfirm
-sleep 5
-hyprctl notify 5 10000 "rgb(ff1ea3)" "  Packages have been upgraded"
-pkill -RTMIN+8 waybar
diff --git a/.config/waybar/scripts/vpn-toggle b/.config/waybar/scripts/vpn-toggle
deleted file mode 100755
index 4b48203..0000000
--- a/.config/waybar/scripts/vpn-toggle
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-if [ -d /sys/class/net/wg0 ]; then
-  doas wg-quick down wg0
-  hyprctl notify 5 5000 "rgb(ff0000)" "  VPN is disabled"
-else
-  doas wg-quick up wg0
-  hyprctl notify 5 5000 "rgb(008000)" "  VPN is enabled"
-fi
diff --git a/.config/waybar/scripts/weather b/.config/waybar/scripts/weather
deleted file mode 100755
index 1e87ac8..0000000
--- a/.config/waybar/scripts/weather
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-#curl -s "wttr.in/?format=3" | awk '{print $3, $4}'
-curl -s "wttr.in/Moscow?format='%c%t'" | sed "s/'//g" | sed 's/  / /g'
diff --git a/.config/waybar/style.css b/.config/waybar/style.css
index 64d425a..ac0dc89 100644
--- a/.config/waybar/style.css
+++ b/.config/waybar/style.css
@@ -1,14 +1,14 @@
-@import "theme.css";
 * {
     border: none;
     border-radius: 0;
-    font-family: monospace; 
+    font-family: JetBrainsMono Nerd Font Propo; 
     font-weight: normal;
     font-size: 14px;
     min-height: 0;
 }
 
 #waybar {
+    color: #EBDBB2;
     background: #282828; 
 }
 
@@ -34,51 +34,14 @@ tooltip {
     margin-left: 15px;
 }
 
-#mpris {
-    color: @mauve;
-}
-
-#network {
-    color: #b8bb26;
-}
-
-#network.disconnected {
-    color: #fb4934;
-}
-
-#custom-weather {
-    color: #EBDBB2;
-}
-
-#custom-pacman {
-    color: #EBDBB2;
-}
-
-#pulseaudio {
-    color: #EBDBB2;
-}
-
-#wireplumber {
-    color: #EBDBB2;
+#custom-nettraf {
+  min-width: 120px;
 }
 
-#cpu {
-    color: @yellow;
-}
-
-#memory {
-    color: #EBDBB2;
-}
-
-#temperature {
-    color: #EBDBB2;
-}
-
-#clock {
-    color: #EBDBB2;
-    margin-right: 10px;
+#custom-volume {
+  min-width: 60px;
 }
 
-#tray {
-    color: @red;
+#custom-internet {
+  margin-right: 15px;
 }
diff --git a/.config/waybar/theme.css b/.config/waybar/theme.css
deleted file mode 100644
index 0eb6a82..0000000
--- a/.config/waybar/theme.css
+++ /dev/null
@@ -1,26 +0,0 @@
-@define-color rosewater #f5e0dc;
-@define-color flamingo #f2cdcd;
-@define-color pink #f5c2e7;
-@define-color mauve #cba6f7;
-@define-color red #f38ba8;
-@define-color maroon #eba0ac;
-@define-color peach #fab387;
-@define-color yellow #f9e2af;
-@define-color green #a6e3a1;
-@define-color teal #94e2d5;
-@define-color sky #89dceb;
-@define-color sapphire #74c7ec;
-@define-color blue #89b4fa;
-@define-color lavender #b4befe;
-@define-color text #cdd6f4;
-@define-color subtext1 #bac2de;
-@define-color subtext0 #a6adc8;
-@define-color overlay2 #9399b2;
-@define-color overlay1 #7f849c;
-@define-color overlay0 #6c7086;
-@define-color surface2 #585b70;
-@define-color surface1 #45475a;
-@define-color surface0 #313244;
-@define-color base #1e1e2e;
-@define-color mantle #181825;
-@define-color crust #11111b;