diff --git a/.dotter/global.toml b/.dotter/global.toml
index 449e52c..16cade7 100644
--- a/.dotter/global.toml
+++ b/.dotter/global.toml
@@ -76,7 +76,6 @@ cargo.packages = []
"config/mako" = "~/.config/mako"
"config/swappy" = "~/.config/swappy"
"config/waybar" = "~/.config/waybar/"
-"config/ironbar" = { target = "~/.config/ironbar/", type = "symbolic" }
[hyprland]
depends = ["wm"]
diff --git a/.dotter/pre_deploy.sh b/.dotter/pre_deploy.sh
index 42bf8d6..92715f8 100755
--- a/.dotter/pre_deploy.sh
+++ b/.dotter/pre_deploy.sh
@@ -2,7 +2,7 @@
# shellcheck disable=all
# This is a handlerbars template, so ignore issues
-set -xeuo pipefail
+set -euo pipefail
checksum_file=".dotter/cache/pre_deploy.checksum"
diff --git a/config/hypr/hyprland.conf b/config/hypr/hyprland.conf
index ae7e58c..dcbbe12 100644
--- a/config/hypr/hyprland.conf
+++ b/config/hypr/hyprland.conf
@@ -87,6 +87,14 @@ gestures {
workspace_swipe_invert = false
}
+misc {
+ enable_swallow = true
+ # swallow_regex = ""
+ # swallow_exception_regex = ""
+
+ mouse_move_focuses_monitor = false
+}
+
# ── Layouts ───────────────────────────────────────────────────────────
master {
new_status = slave
@@ -98,6 +106,20 @@ master {
# │ Windows rules │
# ╰──────────────────────────────────────────────────────────╯
+# ╭───────────────────────────────────────────────────────────╮
+# │ Workspaces rules │
+# ╰───────────────────────────────────────────────────────────╯
+
+workspace = 1, monitor:HDMI-A-1, persistent:true
+workspace = 2, monitor:HDMI-A-1, persistent:true
+workspace = 3, monitor:HDMI-A-1, persistent:true
+workspace = 4, monitor:HDMI-A-1, persistent:true
+workspace = 5, monitor:HDMI-A-1, persistent:true
+
+workspace = 6, monitor:eDP-1, persistent:true
+workspace = 7, monitor:eDP-1, persistent:true
+workspace = 8, monitor:eDP-1, persistent:true
+workspace = 9, monitor:eDP-1, persistent:true
# ╭──────────────────────────────────────────────────────────╮
# │ Keybindings │
diff --git a/config/waybar/config b/config/waybar/config
deleted file mode 100644
index 700eac6..0000000
--- a/config/waybar/config
+++ /dev/null
@@ -1,128 +0,0 @@
-{
- "layer":"top",
- "position":"top",
- "reload_style_on_change":true,
-
- "height":20,
- "margin-bottom":5,
- "margin-left": 5,
- "margin-right":5,
-
- "modules-left":["hyprland/workspaces"],
- "modules-center":["clock"],
- "modules-right":[
- "custom/notification",
- "idle_inhibitor",
- "network",
- "bluetooth",
- "backlight",
- "wireplumber",
- "clock#time",
- "battery",
- "custom/power"
- ],
-
- "hyprland/workspaces": {
- "all-outputs": true,
- "format": "{icon}",
- "format-icons": {
- "1": "✨",
- "2": "🌈",
- "3": "💕",
- "4": "🎄",
- "5": "🌊",
- "6": "🌷",
- "7": "🪷",
- "8": "😽",
- "9": "🌙",
- "10": "🦋",
- },
- "on-scroll-up": "hyprctl dispatch workspace e+1 1>/dev/null",
- "on-scroll-down": "hyprctl dispatch workspace e-1 1>/dev/null",
- "sort-by-number": true,
- "active-only": false,
- },
- "backlight":{
- "format": " {percent}% ",
- "device": "intel_backlight",
- "on-scroll-down": "brightnessctl s 5%-",
- "on-scroll-up": "brightnessctl s +5%"
- },
-
- "idle_inhibitor": {
- "format": "{icon}",
- "format-icons": {
- "activated": "",
- "deactivated": ""
- },
- "tooltip": "true"
- },
-
- "wireplumber": {
- "on-click": "pavucontrol",
- "on-click-right": "amixer sset Master toggle 1>/dev/null",
- "format": "{icon} {volume}%",
- "format-muted": " Muted",
- "format-icons": {
- "headphone": " ",
- "hands-free": " ",
- "headset": " ",
- "phone": " ",
- "portable": " ",
- "car": " ",
- "default": [" ", " ", " "]
- },
- },
-
- "network": {
- "format-wifi": " {essid} ",
- "format-ethernet": " {ifname}",
- "format-linked": " {ifname} (No IP)",
- "format": " Connected",
- "format-disconnected": " Disconnected",
- "interval": 60,
- "on-click":"~/.config/rofi/rofi-wifi-menu.sh"
- },
- "clock": {
- "format": " {:%A %e %B}"
- },
- "clock#time": {
- "format": " {:%H:%M}"
- },
- "battery": {
- "interval": 2,
- "states": {
- "good": 95,
- "warning": 30,
- "critical": 15
- },
- "format": "{icon} {capacity}%",
- "format-charging": " {capacity}%",
- "format-plugged": " {capacity}%",
- "format-icons": [
- "",
- "",
- "",
- "",
- ""
- ]
- },
- "bluetooth":{
- "format-on": " Turned On",
- "format-off": " Turned Off",
- "format-disabled": " Disabled",
- "format-connected": " Connected",
- "format": " Disabled",
- "on-click":"blueman-manager &"
- },
-
- "custom/power":{
- "format":"",
- "on-click":"~/.config/rofi/powermenu/type-4/powermenu.sh"
- },
- "custom/notification":{
- "format": "",
- "on-click": "swaync-client -t -sw"
- }
-
-}
diff --git a/config/waybar/config.jsonc b/config/waybar/config.jsonc
new file mode 100644
index 0000000..dce1c48
--- /dev/null
+++ b/config/waybar/config.jsonc
@@ -0,0 +1,135 @@
+{
+ "layer": "top",
+ "position": "top",
+ "reload_style_on_change": true,
+
+ "height": 20,
+ "margin-top": 5,
+ "margin-bottom": 0,
+ "margin-left": 10,
+ "margin-right": 10,
+
+ "modules-left": ["hyprland/workspaces"],
+ "modules-center": ["clock"],
+ "modules-right": [
+ "custom/notification",
+ "idle_inhibitor",
+ "network",
+ "bluetooth",
+ "backlight",
+ "wireplumber",
+ "battery",
+ "custom/power"
+ ],
+
+ "hyprland/workspaces": {
+ "all-outputs": false,
+ "format": "{icon}",
+ "format-icons": {
+ "1": "",
+ "2": "",
+ "3": "",
+ "9": "",
+ "10": "",
+ "default": ""
+ },
+ "on-scroll-up": "hyprctl dispatch workspace e+1 1>/dev/null",
+ "on-scroll-down": "hyprctl dispatch workspace e-1 1>/dev/null",
+ "sort-by-number": true,
+ "active-only": false
+ },
+ "backlight": {
+ "format": " {percent}% ",
+ "device": "intel_backlight",
+ "on-scroll-down": "brightnessctl s 5%-",
+ "on-scroll-up": "brightnessctl s +5%"
+ },
+
+ "idle_inhibitor": {
+ "format": "{icon}",
+ "format-icons": {
+ "activated": "",
+ "deactivated": ""
+ },
+ "tooltip": "true"
+ },
+
+ "wireplumber": {
+ "on-click": "pavucontrol",
+ "on-click-right": "amixer sset Master toggle 1>/dev/null",
+ "format": "{icon} {volume}%",
+ "format-muted": " Muted",
+ "format-icons": {
+ "headphone": " ",
+ "hands-free": " ",
+ "headset": " ",
+ "phone": " ",
+ "portable": " ",
+ "car": " ",
+ "default": [" ", " ", " "]
+ }
+ },
+
+ "network": {
+ "format-wifi": " {essid} ",
+ "format-ethernet": " {ifname}",
+ "format-linked": " {ifname} (No IP)",
+ "format": " Connected",
+ "format-disconnected": " Disconnected",
+ "interval": 60,
+ "on-click": "~/.config/rofi/rofi-wifi-menu.sh"
+ },
+ "clock": {
+ "format": "{:%R}",
+ "locale": "es_CL.UTF-8",
+ "format-alt": "{:%a %d, %B %Y}",
+ "tooltip-format": "{calendar}",
+ "calendar": {
+ "mode": "year",
+ "mode-mon-col": 3,
+ "weeks-pos": "left",
+ "on-scroll": 1,
+ "format": {
+ "months": "{}",
+ "days": "{}",
+ "weeks": "W{}",
+ "weekdays": "{}",
+ "today": "{}"
+ }
+ },
+ "actions": {
+ "on-click-right": "mode",
+ "on-scroll-up": "shift_up",
+ "on-scroll-down": "shift_down"
+ }
+ },
+ "battery": {
+ "interval": 2,
+ "states": {
+ "good": 95,
+ "warning": 30,
+ "critical": 15
+ },
+ "format": "{icon} {capacity}%",
+ "format-charging": " {capacity}%",
+ "format-plugged": " {capacity}%",
+ "format-icons": ["", "", "", "", ""]
+ },
+ "bluetooth": {
+ "format-on": " Turned On",
+ "format-off": " Turned Off",
+ "format-disabled": " Disabled",
+ "format-connected": " Connected",
+ "format": " Disabled",
+ "on-click": "blueman-manager &"
+ },
+
+ "custom/power": {
+ "format": "",
+ "on-click": "~/.config/rofi/powermenu/type-4/powermenu.sh"
+ },
+ "custom/notification": {
+ "format": "",
+ "on-click": "swaync-client -t -sw"
+ }
+}
diff --git a/config/waybar/style.css b/config/waybar/style.css
index 7b6d2ac..43618ce 100644
--- a/config/waybar/style.css
+++ b/config/waybar/style.css
@@ -1,7 +1,7 @@
@import "./themes/catppuccin-macchiato.css";
*{
- font-size: 13px;
+ font-size: 0.9rem;
font-family: JetBrainsMono Roboto, Helvetica, Arial, sans-serif;
color: @text;
}
@@ -11,7 +11,34 @@
}
#workspaces{
border-radius:5px;
- box-shadow:0px 0px black;
+}
+
+#workspaces button{
+ padding: .25rem .5rem;
+ margin-right: .5rem;
+}
+
+#workspaces button:last-child{
+ margin-right: 0;
+}
+
+#workspaces button.active {
+ color: @teal;
+ background-color: alpha(@teal, 0.15);
+}
+
+#workspaces button.urgent {
+ color: @red;
+ background-color: alpha(@red, 0.15);
+}
+
+#workspaces button:hover {
+ /* border: .2px solid transparent; */
+ background: alpha(@blue, 0.15);
+ color: @blue;
+ border-color: transparent;
+ box-shadow: inherit;
+ text-shadow: inherit;
}
box.modules-left,
@@ -21,7 +48,6 @@ box.modules-right {
background-color: @base;
}
-#workspaces,
#network,
#backlight,
#wireplumber,