update waybar and hypr, add quickshell

configs/hyprland/hypr/autostart.conf

@@ -5,5 +5,8 @@ exec-once = hypridle
 exec-once = waybar
 exec-once = swaync
 
+# Виджеты / Widgets
+exec-once = qs -p /etc/ximperdistro/hyprland/quickshell/volume-osd.qml
+
 # Буфер обмена / clipboard
 exec-once = clipse -listen

configs/hyprland/hypr/binds.conf

 binds {
 	workspace_back_and_forth = false
 	workspace_center_on = 1
+	hide_special_on_workspace_change = true
 }
 
 #---------- ЗАПУСК ПРИЛОЖЕНИЙ ---- LAUNCHING APPLICATIONS
@@ -25,11 +26,11 @@ bind = $mainMod, B, exec, pkill -SIGUSR2 waybar
 bind = $mainMod CTRL, B, exec, pkill waybar || waybar
 
 # Скриншот монитора / Screenshot of the monitor
-bind = , Print, exec, hyprshot -m output -z --raw | swappy -f -
+bind = , Print, exec, ximpershot -m output --swappy
 # Скриншот региона / Screenshot of the region
-bind = $mainMod, Print, exec, hyprshot -m region -z --raw | swappy -f -
+bind = $mainMod, Print, exec, ximpershot -m region --swappy
 # Скриншот окна / Screenshot of the window
-bind = SHIFT, Print, exec, hyprshot -m window -z --raw | swappy -f -
+bind = SHIFT, Print, exec, ximpershot -m window --swappy
 
 #---------- УПРАВЛЕНИЕ ГРОМКОСТЬЮ ---- VOLUME CONTROL
 binde= , XF86AudioRaiseVolume, exec, wpctl set-volume -l 1.0 @DEFAULT_AUDIO_SINK@ 5%+
@@ -53,7 +54,8 @@ binde= , XF86Explorer, exec, $filemanager
 binde= , XF86Tools, exec, $filemanager
 
 binde= , XF86Lock, exec, loginctl lock-session
-binde= , XF86LogOff, exec, loginctl terminate-user $(id -u) 
+binde= , XF86LogOff, exec, loginctl terminate-user $(id -u)
+binde= , XF86PowerOff, exec, systemctl poweroff
 
 #---------- ПЕРЕКЛЮЧЕНИЕ ФОКУСА ---- SWITCHING THE FOCUS
 bind = $mainMod, left, movefocus, l

configs/hyprland/hypr/hyprlock.conf

@@ -94,6 +94,7 @@ input-field {
     position = 0, -25
     halign = center
     valign = center
+    fail_text = $PAMFAIL
 	shadow_passes = 3
 	shadow_size = 2
 	shadow_color = rgb(29, 32, 47)

configs/hyprland/hypr/input.conf

@@ -10,6 +10,6 @@ input {
         drag_lock = true
     }
 
-	numlock_by_default = false
+	numlock_by_default = true
     sensitivity = 0.0
 }

configs/hyprland/hypr/misc.conf

@@ -16,7 +16,7 @@ render {
 
 cursor {
 	sync_gsettings_theme = true
-	no_hardware_cursors = 1
+	no_hardware_cursors = 2
 	hotspot_padding = 1
 	persistent_warps = true
 	zoom_factor = 1.0

configs/hyprland/kitty/config.conf

@@ -94,7 +94,7 @@ color14              #9ceeff
 color7               #d3d8e0
 color15              #e6ebf1
 
-background_opacity 0.70
+background_opacity 0.7
 
 # Сочетания клавиш / Keyboard shortcuts
 map kitty_mod+t     new_tab

configs/hyprland/quickshell/volume-osd.qml

+import QtQuick
+import QtQuick.Layouts
+import Quickshell
+import Quickshell.Services.Pipewire
+import Quickshell.Widgets
+
+Scope {
+	id: root
+
+	PwObjectTracker {
+		objects: [ Pipewire.defaultAudioSink ]
+	}
+
+	Connections {
+		target: Pipewire.defaultAudioSink?.audio
+
+		function onVolumeChanged() {
+			root.shouldShowOsd = true;
+			hideTimer.restart();
+		}
+	}
+
+	property bool shouldShowOsd: false
+
+	Timer {
+		id: hideTimer
+		interval: 1000
+		onTriggered: root.shouldShowOsd = false
+	}
+
+	LazyLoader {
+		active: root.shouldShowOsd
+
+		PanelWindow {
+			anchors.bottom: true
+			margins.bottom: screen.height / 20
+
+			implicitWidth: 300
+			implicitHeight: 40
+			color: "transparent"
+			
+			mask: Region {}
+
+			Rectangle {
+				anchors.fill: parent
+				radius: height / 2
+				color: "#900B0E1D"
+
+				RowLayout {
+					anchors {
+						fill: parent
+						leftMargin: 10
+						rightMargin: 10
+					}
+
+					Rectangle {
+						Layout.fillWidth: true
+
+						implicitHeight: 10
+						radius: 20
+						color: "#40D8E2EA"
+
+						Rectangle {
+							anchors {
+								left: parent.left
+								top: parent.top
+								bottom: parent.bottom
+							}
+
+							implicitWidth: parent.width * (Pipewire.defaultAudioSink?.audio.volume ?? 0)
+							radius: parent.radius
+						}
+					}
+				}
+			}
+		}
+	}
+}

configs/hyprland/waybar/extra-modules.json

@@ -3,6 +3,18 @@
 		"format": "{title}",
 		"icon": "true"
 	},
+
+	"cpu": {
+	     "interval": 1,
+	     "format": "{usage}% ",
+	     "tooltip-format": "{usage}"
+	},
+
+	"memory": {
+	    "interval": 1,
+	    "format": "{}% ",
+	    "tooltip-format": "memory: {used:0.1f}/{total:0.1f} GiB \nSWAP: {swapUsed:0.1f}/{swapTotal:0.1f} GiB"
+	},
 	
     "custom/media": {
         "format": "{icon} {0}",

configs/hyprland/waybar/modules.json

@@ -21,7 +21,7 @@
     "tray": {
     	"icon-size": 15,
     	"show-passive-items": true,
-    	"spacing": 10
+    	"spacing": 8
    	},
 
     "hyprland/submap": {
@@ -31,7 +31,6 @@
     	"default-submap": "reset",
     },
 
-
 	"custom/media-mini": {
 		"format": "{icon} {0}",
 		"return-type": "json",
@@ -46,8 +45,6 @@
         "on-scroll-down": "playerctl previous"
 	},
 
-
-
     "idle_inhibitor": {
         "format": "{icon}",
         "format-icons": {
@@ -80,14 +77,14 @@
                 " "
             ]
     	},
-            "on-click": "hyprctl dispatch exec '[size 530 350; move 100%-550 4%]' pwvucontrol",
+            "on-click": "hyprctl dispatch exec '[size 820 400; move 100%-840 4%]' pwvucontrol",
             "on-click-right": "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"
 	},
      "pulseaudio#microphone": {
         "format": "{format_source}",
         "format-source": " {volume}%",
         "format-source-muted": " ",
-        "on-click": "hyprctl dispatch exec '[size 530 350; move 100%-550 4%]' pwvucontrol",
+        "on-click": "hyprctl dispatch exec '[size 820 400; move 100%-840 4%]' pwvucontrol",
         "on-click-right": "wpctl set-mute @DEFAULT_SOURCE@ toggle",
         "on-scroll-up": "wpctl set-volume @DEFAULT_SOURCE@ 10%+ -l 1.0",
 		"on-scroll-down": "wpctl set-volume @DEFAULT_SOURCE@ 10%- -l 1.0",
@@ -128,7 +125,7 @@
         "tooltip-format-off": "󰂳 Выключено",
         "tooltip-format-connected": "{device_enumerate}",
         "tooltip-format-enumerate-connected": " {device_alias} 󰂄{device_battery_percentage}%",
-        "on-click-right": "hyprctl dispatch exec '[size 930 600; move 100%-950 4%]' overskride"
+        "on-click-right": "hyprctl dispatch exec '[size 530 350; move 100%-550 4%]' blueman-manager"
     },
 
     "battery": {

configs/hyprland/waybar/style-dark.css

@@ -12,19 +12,20 @@ window#waybar {
 #image,
 #workspaces,
 #tray,
-#window,
-#custom-media,
+#submap,
+#custom-media-mini,
 #idle_inhibitor,
-#custom-theme,
 #language,
-#submap,
 #volume,
-#notification,
 #network,
 #bluetooth,
 #battery,
 #backlight,
-#custom-media-mini, 
+#notification,
+#memory,
+#window,
+#cpu,
+#custom-media,
 #custom-ddclight {
     background-color: @bg;
 	min-height: 0;
@@ -43,15 +44,6 @@ window#waybar {
 	background-color: @selected_bg;
 }
 
-#custom-theme {
-	padding: 0px 15px;
-	font-size: 13px;
-}
-#custom-theme:hover {
-	color: @selected_text;
-	background-color: @selected_bg;
-}
-
 #workspaces {
 	padding: 0px 6px;
 	background-color: @bg;
@@ -102,26 +94,12 @@ window#waybar {
 	background-color: @bg;
 }
 
-#window {
-	padding: 0px 10px;
-	background-color: @bg;
-	border: none;
-}
-#window:hover {
-	color: @selected_text;
-	background-color: @selected_bg;
-}
-
-window#waybar.empty #window {
-    background-color: transparent;
-}
-
 #custom-media,
-#custom-media-mini {
+#custom-media-mini {      /* extra */
 	padding: 0px 15px;
 }
 #custom-media:hover,
-#custom-media-mini:hover {
+#custom-media-mini:hover {      /* extra */
 	color: @selected_text;
 	background-color: @selected_bg;
 }
@@ -235,7 +213,28 @@ tooltip label {
 	color: @text
 }
 
+/* extra */
+
+#window {
+	padding: 0px 10px;
+	background-color: @bg;
+	border: none;
+}
+#window:hover {
+	color: @selected_text;
+	background-color: @selected_bg;
+}
+window#waybar.empty #window {
+    background-color: transparent;
+}
+
+#cpu {
+	padding: 0px 15px
+}
 
+#memory {
+	padding: 0px 15px
+}
 
 #custom-ddclight {
 	padding: 0px 15px;

configs/hyprland/waybar/style.css

@@ -9,23 +9,24 @@ window#waybar {
 	background: none;
 }
 
-
 #image,
 #workspaces,
 #tray,
-#window,
-#custom-media,
+#submap,
 #custom-media-mini,
 #idle_inhibitor,
-#custom-theme,
 #language,
-#submap,
 #volume,
-#notification,
 #network,
 #bluetooth,
 #battery,
-#backlight {
+#backlight,
+#notification,
+#memory,
+#window,
+#cpu,
+#custom-media,
+#custom-ddclight {
     background-color: @bg;
 	min-height: 0;
 	border-radius: 15px;
@@ -43,15 +44,6 @@ window#waybar {
 	background-color: @selected_bg;
 }
 
-#custom-theme {
-	padding: 0px 15px;
-	font-size: 15px;
-}
-#custom-theme:hover {
-	color: @selected_text;
-	background-color: @selected_bg;
-}
-
 #workspaces {
 	padding: 0px 6px;
 	background-color: @bg;
@@ -102,34 +94,16 @@ window#waybar {
 	background-color: @bg;
 }
 
-#window {
-	padding: 0px 10px;
-	background-color: @bg;
-	border: none;
-}
-#window:hover {
-	color: @selected_text;
-	background-color: @selected_bg;
-}
-
-window#waybar.empty #window {
-    background-color: transparent;
-}
-
-
-
 #custom-media,
-#custom-media-mini {
+#custom-media-mini {      /* extra */
 	padding: 0px 15px;
 }
 #custom-media:hover,
-#custom-media-mini:hover {
+#custom-media-mini:hover {      /* extra */
 	color: @selected_text;
 	background-color: @selected_bg;
 }
 
-
-
 #idle_inhibitor {
 	padding: 0px 15px;
 	font-size: 12px;
@@ -165,16 +139,13 @@ window#waybar.empty #window {
 	border-radius: 0px 12px 12px 0px;
 	padding: 0px 14px 0px 7px;
 }
-
 #pulseaudio:hover {
 	color: @selected_text;
 	background-color: @selected_bg;
 }
-
 #pulseaudio.volume.muted {
 	color: @unfocused;
 }
-
 #pulseaudio.microphone.source-muted {
 	color: @unfocused;
 }
@@ -211,6 +182,7 @@ window#waybar.empty #window {
 	background-color: @selected_bg;
 }
 
+
 #clock {
 	margin: 2px 0px 2px 0px;
 	border-radius: 12px 0px 0px 12px;
@@ -237,7 +209,38 @@ tooltip {
 	background: alpha(@bg, 0.80);
 	color: @text
 }
-
 tooltip label {
 	color: @text
 }
+
+/* extra */
+
+#window {
+	padding: 0px 10px;
+	background-color: @bg;
+	border: none;
+}
+#window:hover {
+	color: @selected_text;
+	background-color: @selected_bg;
+}
+window#waybar.empty #window {
+    background-color: transparent;
+}
+
+#cpu {
+	padding: 0px 15px
+}
+
+#memory {
+	padding: 0px 15px
+}
+
+#custom-ddclight {
+	padding: 0px 15px;
+	font-size: 13px;
+}
+#custom-ddclight:hover {
+	color: @selected_text;
+	background-color: @selected_bg;
+}