diff --git a/README.md b/README.md
index bfe4be092..53d8e5441 100644
--- a/README.md
+++ b/README.md
@@ -5,5 +5,5 @@ compositor.
### Dependencies
``` sh
-paru -S sway swaybg swayidle swaylock foot mako fuzzel waybar wl-clipboard cliphist swayosd-git playerctl xdg-desktop-portal-wlr xdg-desktop-portal-gtk wdisplays grim slurp gsettings-desktop-schemas chayang kanshi starship bat eza fish fd ripgrep yazi mpv zathura zathura-pdf-poppler zathura-cb ueberzugpp gnome-keyring polkit-gnome wf-recorder pulsemixer ani-cli-git ytfzf-git musikcube newsboat btop wdisplays
+paru -S sway swaybg swayidle swaylock foot mako fuzzel waybar wl-clipboard cliphist playerctl xdg-desktop-portal-wlr xdg-desktop-portal-gtk wdisplays grim slurp gsettings-desktop-schemas kanshi starship bat eza fish fd ripgrep yazi mpv zathura zathura-pdf-poppler zathura-cb ueberzugpp gnome-keyring polkit-gnome wf-recorder pulsemixer ani-cli-git ytfzf-git musikcube newsboat btop wdisplays
```
diff --git a/config/sway/modules/autostart b/config/sway/modules/autostart
index f9c97da6a..79a673699 100644
--- a/config/sway/modules/autostart
+++ b/config/sway/modules/autostart
@@ -3,20 +3,18 @@ exec {
dbus-update-activation-environment --systemd --all
systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
/usr/lib/xdg-desktop-portal-wlr
- kanshi
$HOME/.config/sway/scripts/idle
wl-paste --type text --watch cliphist store
wl-paste --type image --watch cliphist store
mako -c ~/.config/mako/config
- swayosd-server
+ kanshi
/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1
gnome-keyring-daemon --start --components=secrets
/usr/bin/emacs emacs --daemon
}
exec_always {
- pidof kanshi && kill -1 $(pidof kanshi)
- kanshi
+ pidof kanshi && kill -1 $(pidof kanshi) || kanshi
}
bar swaybar_command waybar
diff --git a/config/sway/modules/binds b/config/sway/modules/binds
index 910f877fb..112d0e83a 100644
--- a/config/sway/modules/binds
+++ b/config/sway/modules/binds
@@ -13,12 +13,12 @@ set $chat signal-desktop
set $office flatpak run org.libreoffice.LibreOffice
set $browser flatpak run com.brave.Browser
set $file foot -T yazi -a yazi yazi
-set $editor emacsclient -c -a 'emacs'
+set $editor neovide --neovim-bin $HOME/.local/bin/lvim
set $music foot -T musikcube -a musikcube musikcube
set $rss foot -T newsboat -a newsboat newsboat
set $ani-cli foot -T ani-cli -a ani-cli ani-cli
-set $ytfzf foot -T ytfzf -a ytfzf ytfzf -flst
-set $ytfzf-music foot -T ytfzf-music -a ytfzf-music ytfzf -mlst
+set $ytfzf foot -T ytfzf -a ytfzf ytfzf -flstT chafa
+set $ytfzf-music foot -T ytfzf-music -a ytfzf-music ytfzf -mlstT chafa
set $flix-cli foot -T flix-cli -a flix-cli flix-cli
set $audiomixer foot -T audiomixer -a audiomixer pulsemixer
set $monitor foot -T monitor -a monitor btop
@@ -42,17 +42,17 @@ bindsym $mod+Return exec $term
bindsym $mod+q kill
# XF86 Keys
-bindsym XF86AudioRaiseVolume exec swayosd-client --output-volume +5
-bindsym XF86AudioLowerVolume exec swayosd-client --output-volume -5
-bindsym XF86AudioMute exec swayosd-client --output-volume mute-toggle
-bindsym XF86AudioMicMute exec swayosd-client --input-volume mute-toggle
+bindsym XF86AudioRaiseVolume exec pamixer -i 5
+bindsym XF86AudioLowerVolume exec pamixer -d 5
+bindsym XF86AudioMute exec pamixer -t
+bindsym XF86AudioMicMute exec pamixer --default-source -t
bindsym XF86AudioPause exec playerctl play-pause
bindsym XF86AudioPlay exec playerctl play-pause
bindsym XF86AudioNext exec playerctl next
bindsym XF86AudioPrev exec playerctl previous
bindsym XF86AudioStop exec playerctl stop
-bindsym XF86MonBrightnessUp exec swayosd-client --brightness +5
-bindsym XF86MonBrightnessDown exec swayosd-client --brightness -5
+bindsym XF86MonBrightnessUp exec brightnessctl s 5%+
+bindsym XF86MonBrightnessDown exec brightnessctl s 5%-
bindsym XF86News exec $rss
bindsym XF86Display exec wdisplays
diff --git a/config/sway/modules/theme b/config/sway/modules/theme
index 2b7657a2f..154313134 100644
--- a/config/sway/modules/theme
+++ b/config/sway/modules/theme
@@ -26,6 +26,7 @@ default_border pixel 3
default_floating_border pixel 3
smart_borders off
gaps inner 5
+#mouse_warping on
# gsettings
exec gsettings set org.gnome.desktop.interface {
diff --git a/config/sway/wallpaper/background.png b/config/sway/wallpaper/background.png
index a6c0b7d62..adcd93b1c 100644
Binary files a/config/sway/wallpaper/background.png and b/config/sway/wallpaper/background.png differ
diff --git a/config/sway/wallpaper/locked.png b/config/sway/wallpaper/locked.png
index a6c0b7d62..adcd93b1c 100644
Binary files a/config/sway/wallpaper/locked.png and b/config/sway/wallpaper/locked.png differ
diff --git a/config/waybar/config b/config/waybar/config
index 4692ac0f6..a12f75ab5 100644
--- a/config/waybar/config
+++ b/config/waybar/config
@@ -1,7 +1,7 @@
{
"reload-style-on-change": true,
"position": "top",
- "height": 25,
+ "height": 26,
"spacing": 0,
"layer": "top",
@@ -29,8 +29,11 @@
"battery",
"battery#bat2",
"custom/arrow5",
- "network",
+ "pulseaudio",
"custom/arrow6",
+ "backlight",
+ "custom/arrow7",
+ "network",
"bluetooth"
],
@@ -54,13 +57,25 @@
}
},
+ "sway/mode": {
+ "format": "{}"
+ },
+
+ "sway/scratchpad": {
+ "format": "{icon} {count}",
+ "show-empty": false,
+ "format-icons": ["", "\uf2d2"],
+ "tooltip": true,
+ "tooltip-format": "{app}: {title}"
+ },
+
"sway/window": {
"tooltip": false,
"format": "{title}",
"icon": true,
"icon-size": 16,
"separate-outputs": true,
- "max-length": 80
+ "max-length": 70
},
"cpu": {
@@ -81,16 +96,41 @@
"tooltip": false,
},
- "sway/mode": {
- "format": "{}"
+ "pulseaudio": {
+ "scroll-step": 1, // %, can be a float
+ "tooltip-format": "{volume}% - {desc}",
+ "format": "{icon} {format_source}",
+ "format-bluetooth": "{icon}\udb80\udcaf {format_source}",
+ "format-bluetooth-muted": "\udb81\udd81 {icon}\udb80\udcaf {format_source}",
+ "format-muted": "\udb81\udd81 {format_source}",
+ "format-source": "\udb80\udf6c",
+ "format-source-muted": "\udb80\udf6d",
+ "format-icons": {
+ "headphone": "\udb80\udecb",
+ "hands-free": "\udb86\udc4f",
+ "headset": "\udb80\udece",
+ "phone": "\udb80\udff2",
+ "portable": "\udb80\udff2",
+ "car": "\udb80\udd0b",
+ "default": ["\udb81\udd7f", "\udb81\udd80", "\udb81\udd7e"]
+ },
+ "on-click": "foot -T audiomixer -a audiomixer pulsemixer"
},
- "sway/scratchpad": {
- "format": "{icon} {count}",
- "show-empty": false,
- "format-icons": ["", "\uf2d2"],
- "tooltip": true,
- "tooltip-format": "{app}: {title}"
+ "backlight": {
+ "format": "{icon}",
+ "format-icons": [
+ "\udb86\ude4e",
+ "\udb86\ude4f",
+ "\udb86\ude50",
+ "\udb86\ude51",
+ "\udb86\ude52",
+ "\udb86\ude53",
+ "\udb86\ude54",
+ "\udb86\ude55",
+ "\udb81\udee8"
+ ],
+ "tooltip-format": "{percent}%"
},
"idle_inhibitor": {
@@ -131,7 +171,7 @@
"\udb80\udc80",
"\udb80\udc79"
],
- "tooltip-format": "{timeTo}",
+ "tooltip-format": "{capacity}% - {timeTo}",
"on-click": "$HOME/.config/rofi/scripts/rs_power"
},
@@ -153,7 +193,7 @@
"\udb80\udc80",
"\udb80\udc79"
],
- "tooltip-format": "{timeTo}",
+ "tooltip-format": "{capacity}% - {timeTo}",
"on-click": "$HOME/.config/fuzzel/scripts/rs_power"
},
@@ -222,5 +262,5 @@
"custom/arrow7": {
"format": "",
"tooltip": false
- },
+ }
}
diff --git a/config/waybar/style.css b/config/waybar/style.css
index b3dec2ab6..5d70ce1ca 100644
--- a/config/waybar/style.css
+++ b/config/waybar/style.css
@@ -43,8 +43,9 @@
@define-color idle @drgreen;
@define-color powerprofile @drgreen;
@define-color battery @drgreen;
-@define-color network @dryellow;
-@define-color bluetooth @drorange;
+@define-color volume @dryellow;
+@define-color backlight @drorange;
+@define-color network @drred;
@define-color wbackground rgba(29, 32, 33, 0.95);
/* =====================================
@@ -166,6 +167,8 @@ window#waybar {
#idle_inhibitor,
#power-profiles-daemon,
#battery,
+#pulseaudio,
+#backlight,
#network,
#bluetooth,
#clock {
@@ -173,6 +176,30 @@ window#waybar {
padding-left: 4px;
}
+#clock {
+ background-color: @clock;
+}
+
+#cpu {
+ background-color: @monitor;
+}
+
+#memory {
+ background-color: @monitor;
+}
+
+#language {
+ background-color: @language;
+}
+
+#idle_inhibitor {
+ background-color: @battery;
+}
+
+#power-profiles-daemon {
+ background-color: @powerprofile;
+}
+
#battery,
#battery.charging,
#battery.plugged {
@@ -184,14 +211,6 @@ window#waybar {
animation: blink 0.5s linear infinite alternate;
}
-#cpu {
- background-color: @monitor;
-}
-
-#memory {
- background-color: @monitor;
-}
-
#network,
#network.disconnected {
background-color: @network;
@@ -199,29 +218,17 @@ window#waybar {
#bluetooth,
#bluetooth.disconnected {
- background-color: @bluetooth;
+ background-color: @network;
padding-right: 10px;
}
#pulseaudio,
#pulseaudio.muted {
- background-color: @pulseaudio;
+ background-color: @volume;
}
-#language {
- background-color: @language;
-}
-
-#power-profiles-daemon {
- background-color: @powerprofile;
-}
-
-#clock {
- background-color: @clock;
-}
-
-#idle_inhibitor {
- background-color: @battery;
+#backlight {
+ background-color: @backlight;
}
/* =====================================
@@ -232,7 +239,8 @@ window#waybar {
#custom-arrow3,
#custom-arrow4,
#custom-arrow5,
-#custom-arrow6 {
+#custom-arrow6,
+#custom-arrow7 {
font-size: 18pt;
}
@@ -259,10 +267,15 @@ window#waybar {
#custom-arrow5 {
background: @battery;
- color: @network;
+ color: @volume;
}
#custom-arrow6 {
- background: @network;
- color: @bluetooth;
+ background: @volume;
+ color: @backlight;
+}
+
+#custom-arrow7 {
+ background: @backlight;
+ color: @network;
}