diff --git a/overlays/waybar.nix b/overlays/waybar.nix
new file mode 100644
index 00000000..075f5d3e
--- /dev/null
+++ b/overlays/waybar.nix
@@ -0,0 +1,5 @@
+channels: final: prev: {
+  waybar = channels.latest.waybar.overrideAttrs (oldAttrs: rec {
+    inherit (prev.sources.waybar-nvfetcher) version src;
+  });
+}
diff --git a/pkgs/_sources/generated.nix b/pkgs/_sources/generated.nix
index 389c20af..958ac844 100644
--- a/pkgs/_sources/generated.nix
+++ b/pkgs/_sources/generated.nix
@@ -138,6 +138,17 @@
       sha256 = "sha256-fhazQQqyFaO0fdoeNI9nBshwTDhKNHH262H/QThtuO0=";
     };
   };
+  waybar-nvfetcher = {
+    pname = "waybar-nvfetcher";
+    version = "09142fa322e080474de0f2dc3ea98036846550df";
+    src = fetchFromGitHub {
+      owner = "Alexays";
+      repo = "Waybar";
+      rev = "09142fa322e080474de0f2dc3ea98036846550df";
+      fetchSubmodules = false;
+      sha256 = "sha256-5KqQaaKwW14F/rVWGQ0qBUU0b3Z+v/Mq8lnSwqLtT7U=";
+    };
+  };
   wik = {
     pname = "wik";
     version = "aca76040770543a55b8fb0574901bf52df099c34";
diff --git a/pkgs/sources.toml b/pkgs/sources.toml
index 8094dd92..c95b2a06 100644
--- a/pkgs/sources.toml
+++ b/pkgs/sources.toml
@@ -56,3 +56,7 @@ src.git = "https://github.com/akinomyoga/ble.sh"
 fetch.github = "akinomyoga/ble.sh"
 git.fetchSubmodules = true
 git.leaveDotGit = true
+
+[waybar-nvfetcher]
+src.git = "https://github.com/Alexays/Waybar"
+fetch.github = "Alexays/Waybar"
diff --git a/profiles/base-user/.config/waybar/config b/profiles/base-user/.config/waybar/config
index b9ac9598..cd8b135b 100644
--- a/profiles/base-user/.config/waybar/config
+++ b/profiles/base-user/.config/waybar/config
@@ -36,8 +36,22 @@
       "spacing": 10
   },
   "clock": {
-      "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
-      "format-alt": "{:%a %d. %h %H:%M}"
+      "tooltip-format": "<tt><small>{calendar}</small></tt>",
+      "format-alt": "{:%a %d. %h %H:%M}",
+      //"on-scroll": {
+      //    "calendar": 1
+      //}
+      "calendar": {
+          "mode-mon-col"  : 3,
+          "on-scroll": -1,
+          "on-click-right": "mode",
+          "format": {
+              "months":     "<span color='#ffead3'><b>{}</b></span>",
+              "days":       "<span color='#ecc6d9'><b>{}</b></span>",
+              "weekdays":   "<span color='#ffcc66'><b>{}</b></span>",
+              "today":      "<span color='#ff6699'><b><u>{}</u></b></span>"
+          },
+      },
   },
   "backlight": {
       "device": "gmux_backlight",