From a2d8cddefeace5a356779c3c0cfcadc9107015df Mon Sep 17 00:00:00 2001
From: jay <jay@lawsnote.com>
Date: Tue, 30 May 2023 01:26:05 +0800
Subject: [PATCH] update

---
 home/dot_config/mako/config                   |  2 ++
 home/dot_config/sway/config                   | 11 ++++++++---
 home/dot_config/waybar/config                 | 11 +++++++----
 home/dot_config/waybar/style.css              |  6 +++---
 home/dot_config/wofi/executable_wofi-power.sh |  6 +++---
 5 files changed, 23 insertions(+), 13 deletions(-)
 create mode 100644 home/dot_config/mako/config

diff --git a/home/dot_config/mako/config b/home/dot_config/mako/config
new file mode 100644
index 0000000..90ee8c2
--- /dev/null
+++ b/home/dot_config/mako/config
@@ -0,0 +1,2 @@
+font=JetBrainsMono Nerd Font 10
+default-timeout=5000
diff --git a/home/dot_config/sway/config b/home/dot_config/sway/config
index 9e7fd0d..bc052e3 100644
--- a/home/dot_config/sway/config
+++ b/home/dot_config/sway/config
@@ -4,6 +4,8 @@
 #
 # Read `man 5 sway` for a complete reference.
 
+font JetBrainsMono Nerd Font 10
+
 ### Variables
 #
 # Logo key. Use Mod1 for Alt.
@@ -26,7 +28,7 @@ set $menu wofi --show drun
 #
 # Default wallpaper (more resolutions are available in @datadir@/backgrounds/sway/)
 # output * bg @datadir@/backgrounds/sway/Sway_Wallpaper_Blue_1920x1080.png fill
-output * bg ~/.config/sway/bg.png fill
+output * bg /home/jay/.config/sway/bg.png fill
 #
 # Example configuration:
 #
@@ -36,9 +38,12 @@ output * bg ~/.config/sway/bg.png fill
 
 # exec_always xdg-desktop-portal -r
 # exec_always xdg-desktop-portal-wlr
+exec ~/bin/wayland-env.sh
 exec --no-startup-id dbus-update-activation-environment --all
+exec gentoo-pipewire-launcher &
 exec_always kanshi
 exec dex -a -e sway
+exec mako
 
 # for sway overview
 # exec_always rm -f /tmp/sovpipe && mkfifo /tmp/sovpipe && tail -f /tmp/sovpipe | sov -t 100
@@ -113,8 +118,8 @@ input type:touchpad {
     bindsym XF86AudioLowerVolume exec "pactl set-sink-volume @DEFAULT_SINK@ -10%; pkill -RTMIN+8 waybar"
     bindsym XF86AudioMute exec "pactl set-sink-mute @DEFAULT_SINK@ toggle; pkill -RTMIN+8 waybar"
 
-    bindsym XF86MonBrightnessUp exec "/home/jay/bin/backlight-control --path /sys/class/backlight/intel_backlight set +10%"
-    bindsym XF86MonBrightnessDown exec "/home/jay/bin/backlight-control --path /sys/class/backlight/intel_backlight set -- -10%"
+    bindsym XF86MonBrightnessUp exec "xbacklight -inc 5"
+    bindsym XF86MonBrightnessDown exec "xbacklight -dec 5"
 #
 # Moving around:
 #
diff --git a/home/dot_config/waybar/config b/home/dot_config/waybar/config
index f637a43..8bdf566 100644
--- a/home/dot_config/waybar/config
+++ b/home/dot_config/waybar/config
@@ -7,8 +7,8 @@
     // "width": 1280, // Waybar width
     // "spacing": 1, // Gaps between modules (4px)
     // Choose the order of the modules
-    "modules-left": ["wlr/workspaces", "custom/sep", "hyprland/window", "hyprland/submap"],
-    // "modules-left": ["sway/workspaces", "sway/mode", "sway/window"],
+    // "modules-left": ["wlr/workspaces", "custom/sep", "hyprland/window", "hyprland/submap"],
+    "modules-left": ["sway/workspaces", "custom/sep", "sway/window", "sway/mode"],
     "modules-center": ["clock"],
     "modules-right": [
       "idle_inhibitor",
@@ -34,6 +34,9 @@
       "on-click": "activate",
       "disable-scroll": true
     },
+    "sway/window": {
+      "max-length": 100
+    },
     "custom/pipewire": {
       "exec": "/home/jay/bin/get-volume.sh",
       "interval": "once",
@@ -73,7 +76,7 @@
         "interval": 1
     },
     "cpu": {
-        "format": " {usage}%({load})",
+        "format": " {usage}%({load})",
         "interval": 2,
         "tooltip": false
     },
@@ -102,7 +105,7 @@
             "critical": 15
         },
         "format": "{icon}  {capacity}%",
-        "format-charging": "  {capacity}%",
+        "format-charging": "󰂄  {capacity}%",
         "format-plugged": "  {capacity}%",
         "format-alt": "{icon}  {time}",
         // "format-good": "", // An empty format will hide the module
diff --git a/home/dot_config/waybar/style.css b/home/dot_config/waybar/style.css
index 3d5e715..557b187 100644
--- a/home/dot_config/waybar/style.css
+++ b/home/dot_config/waybar/style.css
@@ -45,7 +45,7 @@ window#waybar.hidden {
     color: #f5c2e7;
 }
 
-#workspaces button.active {
+#workspaces button.active, #workspaces button.focused {
     color: #ea76cb;
 }
 
@@ -63,7 +63,7 @@ window#waybar.hidden {
     color: #eee;
 }
 
-#submap {
+#submap, #mode {
     padding-left: 5px;
     padding-right: 5px;
     margin-right: 3px;
@@ -106,7 +106,7 @@ window#waybar.hidden {
 #idle_inhibitor {
     border-radius: 15px 0px 0px 15px;
     padding-left: 10px;
-    padding-right: 5px;
+    padding-right: 10px;
     transition: ease-in;
     transition-duration: 0.1s;
     color: white;
diff --git a/home/dot_config/wofi/executable_wofi-power.sh b/home/dot_config/wofi/executable_wofi-power.sh
index 0f08ffe..85ceb42 100644
--- a/home/dot_config/wofi/executable_wofi-power.sh
+++ b/home/dot_config/wofi/executable_wofi-power.sh
@@ -8,9 +8,9 @@ case $selected in
   logout)
     swaymsg exit;;
   suspend)
-    exec systemctl suspend;;
+    exec loginctl suspend;;
   reboot)
-    exec systemctl reboot;;
+    exec loginctl reboot;;
   shutdown)
-    exec systemctl poweroff -i;;
+    exec loginctl poweroff -i;;
 esac