diff --git a/home-manager/waybar.nix b/home-manager/waybar.nix
index d059807..750dd6f 100644
--- a/home-manager/waybar.nix
+++ b/home-manager/waybar.nix
@@ -1,6 +1,7 @@
-{ config, ... }: {
-  home.file."${config.xdg.configHome}/waybar/config.jsonc" = {
-    text = builtins.toJSON {
+{ ... }: {
+  programs.waybar.enable = true;
+  programs.waybar.settings = {
+    mainBar = {
       height = 35;
       spacing = 4;
       modules-left = [ ];
@@ -8,12 +9,34 @@
         "clock"
       ];
       modules-right = [
+        "privacy"
         "pulseaudio"
         "cpu"
         "memory"
         "tray"
       ];
-
+      clock = {
+        format = "{:%a %F %H:%M}";
+        "tooltip-format" = "<tt><small>{calendar}</small></tt>";
+        "calendar" = {
+          "mode" = "year";
+          "mode-mon-col" = 3;
+          "weeks-pos" = "right";
+          "on-scroll" = 1;
+          "format" = {
+            "months" = "<span color='#ffead3'><b>{}</b></span>";
+            "days" = "<span color='#ecc6d9'><b>{}</b></span>";
+            "weeks" = "<span color='#99ffdd'><b>W{}</b></span>";
+            "weekdays" = "<span color='#ffcc66'><b>{}</b></span>";
+            "today" = "<span color='#ff6699'><b><u>{}</u></b></span>";
+          };
+        };
+        "actions" = {
+          "on-click-right" = "mode";
+          "on-scroll-up" = "shift_up";
+          "on-scroll-down" = "shift_down";
+        };
+      };
       pulseaudio = {
         # "scroll-step": 1, // %, can be a float
         "format" = "{volume}% {icon} {format_source}";
@@ -44,6 +67,7 @@
       tray = {
         spacing = 10;
       };
+
     };
   };
 }
diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index 843c868..1530c74 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -179,7 +179,6 @@ in
   };
   services.displayManager.enable = true;
   xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk pkgs.xdg-desktop-portal-gnome pkgs.gnome-keyring ];
-  programs.waybar.enable = true;
 
   # TODO: Create a fancontrol config
   hardware.fancontrol.enable = false;
@@ -317,6 +316,7 @@ in
     alacritty
     fuzzel
     xwayland-satellite
+    font-awesome
   ];
 
   # Some programs need SUID wrappers, can be configured further or are