1-11-25

dot-config/hypr/bin/autostart

@@ -2,7 +2,7 @@
 
 dbus-update-activation-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=Hyprland &
 waybar -c ~/.config/waybar/waybar.jsonc -s ~/.config/waybar/waybar.css &
-hyprwall -r &
+swww-daemon &
 hypridle -c ~/.config/hypr/hypridle.conf &
 /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 &
 mako -c ~/.config/mako/mako.conf &

dot-config/hypr/colors.conf

@@ -1,5 +1,84 @@
-$primary = rgb(89b4fa)
+
-$secondary = rgb(313244)
+$rosewater = rgb(f5e0dc)
-$bg = rgb(1e1e2e)
+$rosewaterAlpha = f5e0dc
-$fg = rgb(363a4f)
+
+$flamingo = rgb(f2cdcd)
+$flamingoAlpha = f2cdcd
+
+$pink = rgb(f5c2e7)
+$pinkAlpha = f5c2e7
+
+$mauve = rgb(cba6f7)
+$mauveAlpha = cba6f7
+
+$red = rgb(f38ba8)
+$redAlpha = f38ba8
+
+$maroon = rgb(eba0ac)
+$maroonAlpha = eba0ac
+
+$peach = rgb(fab387)
+$peachAlpha = fab387
+
+$yellow = rgb(f9e2af)
+$yellowAlpha = f9e2af
+
+$green = rgb(a6e3a1)
+$greenAlpha = a6e3a1
+
+$teal = rgb(94e2d5)
+$tealAlpha = 94e2d5
+
+$sky = rgb(89dceb)
+$skyAlpha = 89dceb
+
+$sapphire = rgb(74c7ec)
+$sapphireAlpha = 74c7ec
+
+$blue = rgb(89b4fa)
+$blueAlpha = 89b4fa
+
+$lavender = rgb(b4befe)
+$lavenderAlpha = b4befe
+
+$text = rgb(cdd6f4)
+$textAlpha = cdd6f4
+
+$subtext1 = rgb(bac2de)
+$subtext1Alpha = bac2de
+
+$subtext0 = rgb(a6adc8)
+$subtext0Alpha = a6adc8
+
+$overlay2 = rgb(9399b2)
+$overlay2Alpha = 9399b2
+
+$overlay1 = rgb(7f849c)
+$overlay1Alpha = 7f849c
+
+$overlay0 = rgb(6c7086)
+$overlay0Alpha = 6c7086
+
+$surface2 = rgb(585b70)
+$surface2Alpha = 585b70
+
+$surface1 = rgb(45475a)
+$surface1Alpha = 45475a
+
+$surface0 = rgb(313244)
+$surface0Alpha = 313244
+
+$base = rgb(1e1e2e)
+$baseAlpha = 1e1e2e
+
+$mantle = rgb(181825)
+$mantleAlpha = 181825
+
+$crust = rgb(11111b)
+$crustAlpha = 11111b
+
+$primary = $blue
+$secondary = $surface0
+$bg = $base
+$fg = $text
 

dot-config/hypr/decorations.conf

@@ -15,7 +15,7 @@ decoration {
     dim_strength = 0.2
 
     blur {
-        enabled = true
+        enabled = false
         size = 3
         passes = 4
         noise = 0.07
@@ -29,12 +29,10 @@ animations {
     enabled = true
     bezier = myBezier, 0.05, 0.9, 0.1, 1.05
 
-    animation = windows, 1, 7, myBezier
+    animation = windows, 1, 7, myBezier, slide
-    animation = windowsOut, 1, 7, myBezier, popin 80%
-    animation = border, 1, 10, myBezier
-    animation = borderangle, 1, 8, myBezier
     animation = fade, 1, 7, myBezier
     animation = workspaces, 1, 6, myBezier
+    animation = layers, 1, 6, myBezier, slide bottom
 }
 
 dwindle {

dot-config/hypr/hyprland.conf

@@ -2,7 +2,7 @@ source = colors.conf
 
 $terminal    = alacritty
 $fileManager = nemo
-$menu        = ~/.cargo/bin/hyprlauncher
+$menu        = rofi -show drun
 $browser     = firefox
 $discord     = vesktop
 $telegram    = telegram-desktop

dot-config/hypr/hyprlock.conf

@@ -1,40 +1,49 @@
-source = appearance.conf
+source = colors.conf
 
 # BACKGROUND
 background {
-    monitor = DSI-1
+    monitor =
-    path = /home/tx0/Pictures/Wallpapers/galaktika_zvezdy_nebo_temnyj_tumannost_101228_2560x1440.jpg
+    path = ~/Pictures/adwaita1-0.png
-    blur_passes = 3
+    blur_passes = 5
-    contrast = 0.8916
+    contrast = 0.5
-    brightness = 0.8172
+    brightness = 0.5
-    vibrancy = 0.1696
+    vibrancy = 0.2
-    vibrancy_darkness = 0.0
+    vibrancy_darkness = 0.2
 }
 
 # GENERAL
 general {
     no_fade_in = false
     grace = 0
-    disable_loading_bar = true
+    disable_loading_bar = false
 }
 
+# animations {
+#     enabled = true
+#     bezier = linear, 1, 1, 0, 0
+#     animation = fade, 1, 1.8, linear, slide
+# }
+
 # INPUT FIELD
 input-field {
     monitor = DSI-1
-    size = 200, 40
+    size = 300, 80
-    outline_thickness = 2
+    outline_thickness = 3
     dots_size = 0.2 # Scale of input-field height, 0.2 - 0.8
-    dots_spacing = 0.2 # Scale of dots' absolute size, 0.0 - 1.0
+    dots_spacing = 0.4 # Scale of dots' absolute size, 0.0 - 1.0
     dots_center = true
-    outer_color = rgba(0, 0, 0, 0)
+    outer_color = rgba(00000000)
-    inner_color = rgba(0, 0, 0, 0.5)
+    inner_color = rgba(00000033)
-    font_color = $fg
+    check_color = rgba($yellowAlpha8f)
+    fail_color =  rgba($redAlpha8f)
+    fail_timeout = 1000
+    font_color = rgba($textAlphaee)
     fade_on_empty = false
     placeholder_text =
     hide_input = false
-    position = 0, -650 #-120
+    position = 0, 80
     halign = center
-    valign = center
+    valign = bottom
 }
 
 # TIME
@@ -43,21 +52,8 @@ label {
     text = cmd[update:1000] echo "$(date +"%H:%M")"
     color = $fg
     font_size = 240
-    font_family = eurofurence
+    font_family = Cantarell Thin
-    position = 0, -300
+    position = 0, 100
-    halign = center
-    valign = top
-}
-
-# USER
-label {
-    monitor = DSI-1
-    text = Enter your password
-    color = $fg
-    font_size = 14
-    font_family = eurofurence
-    position = 0, -690 # -40
     halign = center
     valign = center
-
 }

dot-config/hypr/monitors.conf

@@ -6,8 +6,8 @@ monitor=DSI-1, 1600x2560@120, 0x0, 1.6, transform, 3
 
 render {
 	explicit_sync = 0
-	explicit_sync_kms = 0
+	explicit_sync_kms = 1
-	direct_scanout = false
+	direct_scanout = true
 }
 
 cursor {

dot-config/hypr/plugins.conf

@@ -1,45 +1,60 @@
-chromakey_background = 30,30,46
+# chromakey_background = 30,30,46
-# chromakey_background = 36,36,56
+# # chromakey_background = 36,36,56
 plugin {
-    touch_gestures {
+#     touch_gestures {
-        # The default sensitivity is probably too low on tablet screens,
+#         # The default sensitivity is probably too low on tablet screens,
-        # I recommend turning it up to 4.0
+#         # I recommend turning it up to 4.0
-        sensitivity = 4.0
+#         sensitivity = 4.0
-        
+#         
-        # must be >= 3
+#         # must be >= 3
-        workspace_swipe_fingers = 3
+#         workspace_swipe_fingers = 3
-        
+#         
-        # switching workspaces by swiping from an edge, this is separate from workspace_swipe_fingers
+#         # switching workspaces by swiping from an edge, this is separate from workspace_swipe_fingers
-        # and can be used at the same time
+#         # and can be used at the same time
-        # possible values: l, r, u, or d
+#         # possible values: l, r, u, or d
-        # to disable it set it to anything else
+#         # to disable it set it to anything else
-        workspace_swipe_edge = u
+#         workspace_swipe_edge = u
-        
+#         
-        # in milliseconds
+#         # in milliseconds
-        long_press_delay = 400
+#         long_press_delay = 400
-        
+#         
-        # resize windows by long-pressing on window borders and gaps.
+#         # resize windows by long-pressing on window borders and gaps.
-        # If general:resize_on_border is enabled, general:extend_border_grab_area is used for floating
+#         # If general:resize_on_border is enabled, general:extend_border_grab_area is used for floating
-        # windows
+#         # windows
-        resize_on_border_long_press = true
+#         resize_on_border_long_press = true
-        
+#         
-        # in pixels, the distance from the edge that is considered an edge
+#         # in pixels, the distance from the edge that is considered an edge
-        edge_margin = 100
+#         edge_margin = 100
-        
+#         
-        experimental {
+#         experimental {
-            # send proper cancel events to windows instead of hacky touch_up events,
+#             # send proper cancel events to windows instead of hacky touch_up events,
-            # NOT recommended as it crashed a few times, once it's stabilized I'll make it the default
+#             # NOT recommended as it crashed a few times, once it's stabilized I'll make it the default
-            send_cancel = 1
+#             send_cancel = 1
+#         }
+#     }
+    hyprbars {
+        bar_height = 30
+        bar_blur = false
+        bar_color = rgba(1e1e2eff)
+        col.text = rgb(cdd6f4)
+        bar_title_enabled = true
+        bar_text_font = Cantarell
+        bar_text_size = 12
+        bar_buttons_alignment = left
+        bar_part_of_window = true
+        hyprbars-button = rgb(f38ba8), 13, , hyprctl dispatch killactive
+        hyprbars-button = rgb(fab387), 13, , hyprctl dispatch togglefloating
+        bar_button_padding = 10
+        bar_padding = 10
     }
 }
-}
+# hyprgrass-bind  = , swipe:3:u, exec, $menu
-hyprgrass-bind  = , swipe:3:u, exec, $menu
+# hyprgrass-bind  = , tap:3,     killactive
-hyprgrass-bind  = , tap:3,     killactive
+# hyprgrass-bind  = , tap:2,     togglefloating
-hyprgrass-bind  = , tap:2,     togglefloating
+# hyprgrass-bind  = , edge:d:u,  exec, killall -34 wvkbd-mobintl
-hyprgrass-bind  = , edge:d:u,  exec, killall -34 wvkbd-mobintl
+# hyprgrass-bind  = , edge:l:u,  exec, brightnessctl set 5%+
-hyprgrass-bind  = , edge:l:u,  exec, brightnessctl set 5%+
+# hyprgrass-bind  = , edge:l:d,  exec, brightnessctl set 5%-
-hyprgrass-bind  = , edge:l:d,  exec, brightnessctl set 5%-
+# hyprgrass-bind  = , edge:l:r,  togglesplit
-hyprgrass-bind  = , edge:l:r,  togglesplit
+# 
-
+# hyprgrass-bindm = , longpress:2, movewindow
-hyprgrass-bindm = , longpress:2, movewindow
+# hyprgrass-bindm = , longpress:3, resizewindow
-hyprgrass-bindm = , longpress:3, resizewindow

dot-config/hypr/rules.conf

@@ -4,7 +4,7 @@
 
 # Waybar
 # layerrule = blur,                       waybar
-# layerrule = ignorezero,                 waybar
+layerrule = ignorezero,                 waybar
 
 # Mako
 layerrule = blur,                       notifications
@@ -21,8 +21,7 @@ windowrulev2 = suppressevent maximize, class:.*
 windowrulev2 = float,         class:^(org.pulseaudio.pavucontrol)$
 windowrulev2 = size 696 570,  class:^(org.pulseaudio.pavucontrol)$
 windowrulev2 = move 711 376,  class:^(org.pulseaudio.pavucontrol)$
-windowrulev2 = monitor DP-1,  class:^(org.pulseaudio.pavucontrol)$
+windowrulev2 = monitor DSI-1,  class:^(org.pulseaudio.pavucontrol)$
-windowrulev2 = opacity 0.9,   class:^(org.pulseaudio.pavucontrol)$
 
 # XWayland Video Bridge - Unused
 # windowrulev2 = opacity 0.0 override,class:^(xwaylandvideobridge)$
@@ -52,5 +51,5 @@ windowrulev2 = opacity 0.9,   class:^(Spotify)$
 
 windowrulev2 = noblur,        class:^()$,title:^()$
 
-windowrulev2 = plugin:chromakey,fullscreen:0
+# windowrulev2 = plugin:chromakey,fullscreen:0
-windowrulev2 = opacity 0.999,fullscreen:0
+# windowrulev2 = opacity 0.999,fullscreen:0

dot-config/mako/mako.conf

@@ -1,10 +1,10 @@
 sort=-time
 layer=overlay
-output=DP-1
+output=eDP-1
-anchor=top-right
+anchor=bottom-right
 background-color=#121318bb
 text-color=#cdd6f4
-outer-margin=10,2
+outer-margin=30,2
 width=300
 height=110
 border-size=3
@@ -14,7 +14,7 @@ icons=0
 max-icon-size=64
 default-timeout=5000
 ignore-timeout=1
-font=JetBrainsMono Nerd Font Mono: 14
+font=Cantarell: 14
 
 [urgency=high]
 border-color=#ffb4ab

dot-config/nvim/lua/chadrc.lua

@@ -3,17 +3,46 @@
 
 ---@type ChadrcConfig
 local M = {}
+
 M = {
     base46 = {
         theme = "catppuccin",
         transparency = true
+    },
+    
+    ui = {
+            statusline = {
+            theme = "minimal",
+            separator_style = "round",
+            order = { "mode", "file", "git",  "%=", "cwd"},
+        }
+    },
+
+    nvdash = {
+        load_on_startup = true,
+        header = {
+            "                            ",
+            "     ▄▄         ▄ ▄▄▄▄▄▄▄   ",
+            "   ▄▀███▄     ▄██ █████▀    ",
+            "   ██▄▀███▄   ███           ",
+            "   ███  ▀███▄ ███           ",
+            "   ███    ▀██ ███           ",
+            "   ███      ▀ ███           ",
+            "   ▀██ █████▄▀█▀▄██████▄    ",
+            "     ▀ ▀▀▀▀▀▀▀ ▀▀▀▀▀▀▀▀▀▀   ",
+            "                            ",
+            "                            ",
+        },
+        buttons = {
+            { txt = "  Find File", keys = "ff", cmd = "Telescope find_files" },
+            { txt = "  Recent Files", keys = "fo", cmd = "Telescope oldfiles" },
+            { txt = "󰈭  Find Word", keys = "fw", cmd = "Telescope live_grep" },
+            { txt = "󰈆  Exit", keys = ":q!", cmd = "q!" },
+        }
     }
 	-- hl_override = {
 	-- 	Comment = { italic = true },
 	-- 	["@comment"] = { italic = true },
 	-- },
 }
-if vim.g.neovide then
-    M.base46.transparency = false
-end
 return M

dot-config/rofi/config.rasi

@@ -1,181 +1,16 @@
-/**
- *
- * Author : Aditya Shakya (adi1090x)
- * Github : @adi1090x
- * 
- * Configuration For Rofi Version: 1.7.3
- **/
-
 configuration{
-	/*---------- General setting ----------*/
+    modi: "drun";
-	modi: "drun,run,filebrowser,window";
+    icon-theme: "Oranchelo";
-	case-sensitive: false;
-	cycle: true;
-	filter: "";
-	scroll-method: 0;
-	normalize-match: true;
     show-icons: true;
-	icon-theme: "Papirus";
+    terminal: "alacritty";
-/*	cache-dir: ;*/
+    drun-display-format: "{icon} {name}";
-	steal-focus: false;
+    location: 6;
-/*	dpi: -1;*/
-
-	/*---------- Matching setting ----------*/
-	matching: "normal";
-	tokenize: true;
-
-	/*---------- SSH settings ----------*/
-	ssh-client: "ssh";
-	ssh-command: "{terminal} -e {ssh-client} {host} [-p {port}]";
-	parse-hosts: true;
-	parse-known-hosts: true;
-
-	/*---------- Drun settings ----------*/
-	drun-categories: "";
-	drun-match-fields: "name,generic,exec,categories,keywords";
-	drun-display-format: "{name} [<span weight='light' size='small'><i>({generic})</i></span>]";
-	drun-show-actions: false;
-	drun-url-launcher: "xdg-open";
-	drun-use-desktop-cache: false;
-	drun-reload-desktop-cache: false;
-	drun {
-		/** Parse user desktop files. */
-		parse-user:   true;
-		/** Parse system desktop files. */
-		parse-system: true;
-    }
-
-	/*---------- Run settings ----------*/
-	run-command: "{cmd}";
-	run-list-command: "";
-	run-shell-command: "{terminal} -e {cmd}";
-
-	/*---------- Fallback Icon ----------*/
-	run,drun {
-		fallback-icon: "application-x-addon";
-	}
-
-	/*---------- Window switcher settings ----------*/
-	window-match-fields: "title,class,role,name,desktop";
-	window-command: "wmctrl -i -R {window}";
-	window-format: "{w} - {c} - {t:0}";
-	window-thumbnail: false;
-
-	/*---------- Combi settings ----------*/
-/*	combi-modi: "window,run";*/
-/*	combi-hide-mode-prefix: false;*/
-/*	combi-display-format: "{mode} {text}";*/
-
-	/*---------- History and Sorting ----------*/
     disable-history: false;
-	sorting-method: "normal";
+    hide-scrollbar: true;
-	max-history-size: 25;
+    display-drun: "   Apps ";
-
+    display-Network: " 󰤨  Network";
-	/*---------- Display setting ----------*/
+    sidebar-mode: true;
-	display-window: "Windows";
-	display-windowcd: "Window CD";
-	display-run: "Run";
-	display-ssh: "SSH";
-	display-drun: "Apps";
-	display-combi: "Combi";
-	display-keys: "Keys";
-	display-filebrowser: "Files";
-
-	/*---------- Misc setting ----------*/
-	terminal: "rofi-sensible-terminal";
-	font: "Mono 12";
-	sort: false;
-	threads: 0;
-	click-to-exit: true;
-/*	ignored-prefixes: "";*/
-/*	pid: "/run/user/1000/rofi.pid";*/
-
-	/*---------- File browser settings ----------*/
-    filebrowser {
-/*	  directory: "/home";*/
-      directories-first: true;
-      sorting-method:    "name";
 }
 
-	/*---------- Other settings ----------*/
+@theme "catppuccin-mocha"
-    timeout {
-      action: "kb-cancel";
-      delay:  0;
-    }
 
-	/*---------- Keybindings ----------*/
-/*
-	kb-primary-paste: "Control+V,Shift+Insert";
-	kb-secondary-paste: "Control+v,Insert";
-	kb-clear-line: "Control+w";
-	kb-move-front: "Control+a";
-	kb-move-end: "Control+e";
-	kb-move-word-back: "Alt+b,Control+Left";
-	kb-move-word-forward: "Alt+f,Control+Right";
-	kb-move-char-back: "Left,Control+b";
-	kb-move-char-forward: "Right,Control+f";
-	kb-remove-word-back: "Control+Alt+h,Control+BackSpace";
-	kb-remove-word-forward: "Control+Alt+d";
-	kb-remove-char-forward: "Delete,Control+d";
-	kb-remove-char-back: "BackSpace,Shift+BackSpace,Control+h";
-	kb-remove-to-eol: "Control+k";
-	kb-remove-to-sol: "Control+u";
-	kb-accept-entry: "Control+j,Control+m,Return,KP_Enter";
-	kb-accept-custom: "Control+Return";
-	kb-accept-custom-alt: "Control+Shift+Return";
-	kb-accept-alt: "Shift+Return";
-	kb-delete-entry: "Shift+Delete";
-	kb-mode-next: "Shift+Right,Control+Tab";
-	kb-mode-previous: "Shift+Left,Control+ISO_Left_Tab";
-	kb-mode-complete: "Control+l";
-	kb-row-left: "Control+Page_Up";
-	kb-row-right: "Control+Page_Down";
-	kb-row-down: "Down,Control+n";
-	kb-page-prev: "Page_Up";
-	kb-page-next: "Page_Down";
-	kb-row-first: "Home,KP_Home";
-	kb-row-last: "End,KP_End";
-	kb-row-select: "Control+space";
-	kb-screenshot: "Alt+S";
-	kb-ellipsize: "Alt+period";
-	kb-toggle-case-sensitivity: "grave,dead_grave";
-	kb-toggle-sort: "Alt+grave";
-	kb-cancel: "Escape,Control+g,Control+bracketleft";
-	kb-custom-1: "Alt+1";
-	kb-custom-2: "Alt+2";
-	kb-custom-3: "Alt+3";
-	kb-custom-4: "Alt+4";
-	kb-custom-5: "Alt+5";
-	kb-custom-6: "Alt+6";
-	kb-custom-7: "Alt+7";
-	kb-custom-8: "Alt+8";
-	kb-custom-9: "Alt+9";
-	kb-custom-10: "Alt+0";
-	kb-custom-11: "Alt+exclam";
-	kb-custom-12: "Alt+at";
-	kb-custom-13: "Alt+numbersign";
-	kb-custom-14: "Alt+dollar";
-	kb-custom-15: "Alt+percent";
-	kb-custom-16: "Alt+dead_circumflex";
-	kb-custom-17: "Alt+ampersand";
-	kb-custom-18: "Alt+asterisk";
-	kb-custom-19: "Alt+parenleft";
-	kb-select-1: "Super+1";
-	kb-select-2: "Super+2";
-	kb-select-3: "Super+3";
-	kb-select-4: "Super+4";
-	kb-select-5: "Super+5";
-	kb-select-6: "Super+6";
-	kb-select-7: "Super+7";
-	kb-select-8: "Super+8";
-	kb-select-9: "Super+9";
-	kb-select-10: "Super+0";
-	ml-row-left: "ScrollLeft";
-	ml-row-right: "ScrollRight";
-	ml-row-up: "ScrollUp";
-	ml-row-down: "ScrollDown";
-	me-select-entry: "MousePrimary";
-	me-accept-entry: "MouseDPrimary";
-	me-accept-custom: "Control+MouseDPrimary";
-*/
-}

dot-config/waybar/waybar.css

@@ -8,11 +8,11 @@
 }
 
 window#waybar {
-	background-color: @base;
+	background-color: @transparent;
 /* 	background: @base; */
 	transition-property: background-color;
 	transition-duration: .5s;
-	border-radius: 0px 0px 14px 14px;
+	border-radius: 0px;
 }
 
 #workspaces {
@@ -47,7 +47,7 @@ window#waybar {
 
 #custom-power, #custom-runner, #battery,
 #backlight, #wireplumber, #wireplumber.muted,
-#tray, #language, #clock {
+#tray, #language, #clock, #cpu, #memory {
     background: @mantle;
     border-radius: 14px;
     color: @text;
@@ -63,10 +63,22 @@ window#waybar {
     padding: 0px 10px;
 }
 
+#cpu, #memory {
+	padding: 0px 5px;
+}
+
+#cpu {
+    padding: 0px 10px;
+}
+
 #battery {
 	padding: 0px 10px;
 }
 
+#memory {
+    min-width: 60px
+}
+
 #tray {
     margin: 4px 2.5px 4px 5px;
 	padding: 0px 10px;
@@ -81,11 +93,13 @@ window#waybar {
 }
 
 #language {
-	padding: 0px 9px 0px 8px;
+	padding: 0px 11px 0px 10px;
+    min-width: 40px;
 }
 
 #clock {
 	padding: 0px 10px;
     margin: 4px 5px 4px 2.5px;
     font-size: 15px;
+    min-width: 40px;
 }

dot-config/waybar/waybar.jsonc

@@ -1,24 +1,36 @@
 {
-	"position": "top",
+    "position": "bottom",
     "height": 36,
-	"width": 900,
+    "width": 0,
     "spacing": 0,
-	"margin-bottom": -10,
+    "margin-top": -12,
+    "margin-bottom": 5,
+    "margin-left": 10,
+    "margin-right": 10,
     "layer": "top",
-	"modules-left": ["tray"],
+    "modules-left": [
-	"modules-center": ["hyprland/workspaces"],
+        "tray",
-	"modules-right": ["wireplumber", "backlight", "battery", "hyprland/language", "clock"],
+        "memory",
-	
+        "cpu"
+    ],
+    "modules-center": [
+        "hyprland/workspaces"
+    ],
+    "modules-right": [
+        "wireplumber",
+        "backlight",
+        "battery",
+        "hyprland/language",
+        "clock"
+    ],
     "custom/power": {
         "format": "",
         "on-click": "~/.config/hypr/bin/powermenu"
     },
-
     "custom/runner": {
         "format": "",
         "on-click": "hyprlauncher"
     },
-
     "hyprland/workspaces": {
         "format": "{name}",
         "on-click": "activate",
@@ -27,12 +39,10 @@
             "*": 1
         }
     },
-
     "tray": {
         "icon-size": 14,
         "spacing": 15
     },
-
     "battery": {
         "bat": "qcom-battery",
         "interval": 1,
@@ -42,34 +52,51 @@
         },
         "format": "{icon} {capacity}%",
         "format-charging": " {capacity}%",
-        "format-icons": ["", "", "", "", ""],
+        "format-icons": [
+            "",
+            "",
+            "",
+            "",
+            ""
+        ],
         "max-length": 25
     },
-
     "backlight": {
         "device": "ktz8866-backlight",
-		"format": " {percent}%"
+        "format": " {percent}%",
+        "on-scroll-up": "brightnessctl set 1%+",
+        "on-scroll-down": "brightnessctl set 1%-"
     },
-	
     "wireplumber": {
         "scroll-step": 2,
         "format": "{icon} {volume}%",
-		"format-icons":["", "", ""],
+        "format-icons": [
+            "",
+            "",
+            ""
+        ],
         "format-muted": " mute",
         "on-click": "pavucontrol",
         "max-volume": 100
     },
-
     "hyprland/language": {
         "format": " {}",
         "format-en": "Eng",
-		"format-ru": "Rus"
+        "format-ru": "Rus",
+        "on-click": "pkill -34 wvkbd-mobintl"
     },
-    
     "clock": {
         "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
         "format-alt": "{:%Y-%m-%d}",
         "format": "{:%H:%M}",
         "timezone": "Asia/Yekaterinburg"
+    },
+    "memory": {
+        "interval": 1,
+        "format": " {used:0.1f}G"
+    },
+    "cpu": {
+        "interval": 1,
+        "format": " {usage}%"
     }
 }