Merge pull request #419 from JaKooLit/development

Development to Main. Preparation for release

3 files changed, 528 insertions, 45 deletions

diff --git a/config/waybar/configs/[TOP] Everforest b/config/waybar/configs/[TOP] Everforest
new file mode 100644
index 00000000..7ad9c175
--- /dev/null
+++ b/config/waybar/configs/[TOP] Everforest
@@ -0,0 +1,140 @@
+/* ---- 💫 https://github.com/JaKooLit 💫 ---- */
+/* -- designed by https://github.com/DevNChill */
+// ### Everforest ### //
+
+{
+"include": "~/.config/waybar/modules",
+"layer": "top",
+//"mode": "dock",
+"exclusive": true,
+"passthrough": false,
+"position": "top",
+//"spacing": 6,
+"fixed-center": true,
+"ipc": true,
+//"margin-top": 3,
+//"margin-left": 8,
+//"margin-right": 8,
+
+"modules-left": [
+  "custom/arch",
+	"custom/separator#blank_2", 
+	"hyprland/workspaces#rw",
+	"custom/separator#blank_2",
+//	"mpris",
+	"custom/swaync",
+	"tray",
+	],
+"modules-center": [
+	"clock#forest",
+	"idle_inhibitor",
+	],
+"modules-right": [
+	"cpu#forest",
+	"memory#forest",
+	"temperature#forest",
+	"disk#forest",
+	"custom/separator#blank_2",
+	"backlight",
+  	"battery#forest",
+	"custom/separator#blank_2",
+	"group/audio",
+	],
+
+// Additional / Edited Waybar Modules //
+"custom/arch": {
+      "format":" ",
+      "tooltip": false,
+      "on-click": "rofi -show drun"
+},
+"clock#forest": {
+      "format": "{:%A %d.%m.%Y - %H:%M}",
+      "tooltip-format": "<span color='#D3C6AA' size='larger'>{:%Y %B}</span>\n<tt>{calendar}</tt>",
+      "calendar-weeks-pos": "right",
+      "today-format": "<span color='#E67E80' weight='ultrabold'>{}</span>",
+      "format-calendar": "<span color='#D3C6AA' weight='normal'>{}</span>",
+      "format-calendar-weeks": "<span color='#7FBBB3'><b>W{:%V}</b></span>",
+      "format-calendar-weekdays": "<span color='#A7C080'><b>{}</b></span>",
+      "on-scroll": {
+                  "calendar": 1
+                   }
+},
+"battery#forest": {
+	//"interval": 5,
+	"align": 0,
+	"rotate": 0,
+	//"bat": "BAT1",
+	//"adapter": "ACAD",
+	"full-at": 100,
+	"design-capacity": false,
+	"states": {
+		"good": 95,
+		"warning": 30,
+		"critical": 15
+	},
+	"format": "Battery {icon}  {capacity}%",
+	"format-charging": "Battery  {capacity}%",
+	"format-plugged": "Battery 󱘖 {capacity}%",
+	"format-alt-click": "click",
+	"format-full": "Battery {icon} Full",
+	"format-alt": "Battery {icon} {time}",
+	"format-icons": [
+		"󰂎", "󰁺", "󰁻", "󰁼", "󰁽", "󰁾", "󰁿", "󰂀", "󰂁", "󰂂", "󰁹"
+	],
+	"format-time": "{H}h {M}min",
+	"tooltip": true,
+	"tooltip-format": "{timeTo} {power}w",
+	"on-click-middle": "~/.config/hypr/scripts/ChangeBlur.sh",
+	"on-click-right": "~/.config/hypr/scripts/Wlogout.sh",
+},
+
+"cpu#forest": {
+	"format": "Cpu  󰍛  {usage}%",
+	"interval": 1,
+	"min-length": 5,
+	"format-alt-click": "click",
+	"format-alt": "{icon0}{icon1}{icon2}{icon3} {usage:>2}% 󰍛",
+	"format-icons": [
+		"▁", "▂", "▃", "▄", "▅", "▆", "▇", "█"
+	],
+	"on-click-right": "gnome-system-monitor",
+},
+
+"disk#forest": {
+	"interval": 30,
+	//"format": "Disk    󰋊",
+	"path": "/",
+	//"format-alt-click": "click",
+	"format": "Disk 󰋊  {used}",
+  "on-click-right": "baobab",
+//	"tooltip": true,
+//	"tooltip-format": "Disk    {used} used out of {total} on {path} ({percentage_used}%)",
+},
+
+"memory#forest": {
+	"interval": 10,
+	"format": "Ram  󰾆  {used:0.1f}G",
+	"format-alt": "Ram    {percentage}%    󰾆",
+	"format-alt-click": "click",
+	"tooltip": true,
+	"tooltip-format": "Ram    {used:0.1f}GB/{total:0.1f}G",
+	"on-click-right": "kitty --title btop sh -c 'btop'"
+},
+"temperature#forest": {
+	"interval": 10,
+	"tooltip": true,
+	"hwmon-path": [
+		"/sys/class/hwmon/hwmon1/temp1_input",
+		"/sys/class/thermal/thermal_zone0/temp"
+	],
+	//"thermal-zone": 0,
+	"critical-threshold": 82,
+	"format-critical": "Temp {icon}  {temperatureC}°C",
+	"format": "Temp {icon}  {temperatureC}°C",
+	"format-icons": [
+		" 󰈸"
+	],
+	"on-click-right": "kitty --title nvtop sh -c 'nvtop'"
+},
+}
+
diff --git a/config/waybar/modules b/config/waybar/modules
index 6ae63e03..1363800c 100644
--- a/config/waybar/modules
+++ b/config/waybar/modules
@@ -2,6 +2,53 @@
 /* Waybar Modules */
 
 {
+
+// Weather and Temperature Modules as this is most like to change always. 
+// Result is of course easier to edit
+"custom/weather": {
+	"format": "{}",
+	"format-alt": "{alt}: {}",
+	"format-alt-click": "click",
+	"interval": 3600,
+	"return-type": "json",
+	"exec": "~/.config/hypr/UserScripts/Weather.sh",
+	//"exec": "~/.config/hypr/UserScripts/Weather.py",
+	"exec-if": "ping wttr.in -c1",
+	"tooltip": true,
+},
+"temperature": {
+	"interval": 10,
+	"tooltip": true,
+	"hwmon-path": [
+		"/sys/class/hwmon/hwmon1/temp1_input",
+		"/sys/class/thermal/thermal_zone0/temp"
+	],
+	//"thermal-zone": 0,
+	"critical-threshold": 82,
+	"format-critical": "{temperatureC}°C {icon}",
+	"format": "{temperatureC}°C {icon}",
+	"format-icons": [
+		"󰈸"
+	],
+	"on-click-right": "kitty --title nvtop sh -c 'nvtop'"
+},
+"temperature#vertical": {
+	"interval": 10,
+	"tooltip": true,
+	"hwmon-path": [
+		"/sys/class/hwmon/hwmon1/temp1_input",
+		"/sys/class/thermal/thermal_zone0/temp"
+	],
+	//"thermal-zone": 0,
+	"critical-threshold": 80,
+	"format-critical": "{icon}\n{temperatureC}°C",
+	"format": " {icon}",
+	"format-icons": [
+		"󰈸"
+	],
+	"on-click-right": "kitty --title nvtop sh -c 'nvtop'"
+},
+
 // HYPRLAND WORKSPACES. CHOOSE as desired and place on waybar configs
 // CIRCLES Style
 "hyprland/workspaces": {
@@ -147,14 +194,20 @@
 		"title<.*reddit.*>": " ",
 		"title<.*Picture-in-Picture.*>": " ",
 		"class<firefox>": " ",
-		"class<kitty>": " ",
-		"class<konsole>": " ",
+		"class<kitty>": " ",
+		"class<kitty-dropterm>": " ",
+		"class<konsole>": " ",
+		"class<Chromium>": "<span font='12'> </span>",
+		"class<org.telegram.desktop|io.github.tdesktop_x64.TDeskto>": "<span font='12'> </span>",
+		"class<[Ss]potify>": "<span font='12'> </span>",
+		"class<VSCode|code-url-handler>": "<span font='12'>󰨞</span>",
 		"class<thunar>": "󰝰 ",
 		"class<discord>": " ",
 		"class<WebCord>": " ",
 		"class<subl>": "󰅳 ",
 		"class<celluloid>": " ",
 		"class<Cider>": "󰎆 ",
+		"class<virt-manager>": " ",
 		"class<code-oss>": "󰨞 ",
 		"class<codium|codium-url-handler|VSCodium>": "󰨞 ",
 		"class<codeblocks>": "󰅩 ",
@@ -568,22 +621,6 @@
 	"tooltip-format": "{source_desc} | {source_volume}%",
 	"scroll-step": 5,
 },
-"temperature": {
-	"interval": 10,
-	"tooltip": true,
-	"hwmon-path": [
-		"/sys/class/hwmon/hwmon1/temp1_input",
-		"/sys/class/thermal/thermal_zone0/temp"
-	],
-	//"thermal-zone": 0,
-	"critical-threshold": 82,
-	"format-critical": "{temperatureC}°C {icon}",
-	"format": "{temperatureC}°C {icon}",
-	"format-icons": [
-		"󰈸"
-	],
-	"on-click-right": "kitty --title nvtop sh -c 'nvtop'"
-},
 "tray": {
 	"icon-size": 18,
 	"spacing": 4,
@@ -712,17 +749,7 @@
 	"tooltip": true,
 	"tooltip-format": "Left Click: Update System\nArch Linux Only",
 },
-"custom/weather": {
-	"format": "{}",
-	"format-alt": "{alt}: {}",
-	"format-alt-click": "click",
-	"interval": 3600,
-	"return-type": "json",
-	"exec": "~/.config/hypr/UserScripts/Weather.sh",
-	//"exec": "~/.config/hypr/UserScripts/Weather.py",
-	"exec-if": "ping wttr.in -c1",
-	"tooltip": true,
-},
+
 // Separators
 "custom/separator#dot": {
 	"format": "",
@@ -840,22 +867,6 @@
 	"tooltip": true,
 	"tooltip-format": "{source_desc} | {source_volume}%",
 },
-"temperature#vertical": {
-	"interval": 10,
-	"tooltip": true,
-	"hwmon-path": [
-		"/sys/class/hwmon/hwmon1/temp1_input",
-		"/sys/class/thermal/thermal_zone0/temp"
-	],
-	//"thermal-zone": 0,
-	"critical-threshold": 80,
-	"format-critical": "{icon}\n{temperatureC}°C",
-	"format": " {icon}",
-	"format-icons": [
-		"󰈸"
-	],
-	"on-click-right": "kitty --title nvtop sh -c 'nvtop'"
-},
 "custom/power_vertical": {
 	"format": "⏻",
 	"exec": "echo ; echo 󰟡 power // blur",
diff --git a/config/waybar/style/[Extra] EverForest.css b/config/waybar/style/[Extra] EverForest.css
new file mode 100644
index 00000000..89a397c2
--- /dev/null
+++ b/config/waybar/style/[Extra] EverForest.css
@@ -0,0 +1,332 @@
+/* ----------- 💫 https://github.com/JaKooLit 💫 -------- */
+/* --- Designed by https://github.com/DevNChill --- */
+
+/* Extra - EverForest*/
+
+@define-color bg_dim      #232A2E;
+@define-color black       #000000;
+@define-color white       #FFFFFF;
+@define-color bg0         #2D353B;
+@define-color bg1         #343F44;
+@define-color bg2         #3D484D;
+@define-color bg3         #475258;
+@define-color bg4         #4F585E;
+@define-color bg5         #56635f;
+@define-color bg_visual   #543A48;
+@define-color bg_red      #514045;
+@define-color bg_green    #425047;
+@define-color bg_blue     #3A515D;
+@define-color bg_yellow   #4D4C43;
+@define-color fg          #D3C6AA;
+@define-color red         #E67E80;
+@define-color orange      #E69875;
+@define-color yellow      #DBBC7F;
+@define-color green       #A7C080;
+@define-color aqua        #83C092;
+@define-color blue        #7FBBB3;
+@define-color purple      #D699B6;
+@define-color grey0       #7A8478;
+@define-color grey1       #859289;
+@define-color grey2       #9DA9A0;
+
+* {
+  font-family: "JetBrainsMono Nerd Font";
+  font-weight: bold;
+  min-height: 0;
+  /* set font-size to 100% if font scaling is set to 1.00 using nwg-look */
+  font-size: 97%;
+  font-feature-settings: '"zero", "ss01", "ss02", "ss03", "ss04", "ss05", "cv31"';
+  border: 1px solid transparent;
+  border-radius: 0px;
+  margin: 0px 1px;
+}
+
+window#waybar {
+  border: none;
+  /*background-color: @bg_green;*/
+  background-color: @bg_green;
+  color: @fg;
+  transition-property: background-color;
+  transition-duration: 0.5s;
+}
+
+window#waybar.hidden {
+	opacity: 0.5;
+}
+
+#window {
+  padding: 0px 10px;
+  margin: 0px 10px;
+  border-radius: 5px;
+  background-color: @bg0;
+}
+
+window#waybar.empty,
+window#waybar.empty #window {
+  background: none;
+}
+
+.modules-left button:first-child {
+  border-top-left-radius: 5px;
+  border-bottom-left-radius: 5px;
+  margin-left: 5px;
+}
+
+.modules-left button:last-child {
+  border-top-right-radius: 5px;
+  border-bottom-right-radius: 5px;
+  margin-right: 5px;
+}
+
+#custom-menu,
+#custom-arch {
+  background-color: @bg;
+  color: @red;
+}
+
+#custom-swaync {
+  color: @yellow;
+}
+#workspaces button {
+  padding: 0px 5px;
+  background-color: @orange;
+  color: @black;
+}
+
+#taskbar button.active,
+#workspaces button.active {
+  background-color: @grey0;
+  color: @black;
+  animation: gradient_f 20s ease-in infinite;
+  /*transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682);*/
+}
+
+#taskbar button:hover,
+#workspaces button:hover {
+  background-color: @purple;
+  color: @black;
+}
+
+#workspaces button.focused {
+  background-color: @green;
+  color: @bg0;
+}
+
+#workspaces button.urgent {
+  background-color: @red; /* Keeps the original color */
+  color: @white; /* Sets text color to white for better contrast */
+  border: 2px solid @red; /* Adds a border with the same color */
+  box-shadow: 0 0 10px @red; /* Adds a glow effect */
+  font-weight: bold; /* Makes text bold for more emphasis */
+  transition:
+    background-color 0.3s,
+    box-shadow 0.3s; /* Smooth transition for hover effect */
+}
+
+#cpu {
+  border-radius: 5px 0px 0px 5px;
+  padding: 0px 5px;
+  background-color: @yellow;
+  color: @bg_yellow;
+}
+
+#memory {
+  padding: 0px 5px;
+  background-color: @yellow;
+  color: @bg_yellow;
+}
+
+#temperature {
+  padding: 0px 5px;
+  background-color: @green;
+  color: @bg_yellow;
+}
+#temperature.critical {
+  background-color: @red;
+}
+
+#disk {
+  border-radius: 0px 5px 5px 0px;
+  padding: 0px 5px;
+  margin-right: 5px;
+  background-color: @green;
+  color: @bg_yellow;
+}
+
+#battery.bat2 {
+  border-radius: 0px 5px 5px 0px;
+}
+
+.modules-left :last-child {
+  border-radius: 0px 5px 5px 0px;
+}
+#battery {
+  border-radius: 5px 0px 0px 5px;
+  padding: 0px 5px;
+  background-color: @aqua;
+  color: @bg_yellow;
+}
+#battery.plugged {
+  color: @fg;
+  background-color: @bg_green;
+}
+#battery.charging {
+  color: @fg;
+  background-color: @bg_green;
+}
+#battery.critical:not(.charging) {
+  background-color: @red;
+  color: @fg;
+  animation-name: blink;
+  animation-duration: 0.5s;
+  animation-timing-function: linear;
+  animation-iteration-count: infinite;
+  animation-direction: alternate;
+}
+@keyframes blink {
+  to {
+    background-color: @fg;
+    color: @bg_dim;
+  }
+}
+
+#backlight {
+  border-radius: 5px 0px 0px 5px;
+  padding: 0px 5px;
+  margin-left: 5px;
+  background-color: @red;
+  color: @black;
+}
+
+#network,
+#pulseaudio {
+  padding: 0px 5px;
+  border-radius: 0px 5px 5px 0px;
+  background-color: @blue;
+  color: @bg_yellow;
+}
+
+#pulseaudio.muted {
+  background-color: @grey1;
+  color: @bg_yellow;
+}
+
+#tray {
+  padding: 0px 5px;
+  border-radius: 5px;
+  margin-left: 5px;
+  color: @fg;
+  background-color: @bg0;
+}
+
+#idle_inhibitor {
+  padding: 0px 5px;
+  border-radius: 5px;
+  margin-left: 5px;
+  background-color: @blue;
+  color: @black;
+}
+#idle_inhibitor.activated {
+  background-color: @fg;
+  color: @bg0;
+}
+
+#clock {
+  padding: 0px 5px;
+  border-radius: 5px;
+  margin: 0px 5px;
+  color: @bg_yellow;
+  background-color: @aqua;
+}
+
+#pulseaudio-slider slider {
+	min-width: 0px;
+	min-height: 0px;
+	opacity: 0;
+	background-image: none;
+	border: none;
+	box-shadow: none;
+}
+	
+#pulseaudio-slider trough {
+	min-width: 80px;  
+	min-height: 5px; 
+	border-radius: 5px;
+	background-color: #22252a;
+}
+	
+#pulseaudio-slider highlight {
+	min-height: 10px; 
+	border-radius: 5px;
+	background-color: #ba5663;
+}
+
+#backlight-slider slider {
+	min-width: 0px;
+	min-height: 0px;
+	opacity: 0;
+	background-image: none;
+	border: none;
+	box-shadow: none;
+}
+	
+#backlight-slider trough {
+	min-width: 80px;  
+	min-height: 10px; 
+	border-radius: 5px;
+	background-color: #22252a;
+}
+	
+#backlight-slider highlight {
+	min-width: 10px; 
+	border-radius: 5px;
+	background-color: #ba5663;
+}
+
+#backlight,
+#backlight-slider,
+#battery,
+#bluetooth,
+#clock,
+#cpu,
+#disk,
+#idle_inhibitor,
+#keyboard-state,
+#memory,
+#mode,
+#mpris,
+#network,
+#power-profiles-daemon,
+#pulseaudio,
+#pulseaudio-slider,
+#taskbar,
+#temperature,
+#tray,
+#window,
+#wireplumber,
+#workspaces,
+#custom-backlight,
+#custom-cycle_wall,
+#custom-hint,
+#custom-keyboard,
+#custom-light_dark,
+#custom-lock,
+#custom-menu,
+#custom-power_vertical,
+#custom-power,
+#custom-swaync,
+#custom-updater,
+#custom-weather,
+#custom-weather.clearNight,
+#custom-weather.cloudyFoggyDay,
+#custom-weather.cloudyFoggyNight,
+#custom-weather.default, 
+#custom-weather.rainyDay,
+#custom-weather.rainyNight,
+#custom-weather.severe,
+#custom-weather.showyIcyDay,
+#custom-weather.snowyIcyNight,
+#custom-weather.sunnyDay {
+	padding-right: 5px;
+	padding-left: 5px;
+}
\ No newline at end of file