Merge branch 'x13'

# Conflicts:
#	.config/hypr/hyprland.conf
#	.config/hypr/hyprpaper.conf
#	.config/waybar/config
#	.gitignore
#	.zshrc
#	bin/alias
#	bin/brightness
#	bin/cycle_pactl.sh
#	bin/keep.sh
#	bin/lid_close.sh
#	bin/lid_open.sh
#	bin/startup.sh

.config/waybar/config

@@ -7,9 +7,9 @@
 	"hyprland/workspaces": {
 		"format": "{name}",
 	},
-	"hyprland/language":{
-		"format": "{short}_{variant}",
-	},
+	//"hyprland/language":{
+	//	"format": "{short}_{variant}",
+	//},
 	"user": {
 		"format": "{user}",
 		"interval": 60,
@@ -79,13 +79,13 @@
 
 	"modules-left": [
 		"hyprland/workspaces",
-		"custom/right-arrow-dark",
-		"cava",
+		//"custom/right-arrow-dark",
+		//"cava",
 		//"hyprland/language",
 		//"wlr/taskbar",
 		//"custom/space",
 		//"custom/right-arrow-light",
-		//"custom/right-arrow-dark",
+		"custom/right-arrow-dark",
 		"hyprland/window",
 	],
 	"modules-center": [
@@ -123,8 +123,19 @@
 		//"custom/left-arrow-dark",
 		//"user",
 		//"idle_inhibitor",
+		"temperature",
 		"custom/left-arrow-light",
 		"custom/left-arrow-dark",
+		"battery",
+		"custom/left-arrow-light",
+		//"custom/left-arrow-dark",
+		"backlight",
+		//"custom/left-arrow-light",
+		"custom/left-arrow-dark",
+		//"user",
+		//"idle_inhibitor",
+		//"custom/left-arrow-light",
+		//"custom/left-arrow-dark",
 		"tray"
 	],
 	 "temperature": {
@@ -139,8 +150,8 @@
 		"device": "intel_backlight",
 		"format": "{percent}% {icon}",
 		"format-icons": ["", ""],
-		"on-scroll-down": "sudo ~/bin/brightness /sys/class/backlight/intel_backlight/brightness down 10",
-		"on-scroll-up": "sudo ~/bin/brightness /sys/class/backlight/intel_backlight/brightness up 10"
+		"on-scroll-down": "sudo ~/bin/brightness /sys/class/backlight/intel_backlight/brightness down 1212",
+		"on-scroll-up": "sudo ~/bin/brightness /sys/class/backlight/intel_backlight/brightness up 1212"
 	},
 	"custom/poweroff": {
 		"tooltip": false,

.config/waybar/style.css

@@ -11,6 +11,7 @@ window#waybar {
 #custom-right-arrow-dark,
 #custom-left-arrow-dark {
 	color: #1a1a1a;
+	background: #292b2e;
 }
 #custom-right-arrow-light,
 #custom-left-arrow-light {
@@ -99,6 +100,10 @@ window#waybar {
 	padding: 0 10px;
 }
 
+#backlight{
+	min-width: 100px;
+}
+
 #backlight-slider slider {
     min-height: 80px;
     min-width: 10px;