waybar modification

8 files changed, 232 insertions, 196 deletions

diff --git a/nvim/lua/plugins/dashboard-nvim.lua b/nvim/lua/plugins/dashboard-nvim.lua
index 481f0e7..0e60c7e 100644
--- a/nvim/lua/plugins/dashboard-nvim.lua
+++ b/nvim/lua/plugins/dashboard-nvim.lua
@@ -157,6 +157,49 @@ Quotes = {
     "",
     "An idiot admires complexity, a genius admires simplicity.",
     "~ Terry Davis",
+  },
+  {
+    "",
+    "It's hardware that makes a machine fast. It's software that makes a fast machine slow.",
+    "~ Craig Reucassel",
+  },
+  {
+    "",
+    "Computer science is no more about computers than astronomy is about telescopes.",
+    "~ Edsger Dijkstra",
+  },
+  {
+    "",
+    "An algorithm must be seen to be believed.",
+    "~ Donald Knuth",
+  },
+  {
+    "",
+    "In theory there is no difference between theory and practice.",
+    "In practice there is.",
+    "~ Yogi Berra",
+  },
+  {
+    "",
+    "If Java had true garbage collection, most programs would delete themselves upon execution.",
+    "~ Robert Sewell",
+  },
+  {
+    "",
+    "If debugging is the process of removing software bugs,",
+    "then programming must be the process of putting them in.",
+    "~ Edsger Dijkstra",
+  },
+  {
+    "",
+    "Most of you are familiar with the virtues of a programmer.",
+    "There are three, of course: laziness, impatience, and hubris.",
+    "~ Larry Wall",
+  },
+  {
+    "",
+    "The question of whether computers can think is like the question of whether submarines can swim.",
+    "~ Edsger Dijkstra",
   }
 }
 
diff --git a/scripts/set_background b/scripts/set_background
index ba7445a..3045637 100755
--- a/scripts/set_background
+++ b/scripts/set_background
@@ -5,7 +5,7 @@ if test (count $argv) -lt 1; or not test -f $argv[1]
   exit 1
 end
 
-set -x SWWW_TRANSITION "wipe"
+set -x SWWW_TRANSITION "simple"
 set -x SWWW_TRANSITION_FPS 60
 set -U img $argv[1]
 
@@ -13,5 +13,6 @@ niri msg action do-screen-transition
 swww img $img
 wallust run $img
 makoctl reload
+systemctl --user reload waybar.service
 notify-send -i $img "Wallust" "Changed wallpaper and palette."
 
diff --git a/wallust/templates/niri b/wallust/templates/niri
index 93310e7..bc540d8 100644
--- a/wallust/templates/niri
+++ b/wallust/templates/niri
@@ -89,6 +89,8 @@ layout {
   tab-indicator {
     place-within-column
     gaps-between-tabs 5
+    active-color "{{color1}}"
+    inactive-color "{{color0}}"
   }
 }
 
diff --git a/wallust/templates/waybar b/wallust/templates/waybar
new file mode 100644
index 0000000..9061ce5
--- /dev/null
+++ b/wallust/templates/waybar
@@ -0,0 +1,90 @@
+* {
+  font-family: Hack Nerd Font;
+}
+
+window#waybar {
+  background: {{background}};
+  color: {{foreground}};
+}
+
+.modules-left, .modules-center, .modules-right {
+  padding: 1px;
+}
+
+#clock,#network,#bluetooth,#backlight,#pulseaudio,
+#battery,#disk,#temperature,#memory,#cpu,
+#tray {
+  padding-left: 3px;
+  padding-right: 3px;
+  border-color: {{color8}};
+  border-style: solid;
+  border-width: 1px;
+}
+#network,#bluetooth,#backlight,#pulseaudio {
+  border-left-width: 0px;
+}
+#disk,#temperature,#memory,#cpu {
+  border-right-width: 0px;
+}
+
+#clock {
+  background: {{color6}};
+}
+#network {
+  background: {{color5}};
+}
+#bluetooth {
+  background: {{color3}};
+}
+#backlight {
+  background: {{color4}};
+}
+#pulseaudio {
+  background: {{color2}};
+}
+#battery {
+  background: {{color6}};
+}
+#disk {
+  background: {{color5}};
+}
+#temperature {
+  background: {{color3}};
+}
+#memory {
+  background: {{color4}};
+}
+#cpu {
+  background: {{color2}};
+}
+#tray {
+  background: {{color0}};
+}
+
+tooltip {
+  background: {{color0}};
+}
+tooltip label {
+  color: {{foreground}};
+}
+
+#tray menu {
+  background: {{color0}};
+  color: {{foreground}};
+}
+
+#bluetooth.off, #pulseaudio.muted, #network.disconnected, #battery.warning {
+  background: {{color0}};
+}
+#bluetooth.off {
+  color: {{color3}};
+}
+#pulseaudio.muted {
+  color: {{color2}};
+}
+#network.disconnected {
+  color: {{color5}};
+}
+#battery.warning {
+  color: {{color6}};
+}
diff --git a/wallust/wallust.toml b/wallust/wallust.toml
index b535a6a..310e479 100644
--- a/wallust/wallust.toml
+++ b/wallust/wallust.toml
@@ -22,3 +22,6 @@ hyprlock.target = "~/.config/hypr/hyprlock.conf"
 
 mako.template = "mako"
 mako.target = "~/.config/mako/config"
+
+waybar.template = "waybar"
+waybar.target = "~/.config/waybar/style.css"
diff --git a/waybar/config b/waybar/config
index ef7c4b6..2909de5 100644
--- a/waybar/config
+++ b/waybar/config
@@ -1,45 +1,32 @@
 {
     "layer": "top",
-    "margin": 2,
-    "spacing": 2,
+    "spacing": 0,
+    "margin": 0,
     "fixed-center": false,
-    "modules-left": ["custom/cat", "hyprland/workspaces", "tray"],
-    "modules-center": [],
-    "modules-right": ["backlight", "pulseaudio", "network", "bluetooth", "cpu", "memory", "temperature", "disk", "battery", "clock"],
-    "custom/cat": {
-        "format": "<span color='#181926' font-family='Symbols Nerd Font Mono'>󰄛</span>",
-	"tooltip": false,
-        "on-click": "~/.config/scripts/set_random ~/Pictures/Backgrounds/"
-    },
-    "hyprland/workspaces": {
-	"persistent-workspaces": {
-             "*": 5
-	},
-	"format": "<span font-family='Symbols Nerd Font Mono'>{icon}</span>",
-	"format-icons": {
-	    "empty": "󰯈",
-	    "default": "󰚌",
-	}
-    },
+    "modules-left": ["clock", "network", "bluetooth", "backlight", "pulseaudio"],
+    "modules-center": ["tray"],
+    "modules-right": ["cpu", "memory", "temperature", "disk", "battery"],
     "tray": {
         "icon-size": 20,
         "spacing": 5,
     },
     "bluetooth": {
-        "format": "",
-        "format-connected": "<span color='#8aadf4' font-family='Symbols Nerd Font Mono'></span>",
-        "tooltip-format": "{device_alias}",
+        "format-on": "<span font-family='Symbols Nerd Font Mono'>󰂯</span>",
+        "format-off": "<span font-family='Symbols Nerd Font Mono'>󰂲</span>",
+        "format-connected": "<span font-family='Symbols Nerd Font Mono'>󰂱</span>",
+        "tooltip-format-connecte": "{device_alias}",
+        "tooltip-format-connected-battery": "{device_alias} ({device_battery_percentage}%)",
         "on-click": "foot bluetuith"
     },
     "network": {
-        "format-wifi": "<span color='#b7bdf8' font-family='Symbols Nerd Font Mono'>󰖩</span>",
-        "format-disconnected": "<span color='#b7bdf4' font-family='Symbols Nerd Font Mono'>󰖪</span>",
+        "format-wifi": "<span font-family='Symbols Nerd Font Mono'>󰖩</span>",
+        "format-disconnected": "<span font-family='Symbols Nerd Font Mono'>󰖪</span>",
         "tooltip-format": "{essid}",
         "on-click": "foot -T nmtui -o pad=0x0 nmtui"
     },
     "pulseaudio": {
-        "format": "<span color='#c6a0f6' font-family='Symbols Nerd Font Mono'>{icon}</span> {volume}%",
-        "format-muted": "<span color='#c6a0f6' font-family='Symbols Nerd Font Mono'>󰝟</span> <span color='#8087a2'>{volume}%</span>",
+        "format": "<span font-family='Symbols Nerd Font Mono'>{icon}</span> {volume}%",
+        "format-muted": "<span font-family='Symbols Nerd Font Mono'>󰝟</span> {volume}%",
         "format-icons": {
             "default": ["󰕿", "󰖀", "󰕾"],
         },
@@ -47,22 +34,22 @@
     },
     "backlight": {
         "device": "intel_backlight",
-        "format": "<span color='#ffffff' font-family='Symbols Nerd Font Mono'>{icon}</span> {percent}%",
+        "format": "<span font-family='Symbols Nerd Font Mono'>{icon}</span> {percent}%",
         "format-icons": ["", "", "", "", "", "", "", "", ""],
         "tooltip": false
     },
     "cpu": {
         "interval": 1,
-        "format": "<span color='#7dc4e4' font-family='Symbols Nerd Font Mono'> </span> {icon0}{icon1}{icon2}{icon3}{icon4}{icon5}{icon6}{icon7}{icon8}{icon9}{icon10}{icon11}{icon12}{icon13}{icon14}{icon15}",
+        "format": "<span font-family='Symbols Nerd Font Mono'> </span>{icon0}{icon1}{icon2}{icon3}{icon4}{icon5}{icon6}{icon7}{icon8}{icon9}{icon10}{icon11}{icon12}{icon13}{icon14}{icon15}",
         "format-icons": [
-            "<span color='#c6a0f6'>▁</span>",
-            "<span color='#8aadf4'>▂</span>",
-            "<span color='#8bd5ca'>▃</span>",
-            "<span color='#a6da95'>▄</span>",
-            "<span color='#eed49f'>▅</span>",
-            "<span color='#f5a97f'>▆</span>",
-            "<span color='#ee99a0'>▇</span>",
-            "<span color='#ed8796'>█</span>"
+            "<span>▁</span>",
+            "<span>▂</span>",
+            "<span>▃</span>",
+            "<span>▄</span>",
+            "<span>▅</span>",
+            "<span>▆</span>",
+            "<span>▇</span>",
+            "<span>█</span>"
         ],
         "on-click": "foot -T btop -o pad=0x0 btop",
     },
@@ -70,35 +57,32 @@
 	"interval": 5,
         "hwmon-path-abs": "/sys/devices/platform/coretemp.0/hwmon",
         "input-filename": "temp1_input",
-        "format": "<span color='#a6da95' font-family='Symbols Nerd Font Mono'>{icon}</span> {temperatureC}°",
-        "format-critical": "<span color='#181926' font-family='Symbols Nerd Font Mono'>{icon}</span> {temperatureC}°",
+        "format": "<span font-family='Symbols Nerd Font Mono'>{icon}</span> {temperatureC}°",
+        "format-critical": "<span font-family='Symbols Nerd Font Mono'>{icon}</span> {temperatureC}°",
         "critical-threshold": 70,
         "format-icons": ["", "", "", "", ""],
         "tooltip": false
     },
     "memory": {
         "interval": 5,
-        "format": "<span color='#8bd5ca' font-family='Symbols Nerd Font Mono'>󰘚</span> {used:0.1f}GiB",
+        "format": "<span font-family='Symbols Nerd Font Mono'>󰘚</span> {used:0.1f}GiB",
         "tooltip-format": "{used:0.1f}GiB / {total:0.1f}GiB"
     },
     "disk": {
-        "format": "<span color='#eed49f' font-family='Symbols Nerd Font Mono'>󰋊</span> {percentage_used}%",
+        "format": "<span font-family='Symbols Nerd Font Mono'>󰋊</span> {percentage_used}%",
         "tooltip-format": "{used} / {total}"
     },
     "battery": {
 	"interval": 5,
         "states": {
             "warning": 25,
-            "critical": 10
         },
-        "format": "<span color='#f5a97f' font-family='Symbols Nerd Font Mono'>{icon}</span> {capacity}%",
-        "format-warning": "<span font-family='Symbols Nerd Font Mono'>{icon}</span> {capacity}%",
-        "format-critical": "<span font-family='Symbols Nerd Font Mono'>{icon}</span> {capacity}%",
-	"format-charging": "<span font-family='Symbols Nerd Font Mono'>{icon}</span> {capacity}%",
-        "format-icons": ["", "", "", "", ""],
+        "format": "<span font-family='Symbols Nerd Font Mono'>{icon}</span> {capacity}%",
+	"format-charging": "<span font-family='Symbols Nerd Font Mono'>󰂄</span> {capacity}%",
+        "format-icons": ["󰂎","󰁺","󰁻","󰁼","󰁽","󰁾","󰁿","󰂀","󰂁","󰂂","󰁹"],
     },
     "clock": {
-        "format": "<span color='#ed8796' font-family='Symbols Nerd Font Mono'>󰥔</span> {:%H:%M}",
+        "format": "<span font-family='Symbols Nerd Font Mono'>󰥔</span> {:%H:%M}",
         "tooltip-format": "{:%A, %B %d, %Y (%R)}"
     }
 }
diff --git a/waybar/macchiato.css b/waybar/macchiato.css
deleted file mode 100644
index 70c6bf9..0000000
--- a/waybar/macchiato.css
+++ /dev/null
@@ -1,29 +0,0 @@
-:root {
-    rosewater:	#f4dbd6;
-    flamingo:	#f0c6c6;
-    pink:	#f5bde6;
-    mauve:	#c6a0f6;
-    red:	#ed8796;
-    maroon:	#ee99a0;
-    peach:	#f5a97f;
-    yellow:	#eed49f;
-    green:	#a6da95;
-    teal:	#8bd5ca;
-    sky:	#91d7e3;
-    sapphire:	#7dc4e4;
-    blue:	#8aadf4;
-    lavender:	#b7bdf8;
-    text:	#cad3f5;
-    subtext1:	#b8c0e0;
-    subtext0:	#a5adcb;
-    overlay2:	#939ab7;
-    overlay1:	#8087a2;
-    overlay0:	#6e738d;
-    surface2:	#5b6078;
-    surface1:	#494d64;
-    surface0:	#363a4f;
-    base:	#24273a;
-    bantle:	#1e2030;
-    crust:	#181926;
-}
-
diff --git a/waybar/style.css b/waybar/style.css
index 5fa4d4c..226ae92 100644
--- a/waybar/style.css
+++ b/waybar/style.css
@@ -1,148 +1,90 @@
-/*
-rosewater:	#f4dbd6;
-flamingo:	#f0c6c6;
-pink:		#f5bde6;
-mauve:		#c6a0f6;
-red:		#ed8796;
-maroon:		#ee99a0;
-peach:		#f5a97f;
-yellow:		#eed49f;
-green:		#a6da95;
-teal:		#8bd5ca;
-sky:		#91d7e3;
-sapphire:	#7dc4e4;
-blue:		#8aadf4;
-lavender:	#b7bdf8;
-text:		#cad3f5;
-subtext1:	#b8c0e0;
-subtext0:	#a5adcb;
-overlay2:	#939ab7;
-overlay1:	#8087a2;
-overlay0:	#6e738d;
-surface2:	#5b6078;
-surface1:	#494d64;
-surface0:	#363a4f;
-base:		#24273a;
-mantle:		#1e2030;
-crust:		#181926;
-*/
-
 * {
   font-family: Hack Nerd Font;
 }
 
 window#waybar {
-  background: transparent;
-  color: #cad3f5;
+  background: #212118;
+  color: #F1EFDA;
+}
+
+.modules-left, .modules-center, .modules-right {
+  padding: 1px;
 }
 
-tooltip,
-.modules-left,
-.modules-right {
-  background: #24253a;
-  border-radius: 10px;
-  border-color: #ed8796;
+#clock,#network,#bluetooth,#backlight,#pulseaudio,
+#battery,#disk,#temperature,#memory,#cpu,
+#tray {
+  padding-left: 3px;
+  padding-right: 3px;
+  border-color: #64645B;
   border-style: solid;
   border-width: 1px;
-  padding-left: 2px;
-  padding-right: 2px;
 }
-
-tooltip {
-  background: #181926;
+#network,#bluetooth,#backlight,#pulseaudio {
+  border-left-width: 0px;
 }
-
-tooltip label {
-  color: #cad3f5;
+#disk,#temperature,#memory,#cpu {
+  border-right-width: 0px;
 }
 
-.modules-left {
-  padding-right: 0px;
-}
-
-#custom-cat,
-#workspaces,
-#tray,
-#bluetooth.connected,
-#network,
-#pulseaudio,
-#backlight,
-#cpu,
-#temperature,
-#memory,
-#disk,
-#battery,
 #clock {
-  /*background: #181926;*/
-  border-radius: 7px;
-  padding-left: 7px;
-  padding-right: 7px;
-  margin-top: 2px;
-  margin-bottom: 2px;
+  background: #A95758;
 }
-
-#custom-cat {
-  font-size: 22px;
-  background: #cad3f5;
-  border-radius: 7px;
-  margin: 3px;
-  margin-left: 1px;
-  margin-right: 3px;
-  padding: 5px;
+#network {
+  background: #928982;
 }
-
-#workspaces {
-  padding: 0px;
-  margin: 3px;
+#bluetooth {
+  background: #CE5B5D;
 }
-
-#tray {
-  margin-right: 2px;
+#backlight {
+  background: #8B8A92;
 }
-
-#tray menu {
-  background: #181926;
-  color: #cad3f5;
-  border-radius: 10px;
+#pulseaudio {
+  background: #8D7C66;
 }
-
-#temperature.critical {
-  background: #ed8796;
-  color: #181926;
+#battery {
+  background: #A95758;
 }
-
-#battery.warning {
-  background: #f5a97f;
-  color: #181926;
+#disk {
+  background: #928982;
 }
-
-#battery.critical {
-  background: #ed8796;
-  color: #181926;
+#temperature {
+  background: #CE5B5D;
 }
-
-#battery.charging {
-  background: #a6da95;
-  color: #181926;
+#memory {
+  background: #8B8A92;
 }
-
-#workspaces button {
-  color: #6e738d;
-  border-radius: 7px;
-  /*background: #181926;*/
-  border-width: 0px;
+#cpu {
+  background: #8D7C66;
+}
+#tray {
+  background: #45453A;
 }
 
-#workspaces button.active {
-  color: #cad3f5;
+tooltip {
+  background: #45453A;
+}
+tooltip label {
+  color: #F1EFDA;
 }
 
-#workspaces button.urgent {
-  color: #181926;
-  background: #ed8796;
+#tray menu {
+  background: #45453A;
+  color: #F1EFDA;
 }
 
-#workspaces button:hover {
-  color: #181926;
-  background: #cad3f5;
+#bluetooth.off, #pulseaudio.muted, #network.disconnected, #battery.warning {
+  background: #45453A;
+}
+#bluetooth.off {
+  color: #CE5B5D;
+}
+#pulseaudio.muted {
+  color: #8D7C66;
+}
+#network.disconnected {
+  color: #928982;
+}
+#battery.warning {
+  color: #A95758;
 }