From 4cb09ff495511b68128e6c72cbc1ffa5fb45fd85 Mon Sep 17 00:00:00 2001
From: timoxa0 <tima012007@gmail.com>
Date: Tue, 31 Dec 2024 19:51:14 +0500
Subject: [PATCH] 31-12
---
dot-config/alacritty/alacritty.toml | 6 +-
dot-config/hypr/bin/autostart | 2 +-
dot-config/hypr/hyprland.conf | 2 +-
dot-config/hypr/rules.conf | 4 +-
dot-config/vesktop/settings.json | 2 +-
dot-config/waybar/mocha.css | 4 +-
dot-config/waybar/waybar.css | 30 ++++---
dot-config/waybar/waybar.jsonc | 134 ++++++++++++++--------------
8 files changed, 93 insertions(+), 91 deletions(-)
diff --git a/dot-config/alacritty/alacritty.toml b/dot-config/alacritty/alacritty.toml
index 55ba8af..d4dcc38 100644
--- a/dot-config/alacritty/alacritty.toml
+++ b/dot-config/alacritty/alacritty.toml
@@ -3,14 +3,14 @@
TERM = "xterm-256color"
[window]
-padding = { x = 20, y = 20 }
+padding = { x = 10, y = 10 }
dynamic_padding = true
-decorations = "None"
+decorations = "Full"
opacity = 1
[font]
normal = { family = "JetBrainsMono Nerd Font Mono", style = "Regular" }
-size = 16
+size = 14
[general]
live_config_reload = true
diff --git a/dot-config/hypr/bin/autostart b/dot-config/hypr/bin/autostart
index 2b12ca4..1ceaf88 100755
--- a/dot-config/hypr/bin/autostart
+++ b/dot-config/hypr/bin/autostart
@@ -3,7 +3,7 @@
dbus-update-activation-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=Hyprland &
gsettings set org.gnome.desktop.wm.preferences button-layout ':' &
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 &
diff --git a/dot-config/hypr/hyprland.conf b/dot-config/hypr/hyprland.conf
index 6f46892..c0d79ba 100644
--- a/dot-config/hypr/hyprland.conf
+++ b/dot-config/hypr/hyprland.conf
@@ -2,7 +2,7 @@ source = colors.conf
$terminal = alacritty
$fileManager = nautilus -w
-$menu = ~/.cargo/bin/hyprlauncher
+$menu = rofi -show drun
$browser = zen-browser
$discord = vesktop
$telegram = telegram-desktop
diff --git a/dot-config/hypr/rules.conf b/dot-config/hypr/rules.conf
index 9c9777a..cb2f35b 100644
--- a/dot-config/hypr/rules.conf
+++ b/dot-config/hypr/rules.conf
@@ -3,8 +3,8 @@
#
# Waybar
-layerrule = blur, waybar
-layerrule = ignorezero, waybar
+# layerrule = blur, waybar
+# layerrule = ignorezero, waybar
# Hyprlauncher
layerrule = blur, gtk4-layer-shell
diff --git a/dot-config/vesktop/settings.json b/dot-config/vesktop/settings.json
index 432e2c5..972f773 100644
--- a/dot-config/vesktop/settings.json
+++ b/dot-config/vesktop/settings.json
@@ -1,7 +1,7 @@
{
"discordBranch": "stable",
"minimizeToTray": true,
- "arRPC": false,
+ "arRPC": true,
"splashColor": "rgb(205, 214, 244)",
"splashBackground": "rgb(30, 30, 46)",
"staticTitle": true,
diff --git a/dot-config/waybar/mocha.css b/dot-config/waybar/mocha.css
index 48e8608..897e5e8 100644
--- a/dot-config/waybar/mocha.css
+++ b/dot-config/waybar/mocha.css
@@ -21,7 +21,7 @@
@define-color surface2 #585b70;
@define-color surface1 #45475a;
@define-color surface0 #313244;
-@define-color base rgba(30, 30, 46, 0.2);
+@define-color base rgb(30, 30, 46);
@define-color on-accent #1e1e2e;
-@define-color mantle rgba(24, 24, 37, 0.4);
+@define-color mantle rgb(24, 24, 37);
@define-color crust #11111b;
diff --git a/dot-config/waybar/waybar.css b/dot-config/waybar/waybar.css
index bca7037..57f40d2 100644
--- a/dot-config/waybar/waybar.css
+++ b/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: 14px 14px 0px 0px;
+ border-radius: 0px;
}
#workspaces {
@@ -34,24 +34,24 @@ window#waybar {
}
#workspaces button:hover {
background-color: @lavender;
- color: @on-accent;
+ color: @base;
}
#workspaces button.active {
background-color: @blue;
- color: @on-accent;
+ color: @base
}
#workspaces button.active:hover {
background-color: @blue;
- color: @on-accent;
+ color: @base;
}
#custom-power, #custom-runner, #battery,
#backlight, #wireplumber, #wireplumber.muted,
-#tray, #language, #clock, #custom-spotify {
- background: @mantle;
- border-radius: 14px;
- color: @text;
- margin: 4px 2.5px 4px 2.5px;
+#tray, #language, #clock, #cpu, #memory, #custom-spotify {
+ background: @mantle;
+ border-radius: 14px;
+ color: @text;
+ margin: 4px 2.5px 4px 2.5px;
}
#custom-power {
@@ -59,11 +59,11 @@ window#waybar {
padding: 0px 9px;
}
-#custom-spotify {
+#custom-runner {
padding: 0px 10px;
}
-#battery {
+#cpu, #memory, #custom-spotify, #battery {
padding: 0px 10px;
}
@@ -81,11 +81,13 @@ window#waybar {
}
#language {
- padding: 0px 9px 0px 8px;
+ padding: 0px 10px;
+ min-width: 40px;
}
#clock {
padding: 0px 10px;
margin: 4px 5px 4px 2.5px;
- font-size: 14px;
+ font-size: 15px;
+ min-width: 40px;
}
diff --git a/dot-config/waybar/waybar.jsonc b/dot-config/waybar/waybar.jsonc
index ab9bfd7..121f477 100644
--- a/dot-config/waybar/waybar.jsonc
+++ b/dot-config/waybar/waybar.jsonc
@@ -1,75 +1,75 @@
{
- "position": "bottom",
- "height": 34,
- "width": 1000,
- "spacing": 0,
- "layer": "top",
- "margin-top": -15,
- "modules-left": ["tray", "custom/spotify"],
- "modules-center": ["hyprland/workspaces"],
- "modules-right": ["wireplumber", "hyprland/language", "clock"],
-
- "custom/spotify": {
- "format": "{}",
+ "position": "bottom",
+ "height": 36,
+ "width": 1200,
+ "spacing": 0,
+ "margin-top": -20,
+ "margin-bottom": 5,
+ "layer": "top",
+ "modules-left": [
+ "tray",
+ "custom/spotify"
+ ],
+ "modules-center": [
+ "hyprland/workspaces"
+ ],
+ "modules-right": [
+ "cpu",
+ "memory",
+ "wireplumber",
+ "hyprland/language",
+ "clock"
+ ],
+ "custom/spotify": {
+ "format": "{}",
"hide-empty-text": true,
"return-type": "json",
- "max-length": 40,
+ "max-length": 40,
"exec": "~/.config/waybar/bin/spotify-info -l",
- "on-click": "~/.config/waybar/bin/spotify-info -p",
+ "on-click": "~/.config/waybar/bin/spotify-info -p",
"on-scroll-up": "~/.config/waybar/bin/spotify-info -N",
"on-scroll-down": "~/.config/waybar/bin/spotify-info -P"
- },
-
- "hyprland/workspaces": {
- "format": "{name}",
- "on-click": "activate",
- "tooltip": false,
- "persistent_workspaces": {
- "*": 1
- }
- },
-
- "tray": {
- "icon-size": 14,
- "spacing": 15
- },
-
- "battery": {
- "bat": "qcom-battery",
- "interval": 1,
- "states": {
- "warning": 30,
- "critical": 15
- },
- "format": "{icon} {capacity}%",
- "format-charging": " {capacity}%",
- "format-icons": ["", "", "", "", ""],
- "max-length": 25
- },
-
- "backlight": {
- "device": "ktz8866-backlight",
- "format": " {percent}%"
- },
-
+ },
+ "hyprland/workspaces": {
+ "format": "{name}",
+ "on-click": "activate",
+ "tooltip": false,
+ "persistent_workspaces": {
+ "*": 1
+ }
+ },
+ "tray": {
+ "icon-size": 14,
+ "spacing": 15
+ },
"wireplumber": {
- "scroll-step": 2,
- "format": "{icon} {volume}%",
- "format-icons":["", "", ""],
- "format-muted": " mute",
- "on-click": "pavucontrol",
- "max-volume": 100
- },
-
- "hyprland/language": {
- "format": " {}",
- "format-en": "Eng",
- "format-ru": "Rus"
- },
-
- "clock": {
- "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
- "format": "{:%H:%M %b %d}",
- "timezone": "Asia/Yekaterinburg"
- }
+ "scroll-step": 2,
+ "format": "{icon} {volume}%",
+ "format-icons": [
+ "",
+ "",
+ ""
+ ],
+ "format-muted": " mute",
+ "on-click": "pavucontrol",
+ "max-volume": 100
+ },
+ "hyprland/language": {
+ "format": " {}",
+ "format-en": "Eng",
+ "format-ru": "Rus"
+ },
+ "clock": {
+ "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
+ "format": "{:%H:%M %b %d}",
+ "timezone": "Asia/Yekaterinburg"
+ },
+ "memory": {
+ "interval": 1,
+ "format": " {used:0.1f}G"
+ },
+ "cpu": {
+ "interval": 1,
+ "format": " {usage}%"
+ }
}