Replace dwl waybar modules with hyprland

2025-04-27 08:57:51 -04:00
parent 0896e34dee
commit 46fa0bda22
4 changed files with 16 additions and 129 deletions
--- a/README.org
+++ b/README.org
@@ -48,7 +48,6 @@
    - [[#cpu][CPU]]
    - [[#clock][Clock]]
    - [[#dunst][Dunst]]
-    - [[#dwl][DWL]]
    - [[#disk][Disk]]
    - [[#idle-inhibitor][Idle Inhibitor]]
    - [[#memory][Memory]]
@@ -115,7 +114,7 @@ bind = SUPER, E, exec, uwsm app -- pcmanfm-qt.desktop
 #+END_EXAMPLE

 #+BEGIN_SRC conf :tangle hyprland.conf
-exec-once = uwsm app -- waybar --config $HOME/.config/hypr/waybar/config.jsonc --style $HOME/.config/dwl/waybar/style.css
+exec-once = uwsm app -- waybar --config $HOME/.config/hypr/waybar/config.jsonc --style $HOME/.config/hypr/waybar/style.css
 #+END_SRC

 ** Environment Variables
@@ -510,9 +509,9 @@ windowrule = rounding 0, floating:0, onworkspace:f[1]
    "reload_style_on_change": true,
    "modules-left": [
        "group/power-menu",
-        "dwl/tags",
-        "dwl/window#title",
-        "dwl/window#layout",
+        "hyprland/workspaces",
+        "hyprland/window",
+        "hyprland/submap",
    ],
    "modules-center": [
        "tray",
@@ -697,7 +696,7 @@ button {

 #+BEGIN_SRC jsonc :tangle waybar/config.jsonc
    "custom/dunst-status": {
-        "exec": "~/.config/dwl/waybar/scripts/dunst.sh",
+        "exec": "~/.config/hypr/waybar/scripts/dunst.sh",
        "restart-interval": 1,
        "on-click": "~/.scripts/dunst.sh --dnd",
        "on-click-right": "~/.scripts/dunst.sh --rofi",
@@ -765,67 +764,6 @@ else
 fi
 #+END_SRC

-*** DWL
-
-**** Configuration
-
-#+BEGIN_SRC jsonc :tangle waybar/config.jsonc
-    "dwl/tags": {
-        "num-tags": 9,
-        "tag-labels": [ "󰻧 ₁", "󰍩 ₂", "󰠮 ₃", " ₄", "󰖟 ₅", " ₆", "󰊢 ₇", "󰊖 ₈", " ₉" ],
-        "disable-click": false
-    },
-    "dwl/window#title": {
-        "format": "{title}",
-        "all-outputs": false,
-        "icon": true,
-        "icon-size": 21,
-        "tooltip": true,
-        "max-length": 30,
-    },
-    "dwl/window#layout": {
-        "format": "{layout}",
-        "tooltip": false,
-        "all-outputs": false,
-        "icon": false,
-    },
-#+END_SRC
-
-**** Styling
-
-#+BEGIN_SRC css :tangle waybar/style.css
-#tags {
-    padding: 0px 10px;
-}
-#tags button {
-    background: transparent;
-    color: #44475a;
-    padding: 0px 5px;
-}
-#tags button.occupied {
-    background: transparent;
-    color: #f1fa8c;
-}
-#tags button.focused {
-    background: transparent;
-    box-shadow: inset 0 -3px #bd93f9;
-}
-#tags button.urgent {
-    background: transparent;
-    color: #ff5555;
-}
-#window.title {
-    background: transparent;
-    color: #f8f8f2;
-    padding: 0px 10px;
-}
-#window.layout {
-    background: transparent;
-    color: #50fa7b;
-    padding: 0px 10px;
-}
-#+END_SRC
-
 *** Disk

 **** Configuration
@@ -909,7 +847,7 @@ fi

 #+BEGIN_SRC jsonc :tangle waybar/config.jsonc
    "custom/media-playing-source": {
-        "exec": "~/.config/dwl/waybar/scripts/get-media-playing.sh",
+        "exec": "~/.config/hypr/waybar/scripts/get-media-playing.sh",
        "return-type": "json",
        "restart-interval": 1,
        "on-click": "~/.scripts/playerctl.sh --change",
@@ -921,7 +859,7 @@ fi
        "tooltip": false,
    },
    "custom/media-playing-play-pause": {
-        "exec": "~/.config/dwl/waybar/scripts/get-media-status-icon.sh",
+        "exec": "~/.config/hypr/waybar/scripts/get-media-status-icon.sh",
        "restart-interval": 1,
        "on-click": "~/.scripts/playerctl.sh --play-pause",
        "tooltip": false,
@@ -1178,7 +1116,7 @@ box#power-menu {

 #+BEGIN_SRC jsonc :tangle waybar/config.jsonc
    "custom/system76-power": {
-        "exec": "~/.config/dwl/waybar/scripts/system76-power.sh",
+        "exec": "~/.config/hypr/waybar/scripts/system76-power.sh",
        "return-type": "json",
        "restart-interval": 60,
        "on-click-right": "~/.scripts/cpu-gpu.sh --rofi",
--- a/hyprland.conf
+++ b/hyprland.conf
@@ -8,7 +8,7 @@ $terminal = foot
 $fileManager = thunar
 $menu = rofi -show combi -run-command "uwsm app -- {cmd}"

-exec-once = uwsm app -- waybar --config $HOME/.config/hypr/waybar/config.jsonc --style $HOME/.config/dwl/waybar/style.css
+exec-once = uwsm app -- waybar --config $HOME/.config/hypr/waybar/config.jsonc --style $HOME/.config/hypr/waybar/style.css

 general {
    gaps_in = 5
--- a/waybar/config.jsonc
+++ b/waybar/config.jsonc
@@ -13,9 +13,9 @@
    "reload_style_on_change": true,
    "modules-left": [
        "group/power-menu",
-        "dwl/tags",
-        "dwl/window#title",
-        "dwl/window#layout",
+        "hyprland/workspaces",
+        "hyprland/window",
+        "hyprland/submap",
    ],
    "modules-center": [
        "tray",
@@ -114,7 +114,7 @@
    },

    "custom/dunst-status": {
-        "exec": "~/.config/dwl/waybar/scripts/dunst.sh",
+        "exec": "~/.config/hypr/waybar/scripts/dunst.sh",
        "restart-interval": 1,
        "on-click": "~/.scripts/dunst.sh --dnd",
        "on-click-right": "~/.scripts/dunst.sh --rofi",
@@ -140,26 +140,6 @@
        "tooltip-format": "Clear Notification History",
    },

-    "dwl/tags": {
-        "num-tags": 9,
-        "tag-labels": [ "󰻧 ₁", "󰍩 ₂", "󰠮 ₃", " ₄", "󰖟 ₅", " ₆", "󰊢 ₇", "󰊖 ₈", " ₉" ],
-        "disable-click": false
-    },
-    "dwl/window#title": {
-        "format": "{title}",
-        "all-outputs": false,
-        "icon": true,
-        "icon-size": 21,
-        "tooltip": true,
-        "max-length": 30,
-    },
-    "dwl/window#layout": {
-        "format": "{layout}",
-        "tooltip": false,
-        "all-outputs": false,
-        "icon": false,
-    },
-
    "disk": {
        "interval": 60,
        "format": "󰋊 {percentage_used}%",
@@ -189,7 +169,7 @@
    },

    "custom/media-playing-source": {
-        "exec": "~/.config/dwl/waybar/scripts/get-media-playing.sh",
+        "exec": "~/.config/hypr/waybar/scripts/get-media-playing.sh",
        "return-type": "json",
        "restart-interval": 1,
        "on-click": "~/.scripts/playerctl.sh --change",
@@ -201,7 +181,7 @@
        "tooltip": false,
    },
    "custom/media-playing-play-pause": {
-        "exec": "~/.config/dwl/waybar/scripts/get-media-status-icon.sh",
+        "exec": "~/.config/hypr/waybar/scripts/get-media-status-icon.sh",
        "restart-interval": 1,
        "on-click": "~/.scripts/playerctl.sh --play-pause",
        "tooltip": false,
@@ -273,7 +253,7 @@
    },

    "custom/system76-power": {
-        "exec": "~/.config/dwl/waybar/scripts/system76-power.sh",
+        "exec": "~/.config/hypr/waybar/scripts/system76-power.sh",
        "return-type": "json",
        "restart-interval": 60,
        "on-click-right": "~/.scripts/cpu-gpu.sh --rofi",
--- a/waybar/style.css
+++ b/waybar/style.css
@@ -66,37 +66,6 @@ box#dunst {
    padding: 0px 5px;
 }

-#tags {
-    padding: 0px 10px;
-}
-#tags button {
-    background: transparent;
-    color: #44475a;
-    padding: 0px 5px;
-}
-#tags button.occupied {
-    background: transparent;
-    color: #f1fa8c;
-}
-#tags button.focused {
-    background: transparent;
-    box-shadow: inset 0 -3px #bd93f9;
-}
-#tags button.urgent {
-    background: transparent;
-    color: #ff5555;
-}
-#window.title {
-    background: transparent;
-    color: #f8f8f2;
-    padding: 0px 10px;
-}
-#window.layout {
-    background: transparent;
-    color: #50fa7b;
-    padding: 0px 10px;
-}
-
 #disk {
    background: transparent;
    color: #f1fa8c;