Merge pull request #10 from JaKooLit/Beta-v0.4

Hyprland-Dots V2

11 files changed, 228 insertions, 28 deletions

diff --git a/config/waybar/configs/config-default b/config/waybar/configs/config-default
index 2174d512..a5971638 100644
--- a/config/waybar/configs/config-default
+++ b/config/waybar/configs/config-default
@@ -35,13 +35,19 @@
 	"custom/separator#dot-line",
 	"custom/light_dark",
 	"custom/separator#dot-line",	
-	"custom/lock",	
+	"custom/lock",
+	"custom/separator#dot-line",
+	"custom/keybinds",	
 	], 
 
 "modules-right": [
 	//"hyprland/window", 
 	"tray",
 	"custom/separator#dot-line",
+	"bluetooth",
+	"custom/separator#dot-line",
+	//"network",
+	//"custom/separator#dot-line",
 	//"cava", 
 	"battery",
 	"custom/separator#dot-line", 
@@ -52,8 +58,8 @@
 	//"wireplumber", 
 	"pulseaudio#microphone",
 	"custom/separator#dot-line",
-	//"keyboard-state",
-	//"custom/separator#dot-line",
+	"keyboard-state",
+	"custom/separator#dot-line",
 	"custom/power",
 	],
 }
diff --git a/config/waybar/modules b/config/waybar/modules
index e23066e0..3b033aa7 100644
--- a/config/waybar/modules
+++ b/config/waybar/modules
@@ -7,7 +7,7 @@
   //"format-icons": ["󰃞", "󰃟", "󰃠"],
   "format": "{icon}",
   "format-icons": ["󰛩", "󱩎", "󱩏", "󱩑", "󱩒", "󱩓", "󱩔", "󱩕", "󰛨"],
-  "tooltip-format": "{percent}%",
+  "tooltip-format": "backlight {percent}%",
   "icon-size": 10,
   "on-click": "",
   "on-click-middle": "",
@@ -41,17 +41,18 @@
   "tooltip": true,
   "tooltip-format": "{timeTo} {power}w",
   "on-click-middle": "~/.config/hypr/scripts/ChangeBlur.sh",
-  "on-click-right": "$HOME/.config/hypr/scripts/WofiPower.sh",
+  "on-click-right": "$HOME/.config/hypr/scripts/Wlogout.sh",
 },
     
 "bluetooth": {
-  "format": "",
-  "format-disabled": "", // an empty format will hide the module
-  "format-connected": " {num_connections}",
+  "format": "",
+  "format-disabled": "󰂳",
+  "format-connected": "󰂱 {num_connections}",
   "tooltip-format": " {device_alias}",
   "tooltip-format-connected": "{device_enumerate}",
   "tooltip-format-enumerate-connected": " {device_alias} 󰂄{device_battery_percentage}%",
-   "tooltip": true
+  "tooltip": true,
+  "on-click": "blueman-manager",
 },
 
 "cava": {
@@ -163,7 +164,7 @@
     "9": "",
     "10": "10",
     "focused": "",
-    "default": "",
+    "default": "",
   },
   "on-scroll-up": "hyprctl dispatch workspace e+1",
   "on-scroll-down": "hyprctl dispatch workspace e-1",
@@ -210,7 +211,7 @@
   "format-alt-click": "click",
   "tooltip": true,
   "tooltip-format": "{used:0.1f}GB/{total:0.1f}G",
-  "on-click-right": "foot --title btop sh -c 'btop'"
+  "on-click-right": "kitty --title btop sh -c 'btop'"
 },
     
 "network": {
@@ -229,7 +230,7 @@
     
 "pulseaudio": {
   "format": "{icon}",
-  "format-bluetooth": "{icon}  {volume}%",
+  "format-bluetooth": "{icon} 󰂰 {volume}%",
   "format-muted": "󰖁",
   "format-icons": {
       "headphone": "",
@@ -268,8 +269,8 @@
   "critical-threshold": 82,
   "format-critical": "{temperatureC}°C {icon}",
   "format": "{temperatureC}°C {icon}",
-  "format-icons": [""],
-  "on-click-right": "foot --title nvtop sh -c 'nvtop'"
+  "format-icons": ["󰈸"],
+  "on-click-right": "kitty --title nvtop sh -c 'nvtop'"
 },
     
 "tray": {
@@ -295,7 +296,8 @@
   "on-click": "activate",
   "on-click-middle": "close",
   "ignore-list": [
-        "wofi"  
+        "wofi",
+        "rofi",  
                  ]
 },
     
@@ -308,10 +310,10 @@
   "tooltip-format": "Change wallpaper or style"
 },
     
-"custom/keybindings": {
-  "format":"",
+"custom/keybinds": {
+  "format":"󰺁 HINT!",
   "tooltip": false,
-  "on-click": "~/.config/hypr/scripts/Help.sh",
+  "on-click": "~/.config/hypr/scripts/KeyHints.sh",
 },
   
 "custom/light_dark": {
@@ -329,9 +331,9 @@
 "custom/menu": {
   "format": "",
   "tooltip": false,
-  "on-click": "$HOME/.config/hypr/scripts/Wofi.sh",
+  "on-click": "pkill rofi || rofi -show drun -modi run,drun,filebrowser",
   "on-click-right": "$HOME/.config/hypr/scripts/ChangeLayoutMenu.sh",
-  "on-click-middle": "~/.config/hypr/scripts/Wallpaper.sh swaybg",
+  "on-click-middle": "~/.config/hypr/scripts/Wallpaper.sh swww",
 },
 
 "custom/playerctl": {
@@ -356,8 +358,7 @@
   "exec": "checkupdates | wc -l",
   "exec-if": "[[ $(checkupdates | wc -l) ]]",
   "interval": 15,
-  "on-click": "foot -T update paru -Syu || yay -Syu && notify-send 'The system has been updated'",
-  "on-click-right": "~/.config/hypr/scripts/WallpaperSwitch.sh",
+  "on-click": "kitty -T update paru -Syu || yay -Syu && notify-send 'The system has been updated'",
 },
   
 "custom/weather": {
@@ -440,7 +441,7 @@
   "format-alt-click": "click",
   "tooltip": true,
   "tooltip-format": "{used:0.1f}GB/{total:0.1f}G",
-  "on-click-right": "foot --title btop sh -c 'btop'",
+  "on-click-right": "kitty --title btop sh -c 'btop'",
 },
 
 "pulseaudio#microphone_vertical": {
@@ -459,19 +460,19 @@
 "temperature#vertical": {
   "interval": 10,
   "tooltip": true,
-  "hwmon-path": "/sys/class/hwmon/hwmon1/temp1_input",
-  //"thermal-zone": 0,
+  //"hwmon-path": "/sys/class/hwmon/hwmon1/temp1_input",
+  "thermal-zone": 0,
   "critical-threshold": 80,
   "format-critical": "{icon}\n{temperatureC}°C",
   "format": " {icon}",
-  "format-icons": [""],
-  "on-click-right": "foot --title nvtop sh -c 'nvtop'"
+  "format-icons": ["󰈸"],
+  "on-click-right": "kitty --title nvtop sh -c 'nvtop'"
 },
 
 "custom/power_vertical": {
   "format": "⏻",
   "tooltip": false,
-  "on-click": "$HOME/.config/hypr/scripts/WofiPower.sh",
+  "on-click": "$HOME/.config/hypr/scripts/Wlogout.sh",
   "on-click-right": "~/.config/hypr/scripts/ChangeBlur.sh",
 },
 }
diff --git a/config/waybar/style/style-b&w.css b/config/waybar/style/style-b&w.css
index d2edbb31..7c61d067 100644
--- a/config/waybar/style/style-b&w.css
+++ b/config/waybar/style/style-b&w.css
@@ -110,6 +110,7 @@ tooltip label{
 #wireplumber,
 #workspaces,
 #custom-cycle_wall,
+#custom-keybinds,
 #custom-light_dark,
 #custom-lock,
 #custom-menu,
diff --git a/config/waybar/style/style-dark.css b/config/waybar/style/style-dark.css
index 31f9b159..ac688ecc 100644
--- a/config/waybar/style/style-dark.css
+++ b/config/waybar/style/style-dark.css
@@ -108,6 +108,7 @@ tooltip label {
 #wireplumber,
 #workspaces,
 #custom-cycle_wall,
+#custom-keybinds,
 #custom-light_dark,
 #custom-lock,
 #custom-menu,
diff --git a/config/waybar/style/style-default.css b/config/waybar/style/style-default.css
index 28558be4..5e5bbb08 100644
--- a/config/waybar/style/style-default.css
+++ b/config/waybar/style/style-default.css
@@ -98,6 +98,7 @@ tooltip label{
 #wireplumber,
 #workspaces,
 #custom-cycle_wall,
+#custom-keybinds,
 #custom-light_dark,
 #custom-lock,
 #custom-menu,
diff --git a/config/waybar/style/style-default_alter.css b/config/waybar/style/style-default_alter.css
index cfd718e1..d2733705 100644
--- a/config/waybar/style/style-default_alter.css
+++ b/config/waybar/style/style-default_alter.css
@@ -132,6 +132,7 @@ tooltip label{
 #wireplumber,
 #workspaces,
 #custom-cycle_wall,
+#custom-keybinds,
 #custom-light_dark,
 #custom-lock,
 #custom-menu,
diff --git a/config/waybar/style/style-light.css b/config/waybar/style/style-light.css
index 377ca703..0fa95817 100644
--- a/config/waybar/style/style-light.css
+++ b/config/waybar/style/style-light.css
@@ -108,6 +108,7 @@ tooltip label {
 #wireplumber,
 #workspaces,
 #custom-cycle_wall,
+#custom-keybinds,
 #custom-light_dark,
 #custom-lock,
 #custom-menu,
diff --git a/config/waybar/style/style-mauve.css b/config/waybar/style/style-mauve.css
index e1b0cad2..2e7bb8d4 100644
--- a/config/waybar/style/style-mauve.css
+++ b/config/waybar/style/style-mauve.css
@@ -112,6 +112,7 @@ tooltip {
 #wireplumber,
 #workspaces,
 #custom-cycle_wall,
+#custom-keybinds,
 #custom-light_dark,
 #custom-lock,
 #custom-menu,
diff --git a/config/waybar/style/style-pywal.css b/config/waybar/style/style-pywal.css
new file mode 100644
index 00000000..488c2daf
--- /dev/null
+++ b/config/waybar/style/style-pywal.css
@@ -0,0 +1,185 @@
+*{
+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: 98%;
+font-feature-settings: '"zero", "ss01", "ss02", "ss03", "ss04", "ss05", "cv31"';
+padding: 1px;
+margin-top: 1px;
+margin-bottom: 1px;
+}
+
+@import '../../.cache/wal/colors-waybar.css';
+
+window#waybar {
+	background: transparent;
+}
+
+window#waybar.empty {
+	background-color: transparent;
+}
+
+window#waybar.empty #window {
+	padding: 0px;
+	margin: 0px;
+	border: 0px;
+	background-color: transparent;
+}
+
+window > box {
+	background: rgba(0, 0, 0, 0);
+	border-bottom: 1px solid rgba(0, 0, 0, 0);
+	color: @foreground;
+}
+
+window {
+	/*font-weight: bold;*/
+}
+
+tooltip {
+	background: rgba(0, 0, 0, 0.4);
+	opacity: 0.8;
+	border-radius: 10px;
+	border-width: 2px;
+	border-style: solid;
+	border-color: @color15;
+}
+
+tooltip label{
+	color: @foreground;
+}
+/*-----module groups----*/
+.modules-right {
+	background-color: rgba(0, 0, 0, 0.4);
+	border: 0.5px solid @color15;
+	border-radius: 10px;
+}
+.modules-center {
+	background-color: rgba(0, 0, 0, 0.4);
+	border: 0.5px solid @color15;
+	border-radius: 10px;
+}
+.modules-left {
+	background-color: rgba(0, 0, 0, 0.4);
+	border: 0.5px solid @color15;
+	border-radius: 10px;
+}
+/*-----modules indv----*/
+
+#workspaces button {
+	color: @color1;
+	padding: 0px 0px;
+	background-color: rgba(0, 0, 0, 0);
+	transition: all 0.3s ease-in-out;
+}
+#workspaces button:hover {
+	box-shadow: inherit;
+	background-color: @color2;
+}
+
+#workspaces button.focused {
+	background-color: rgba(0,85,102,0);
+}
+#workspaces button.active {
+	color: @foreground;
+	/*background-color: rgba(0,85,102,0.3);*/
+	transition: all 0.3s ease-in-out;
+
+}
+
+#backlight,
+#battery,
+#bluetooth,
+#cava,
+#clock,
+#cpu,
+#disk,
+#idle_inhibitor,
+#keyboard-state label,
+#keyboard-state label.locked,
+#keyboard-state,
+#memory,
+#mode,
+#mpd,
+#network,
+#pulseaudio,
+#taskbar button,
+#taskbar,
+#temperature,
+#tray,
+#window,
+#wireplumber,
+#workspaces,
+#custom-cycle_wall,
+#custom-keybinds,
+#custom-light_dark,
+#custom-lock,
+#custom-menu,
+#custom-power_vertical,
+#custom-power,
+#custom-spotify,
+#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: 0px 6px;
+}
+#mode {
+	color: #cc3436;
+	font-weight: bold;
+}
+#custom-power {
+	/*background-color: rgba(0,119,179,0.6);*/
+	/*border-radius: 50px;*/
+	margin: 5px 5px;
+	padding: 1px 3px;
+}
+/*-----Indicators----*/
+#idle_inhibitor.activated {
+	color: #2dcc36;
+}
+#pulseaudio.muted {
+	color: #cc3436;
+}
+#pulseaudio-microphone.muted {
+	color: #cc3436;
+}
+#temperature.critical {
+	color: #cc3436;
+}
+
+#waybar {
+	background-color: @color14;
+	color: @color3;
+}
+
+@keyframes blink {
+	to {
+		color: #000000;
+	}
+}
+
+#battery.critical:not(.charging) {
+	color: #f53c3c;
+	animation-name: blink;
+	animation-duration: 0.5s;
+	animation-timing-function: linear;
+	animation-iteration-count: infinite;
+	animation-direction: alternate;
+}
+
+#taskbar button.active {
+	background-color: #7f849c;
+}
+#waybar.empty, #waybar.tiled, #waybar.floating {
+	background-color: transparent;
+}
diff --git a/config/waybar/style/style-rgb.css b/config/waybar/style/style-rgb.css
index f1224be7..9f9718a8 100644
--- a/config/waybar/style/style-rgb.css
+++ b/config/waybar/style/style-rgb.css
@@ -72,6 +72,7 @@ tooltip label{
 #wireplumber,
 #workspaces,
 #custom-cycle_wall,
+#custom-keybinds,
 #custom-light_dark,
 #custom-lock,
 #custom-menu,
diff --git a/config/waybar/style/style-uline.css b/config/waybar/style/style-uline.css
index 08ad7508..4869d805 100644
--- a/config/waybar/style/style-uline.css
+++ b/config/waybar/style/style-uline.css
@@ -52,6 +52,7 @@ window#waybar {
 #wireplumber,
 #workspaces,
 #custom-cycle_wall,
+#custom-keybinds,
 #custom-light_dark,
 #custom-lock,
 #custom-menu,