Moar linux theming

3 files changed, 56 insertions, 263 deletions

diff --git a/dots/waybar/.config/waybar/config b/dots/waybar/.config/waybar/config
deleted file mode 100644
index c4e973a..0000000
--- a/dots/waybar/.config/waybar/config
+++ /dev/null
@@ -1,116 +0,0 @@
-{
-  "layer": "top",
-  "position": "top",
-  "margin-top": 10,
-  "margin-right": 5,
-  "margin-left": 5,
-  "height": 50,
-
-  "modules-left": ["custom/now-playing", "custom/clock"],
-  "modules-center": ["sway/workspaces"],
-  "modules-right": [
-    "custom/date",
-    "custom/bluetooth",
-    "custom/wifi",
-    "battery",
-    "custom/battery-warning",
-    "pulseaudio",
-    "memory",
-    "custom/menu"
-  ],
-
-  "hyprland/workspaces": {
-    "format": "{id}",
-    "format-icons": {
-      "firefox": "",
-      "code": "",
-      "kitty": "",
-      "spotify": "",
-      "discord": "",
-      "default": "{id}"
-    },
-    "on-click": "activate",
-    "on-scroll-up": "hyprctl dispatch workspace e+1",
-    "on-scroll-down": "hyprctl dispatch workspace e-1"
-  },
-
-  "battery": {
-    "format": "{capacity}% {icon}",
-    "format-charging": " {capacity}%",
-    "format-icons": ["", "", "", "", ""],
-    "tooltip": true,
-    "interval": 5
-  },
-
-  "custom/battery-warning": {
-    "exec": "~/.config/waybar/scripts/battery-notify.sh",
-    "interval": 60,
-    "format": "",
-    "tooltip": false
-  },
-
-  "pulseaudio": {
-    "format": "{icon} {volume}%",
-    "format-muted": " Muted",
-    "format-bluetooth": "{icon} {volume}%",
-    "scroll-step": 2,
-    "on-click": "pavucontrol",
-    "ignored-sinks": ["Easy Effects Sink"],
-    "format-icons": {
-      "headphone": "",
-      "headset": "",
-      "hands-free": "",
-      "phone": "",
-      "portable": "",
-      "car": "",
-      "default": ["", ""]
-    }
-  },
-  "memory": {
-    "format": " {used:0.1f}G",
-    "interval": 5
-  },
-
-  "custom/menu": {
-    "exec": "echo '{\"text\": \" \", \"tooltip\": \"System Menu\"}'",
-    "return-type": "json",
-    "on-click": "~/.config/rofi/applets/bin/powermenu.sh",
-    "interval": 5
-  },
-  "custom/wifi": {
-    "exec": "echo '{\"text\": \"\", \"tooltip\": \"Wi-Fi Settings\"}'",
-    "return-type": "json",
-    "on-click": "nm-connection-editor",
-    "interval": 3600
-  },
-
-  "custom/bluetooth": {
-    "exec": "echo '{\"text\": \"\", \"tooltip\": \"Bluetooth Settings\"}'",
-    "return-type": "json",
-    "on-click": "blueman-manager",
-    "interval": 3600
-  },
-  "custom/now-playing": {
-    "exec": "~/.config/waybar/modules/now-playing.sh",
-    "return-type": "text",
-    "interval": 2,
-    "on-click": "playerctl --player=spotify play-pause",
-    "on-scroll-up": "playerctl --player=spotify next",
-    "on-scroll-down": "playerctl --player=spotify previous",
-    "tooltip": true
-  },
-  "custom/clock": {
-    "exec": "date '+ %H:%M'",
-    "return-type": "text",
-    "interval": 60,
-    "tooltip": true,
-    "tooltip-format": "Full date/time"
-  },
-  "custom/date": {
-    "exec": "date '+ %d %b'",
-    "return-type": "text",
-    "interval": 60,
-    "tooltip": true,
-    "tooltip-format": "Full date/time"
-  }
-}
diff --git a/dots/waybar/.config/waybar/config.j2 b/dots/waybar/.config/waybar/config.j2
new file mode 100644
index 0000000..c1ea6f9
--- /dev/null
+++ b/dots/waybar/.config/waybar/config.j2
@@ -0,0 +1,51 @@
+{
+  "layer": "top",
+  "position": "top",
+  "margin-top": 10,
+  "margin-right": 30,
+  "margin-left": 30,
+  "height": 50,
+
+  "modules-left": [],
+  "modules-center": ["sway/workspaces"],
+  "modules-right": [
+    "battery",
+    "pulseaudio",
+  ],
+
+  "sway/workspaces": {
+    "format": "{icon}: {name}",
+    "format-icons": {
+{% for name, ws in window_manager.workspaces.items() %}
+      "{{ name }}": "{{ ws.icon }}",
+{% endfor %}
+    },
+    "on-click": "activate"
+  },
+
+  "battery": {
+    "format": "{capacity}% {icon}",
+    "format-charging": " {capacity}%",
+    "format-icons": ["", "", "", "", ""],
+    "tooltip": true,
+    "interval": 5
+  },
+
+  "pulseaudio": {
+    "format": "{icon} {volume}%",
+    "format-muted": " Muted",
+    "format-bluetooth": "{icon} {volume}%",
+    "scroll-step": 2,
+    "on-click": "pavucontrol",
+    "ignored-sinks": ["Easy Effects Sink"],
+    "format-icons": {
+      "headphone": "",
+      "headset": "",
+      "hands-free": "",
+      "phone": "",
+      "portable": "",
+      "car": "",
+      "default": ["", ""]
+    }
+  },
+}
diff --git a/dots/waybar/.config/waybar/style.css.j2 b/dots/waybar/.config/waybar/style.css.j2
index 4c32949..715937b 100644
--- a/dots/waybar/.config/waybar/style.css.j2
+++ b/dots/waybar/.config/waybar/style.css.j2
@@ -1,153 +1,11 @@
-#waybar {
-  background-color: rgba(40, 40, 40, 0.7);
-  color: #ffffff;
-  border-radius: 50px; /* Rounded corners */
-}
-#custom-files {
-  color: #ccac56;
-  font-size: 25px;
-  padding: 0px 15px;
-  margin-right: 10px;
-  transition: background-color 0.3s;
-}
-
-#custom-spotify:hover {
-  background-color: rgba(29, 185, 84, 0.2);
-}
-
-#workspaces {
-  font-size: 13px;
-  padding: 3px 4px;
-}
-
-#workspaces button {
-  padding: 3px 5px;
-  margin: 0 3px;
-  min-width: 24px;
-  background: transparent;
-  color: #aaaaaa;
-  border: none;
-  border-radius: 6px;
-  transition:
-    background 0.2s ease,
-    color 0.2s ease;
-}
-
-#workspaces button.active {
-  background: #ccac56;
-  color: #1e1e2e;
-  border-radius: 8px;
-}
-
-#workspaces button:hover {
-  background: #444444;
-  color: #ffffff;
-}
-
-#workspaces button.urgent {
-  background: #bf616a;
-  color: #ffffff;
-}
-#battery {
-  padding: 10px 15px;
-  font-size: 18px;
-  color: #ccac56;
-  font-family: "{{ theme.waybar.font }}", "monospace";
-}
-
-#battery:hover {
-  color: #ffffff;
-}
-
-#battery.charging {
-  color: #a3be8c; /* green */
-}
-
-#battery.warning {
-  color: #ebcb8b; /* yellow */
-}
-
-#battery.critical {
-  color: #bf616a; /* red */
-  font-weight: bold;
-}
-#pulseaudio {
-  font-size: 18px;
-  padding: 10px 15px;
-  color: #ccac56;
+* {
   font-family: "{{ theme.waybar.font }}", "monospace";
+  font-size: 16px;
 }
 
-#pulseaudio:hover {
-  color: #ffffff;
-}
-
-#pulseaudio.muted {
-  color: #bf616a;
-  font-weight: bold;
-}
-#memory {
-  font-size: 18px;
-  padding: 0 15px;
-  color: #ccac56;
-  font-family: "{{ theme.waybar.font }}", "monospace";
-}
-
-#memory {
-  color: #d08770;
-}
-#custom-menu {
-  font-size: 20px;
-  color: #ccac56;
-  padding: 0 15px;
-  transition: color 0.3s;
-}
-
-#custom-menu:hover {
-  color: #ffffff;
-}
-
-#custom-wifi {
-  font-size: 20px;
-  padding: 10px 15px;
-  color: #ccac56;
-  transition: color 0.3s;
-}
-
-#custom-wifi:hover,
-#custom-bluetooth:hover {
-  color: #ffffff;
-}
-
-#custom-bluetooth {
-  font-size: 25px;
-  padding: 0 15px;
-  color: #ccac56;
-  transition: color 0.3s;
-}
-#custom-now-playing {
-  color: #ccac56;
-  font-size: 18px;
-  padding: 0 10px;
-  font-family: "{{ theme.waybar.font }}", "monospace";
-}
-#custom-clock {
-  font-size: 18px;
-  padding: 0 10px;
-  color: #ccac56;
-  font-family: "{{ theme.waybar.font }}", "monospace";
-}
-
-#custom-clock:hover {
+#waybar {
+  background-color: rgba(40, 40, 40, 0.6);
   color: #ffffff;
-}
-#custom-date {
-  font-size: 18px;
-  padding: 0 10px;
-  color: #ccac56;
-  font-family: "{{ theme.waybar.font }}", "monospace";
+  border-radius: 18px;
 }
 
-#custom-date:hover {
-  color: #ffffff;
-}