diff --git a/home/modules/waybar/default.nix b/home/modules/waybar/default.nix
index c5c5fc9..0abd89d 100644
--- a/home/modules/waybar/default.nix
+++ b/home/modules/waybar/default.nix
@@ -1,68 +1,8 @@
 {
-  lib,
-  ...
-}:
+  imports = [
+    ./settings.nix
+    ./style.nix
+  ];
 
-{
-  programs.waybar = {
-    enable = true;
-    settings = [
-      {
-        height = 16;
-        spacing = 4;
-        modules-left = [ "niri/workspaces" ];
-        modules-right = [
-          "pulseaudio"
-          "memory"
-          "cpu"
-          "network"
-          "clock"
-          "battery"
-        ];
-        clock = {
-          format = "W{:%V %d %b %H:%M}";
-          tooltip-format = "{calendar}";
-          format-alt = "{:%Y-%m-%d %H:%M:%S}";
-        };
-        battery = {
-          bat = "BAT0";
-          adapter = "ADP1";
-          interval = 5;
-          full-at = 99;
-          states = {
-            good = 80;
-            warning = 20;
-            critical = 10;
-          };
-          format = "{capacity}%--";
-          format-charging = "{capacity}%++";
-          format-plugged = "{capacity}%";
-          format-alt = "{time} {power}W";
-        };
-        pulseaudio = {
-          format = "VOL {volume}%";
-          format-muted = "muted";
-          on-click = "pavucontrol";
-        };
-        memory = {
-          interval = 2;
-          format = "RAM {percentage}%";
-          format-alt = "RAM {used:0.1f}G/{total:0.1f}G";
-        };
-        cpu = {
-          interval = 2;
-          format = "CPU {usage}%";
-          format-alt = "CPU {avg_frequency}GHz";
-        };
-        network = {
-          interval = 5;
-          format-wifi = "{ifname} {ipaddr} {essid}";
-          format-ethernet = "{ifname} {ipaddr}";
-          format-disconnected = "{ifname} disconnected";
-          tooltip-format = "{ifname}: {ipaddr}/{cidr}";
-        };
-      }
-    ];
-    style = lib.readFile ./style.css;
-  };
+  programs.waybar.enable = true;
 }
diff --git a/home/modules/waybar/settings.nix b/home/modules/waybar/settings.nix
new file mode 100644
index 0000000..884b8f3
--- /dev/null
+++ b/home/modules/waybar/settings.nix
@@ -0,0 +1,61 @@
+{ lib, ... }:
+
+{
+  programs.waybar.settings = [
+    {
+      height = 16;
+      spacing = 4;
+      modules-left = [ "niri/workspaces" ];
+      modules-right = [
+        "pulseaudio"
+        "memory"
+        "cpu"
+        "network"
+        "clock"
+        "battery"
+      ];
+      clock = {
+        format = "W{:%V %d %b %H:%M}";
+        tooltip-format = "{calendar}";
+        format-alt = "{:%Y-%m-%d %H:%M:%S}";
+      };
+      battery = {
+        bat = "BAT0";
+        adapter = "ADP1";
+        interval = 5;
+        full-at = 99;
+        states = {
+          good = 80;
+          warning = 20;
+          critical = 10;
+        };
+        format = "{capacity}%--";
+        format-charging = "{capacity}%++";
+        format-plugged = "{capacity}%";
+        format-alt = "{time} {power}W";
+      };
+      pulseaudio = {
+        format = "VOL {volume}%";
+        format-muted = "muted";
+        on-click = "pavucontrol";
+      };
+      memory = {
+        interval = 2;
+        format = "RAM {percentage}%";
+        format-alt = "RAM {used:0.1f}G/{total:0.1f}G";
+      };
+      cpu = {
+        interval = 2;
+        format = "CPU {usage}%";
+        format-alt = "CPU {avg_frequency}GHz";
+      };
+      network = {
+        interval = 5;
+        format-wifi = "{ifname} {ipaddr} {essid}";
+        format-ethernet = "{ifname} {ipaddr}";
+        format-disconnected = "{ifname} disconnected";
+        tooltip-format = "{ifname}: {ipaddr}/{cidr}";
+      };
+    }
+  ];
+}
diff --git a/home/modules/waybar/style.nix b/home/modules/waybar/style.nix
new file mode 100644
index 0000000..f1c6a63
--- /dev/null
+++ b/home/modules/waybar/style.nix
@@ -0,0 +1,5 @@
+{ lib, ... }:
+
+{
+  programs.waybar.style = lib.readFile ./style.css;
+}