diff --git a/modules/nixos/linux/gui/desktopish/fonts.nix b/modules/nixos/linux/gui/desktopish/fonts.nix
index 550763ab..cd5c5c89 100644
--- a/modules/nixos/linux/gui/desktopish/fonts.nix
+++ b/modules/nixos/linux/gui/desktopish/fonts.nix
@@ -12,6 +12,7 @@
       fira-code
       cascadia-code
       nerdfonts
+      font-awesome
     ];
   };
 }
diff --git a/modules/nixos/linux/gui/hyprland/settings.nix b/modules/nixos/linux/gui/hyprland/settings.nix
index 24c468b8..26863657 100644
--- a/modules/nixos/linux/gui/hyprland/settings.nix
+++ b/modules/nixos/linux/gui/hyprland/settings.nix
@@ -85,6 +85,7 @@ in
 
     general = {
       border_size = 2;
+      gaps_out = 5;
       "col.active_border" = "rgba(33ccffee) rgba(00ff99ee) 45deg";
       "col.inactive_border" = "rgba(595959aa)";
       resize_on_border = true;
diff --git a/modules/nixos/linux/gui/hyprland/waybar.nix b/modules/nixos/linux/gui/hyprland/waybar.nix
index 130dc7de..df2c41e5 100644
--- a/modules/nixos/linux/gui/hyprland/waybar.nix
+++ b/modules/nixos/linux/gui/hyprland/waybar.nix
@@ -1,11 +1,73 @@
 # https://github.com/Alexays/Waybar/wiki/Configuration
 {
-  # TODO: https://old.reddit.com/r/archlinux/comments/136eaiw/hyprland_with_waybar_config_reloading/jip7oq1/
   programs.waybar = {
     enable = true;
     settings = {
       mainBar = {
         # output = [ "eDP-1" ]; # Laptop screen only
+        height = 30;
+        modules-center = [
+          # "hyprland/window"
+          "clock"
+        ];
+        modules-right = [
+          "hyprland/workspaces"
+          "cpu"
+          "memory"
+          "backlight"
+          "battery"
+          "network"
+          "tray"
+          "custom/power"
+        ];
+        "hyprland/workspaces" = {
+          # active-only = true;
+          # all-outputs = true;
+          show-special = true;
+          /*
+          format = "{name}{icon}";
+          format-icons = {
+            active = "";
+            default = "";
+          };
+          */
+        };
+        "cpu" = {
+          format = "{}% ";
+        };
+        "memory" = {
+          format = "{}% ";
+        };
+        network = {
+          format-wifi = "  {essid} ({signalStrength}%)";
+          format-ethernet = "  {ifname}";
+          format-disconnected = "⚠  Disconnected";
+          tooltip-format = "{ifname} via {gwaddr}";
+          on-click = "nm-connection-editor";
+        };
+        "clock" = {
+          format = "{:%H:%M}  ";
+          format-alt = "{:%A, %B %d, %Y (%R)}  ";
+          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'>{}</span>";
+              weeks = "<span color='#99ffdd'>{}</span>";
+              weekdays = "<span color='#ffcc66'>{}</span>";
+              today = "<span color='#ffee99'><b><u>{}</u></b></span>";
+            };
+          };
+          actions = {
+            "on-click-right" = "mode";
+            "on-scroll-up" = "shift_up";
+            "on-scroll-down" = "shift_down";
+          };
+        };
       };
     };
   };