diff --git a/README.md b/README.md
index 03a0658..203be3e 100644
--- a/README.md
+++ b/README.md
@@ -4,8 +4,6 @@ in opensuse installer choose >> generic desktop
sudo zypper install labwc git
-sudo systemctl set-default multi-user.target
-
git clone https://zenithcode.duckdns.org/s13bby/labwc-opensuse.git
bash ~/labwc-opensuse/install.sh
\ No newline at end of file
diff --git a/configs/alacritty/alacritty.toml b/configs/alacritty/alacritty.toml
index cb4637d..9a82ad0 100644
--- a/configs/alacritty/alacritty.toml
+++ b/configs/alacritty/alacritty.toml
@@ -1,3 +1,13 @@
+[font]
+normal = { family = "JetBrainsMono Nerd Font", style = "Regular" }
+bold = { family = "JetBrainsMono Nerd Font", style = "Bold" }
+italic = { family = "JetBrainsMono Nerd Font", style = "Italic" }
+bold_italic = { family = "JetBrainsMono Nerd Font", style = "Bold Italic" }
+
+[window.padding]
+x = 12 # Отступ слева и справа в пикселях
+y = 12 # Отступ сверху и снизу в пикселях
+
# Default Colors
[colors.primary]
background = "#0b0b0b"
@@ -24,4 +34,4 @@ yellow = "#ffd165"
blue = "#65bddb"
magenta = "#f17676"
cyan = "#9debcf"
-white = "#ffffff"
\ No newline at end of file
+white = "#ffffff"
diff --git a/configs/labwc/autostart b/configs/labwc/autostart
index 1e86dc2..dd44a93 100644
--- a/configs/labwc/autostart
+++ b/configs/labwc/autostart
@@ -1,3 +1,5 @@
+setxkbmap -layout us,ru -option grp:ctrl_space_toggle &
+
# базовые сервисы
waybar &
mako &
diff --git a/configs/labwc/menu.xml b/configs/labwc/menu.xml
index e053d30..31e7870 100644
--- a/configs/labwc/menu.xml
+++ b/configs/labwc/menu.xml
@@ -37,7 +37,7 @@
-
-
+
@@ -45,8 +45,22 @@
-
+
+
+
+
+
@@ -75,7 +89,7 @@
-
+
@@ -86,7 +100,7 @@
-
+
@@ -94,4 +108,4 @@
-
\ No newline at end of file
+
diff --git a/configs/labwc/rc.xml b/configs/labwc/rc.xml
index 966042a..9cf9683 100644
--- a/configs/labwc/rc.xml
+++ b/configs/labwc/rc.xml
@@ -22,6 +22,12 @@
+
+
+
+ yes
+
+
@@ -162,7 +168,7 @@
- sh -c 'grim -g "$(slurp)" - | wl-copy'
+ grimshot copy area
diff --git a/configs/waybar/config.jsonc b/configs/waybar/config.jsonc
index 77fe778..312ca18 100644
--- a/configs/waybar/config.jsonc
+++ b/configs/waybar/config.jsonc
@@ -5,7 +5,7 @@
"spacing": 0,
"modules-left": ["wlr/taskbar"],
"modules-center": ["clock"],
- "modules-right": ["network", "bluetooth", "custom/spotify", "custom/language", "pulseaudio", "cpu", "memory", "battery", "wlr/tray"],
+ "modules-right": ["network","bluetooth","custom/spotify","custom/language","pulseaudio","cpu","battery","power-profiles-daemon","wlr/tray","clock#date"],
"wlr/taskbar": {
"format": "{icon}",
@@ -14,51 +14,53 @@
"on-click": "activate"
},
"custom/language": {
- "exec": "xkblayout-state print %s | tr 'a-z' 'A-Z'",
+ "exec": "xkb-switch -p | tr '[:lower:]' '[:upper:]' || echo '??'",
"interval": 1,
- "format": " {} "
+ "format": "[ {}]"
},
"custom/spotify": {
- "format": "[{}] ",
+ "format": "[played: [{}] ]",
"exec": "playerctl metadata --format '{{artist}} - {{title}}' spotify 2>/dev/null || echo ''",
"restart-interval": 1,
- "on-click": "spotify",
+ "on-click": "spotify-launcher",
"max-length": 50
},
"clock": {
- "format": "{:%H:%M}",
- "format-alt": "{:%d-%m-%Y}"
+ "format": "[{:%H:%M}]",
+ "on-click": "gnome-calendar"
+ },
+ "clock#date": {
+ "format": "[{:%d-%m-%Y}]",
+ "on-click": "gnome-calendar"
},
"cpu": {
- "format": " {usage}%",
+ "format": "[ {usage}%]",
"tooltip": false,
"on-click": "alacritty -e htop"
},
- "memory": {
- "format": " {}%"
- },
"network": {
"min-length": 10,
- "format-wifi": " {bandwidthDownBytes}",
- "format-ethernet": " {bandwidthDownBytes}",
- "format-disconnected": "⚠ DONT",
+ "format-wifi": "[ {essid} {bandwidthDownBytes}]",
+ "format-ethernet": "[ {bandwidthDownBytes}]",
+ "format-disconnected": "[🛪 no WI-FI]",
"interval": 1,
- "on-click": "alacritty -e nmtui"
+ "on-click": "nm-connection-editor"
},
"bluetooth": {
- "format": "",
- "format-disabled": "",
- "format-off": "",
- "format-connected": " {num_connections}",
+ "format": "[ ]",
+ "format-disabled": "[🛪 disabled]",
+ "format-off": "[🛦 off]",
+ "format-connected": "[ {num_connections}]",
- "tooltip-format": "{device_enumerate}",
+ "tooltip-format": "[{device_enumerate}]",
"on-click": "blueman-manager"
},
"battery": {
- "format": "{capacity}% {icon}",
- "format-charging": " {capacity}% {icon}",
- "format-plugged": " {capacity}%",
+ "format": "[{icon} {capacity}%] ",
+ "format-charging": "[ {capacity}% {icon}]",
+ "format-plugged": "[ {capacity}%]",
+ "interval": 1,
"format-icons": [
"",
@@ -73,9 +75,21 @@
"critical": 15
}
},
+ "power-profiles-daemon": {
+ "format": "[{icon}]",
+ "tooltip-format": "Профиль: {profile}",
+ "tooltip": true,
+ "format-icons": {
+ "default": "default",
+ "performance": "performance",
+ "balanced": "balanced",
+ "power-saver": "power-saved"
+ },
+
+ },
"pulseaudio": {
- "format": " {volume}%",
- "format-muted": " Muted",
+ "format": "[ {volume}%]",
+ "format-muted": "[ muted]",
"on-click": "pavucontrol"
},
"wlr/tray": {
diff --git a/configs/waybar/style.css b/configs/waybar/style.css
index 61c935b..2373c95 100644
--- a/configs/waybar/style.css
+++ b/configs/waybar/style.css
@@ -18,6 +18,7 @@ window#waybar {
#pulseaudio,
#taskbar,
#custom-spotify,
+#custom-language,
#tray {
padding: 0 10px;
color: #0b0b0b;
@@ -29,7 +30,7 @@ window#waybar {
}
#taskbar button.active {
- background-color: alpha(#0b0b0b, 0.2);
- box-shadow: inset 0 -2px 0 0 #0b0b0b;
+ background-color: alpha(#98309c, 0.2);
+ box-shadow: inset 0 -2px 0 0 #98309c;
color: #0b0b0b;
-}
\ No newline at end of file
+}
diff --git a/install.sh b/install.sh
index e2c5311..e1568eb 100755
--- a/install.sh
+++ b/install.sh
@@ -46,7 +46,7 @@ fi
echo "┌──────────────────────────────────────┐"
echo "│ zenithcode.duckdns.org │"
-echo "│ welcome to installer labwc-opensuse │"
+echo "│ welcome to installer labwc-openSUSE │"
echo "│ by s13bby │"
echo "└──────────────────────────────────────┘"
@@ -55,22 +55,16 @@ echo "└───────────────────────
info "installing needed packages..."
-# power-profiles-daemon -- FOR NOTEBOOK ONLY
-
sudo zypper in \
opi \
+ cliphist \
+ ImageMagic \
+ xkb-switch \
htop \
blueman \
- gcc \
- gcc-c++ \
git \
polkit \
polkit-gnome \
- curl \
- cmake \
- libcurl-devel \
- opencv \
- opencv-devel \
waybar \
mako \
swaybg \
@@ -84,8 +78,7 @@ sudo zypper in \
wireplumber \
alsa-utils \
NetworkManager \
- NetworkManager-applet \
- NetworkManager-tui \
+ NetworkManager-connection-editor \
pcmanfm \
firefox \
playerctl \
@@ -94,8 +87,10 @@ sudo zypper in \
brightnessctl \
pavucontrol \
bluez \
- grim \
- ristretto
+ ristretto \
+ gnome-calcendar \
+ spotify-launcher \
+ telegram-desktop
success "all packages installed (without swaylock-effects. install this package manualy"
@@ -156,6 +151,9 @@ echo "└───────────────────────
info "please. install swaylock-effcts manually"
info "write >> opi swaylock-effects"
+echo
+info "please. install grimshot manually"
+info "write >> opi grimshot"
-success ">>after install swaylock-effects:"
+success ">>after install swaylock-effects and grimshot:"
success " >>please reboot system<<"