diff --git a/hosts/elnupad/home.nix b/hosts/elnupad/home.nix
index f02f359..c68ffd9 100644
--- a/hosts/elnupad/home.nix
+++ b/hosts/elnupad/home.nix
@@ -1,3 +1,5 @@
 { pkgs, ... }: {
-
+  imports = [
+    ./polybar.nix
+  ];
 }
diff --git a/hosts/elnupad/polybar.nix b/hosts/elnupad/polybar.nix
new file mode 100644
index 0000000..f9c9228
--- /dev/null
+++ b/hosts/elnupad/polybar.nix
@@ -0,0 +1,31 @@
+{ pkgs, lib, ... }
+
+{
+  home.packages = with pkgs; [ lm_sensors ];
+  services.polybar.config = {
+   "module/cputemp" = {
+      type = "custom/script";
+
+      interval = 2;
+
+      exec = "/etc/profiles/per-user/elnu/bin/sensors | /run/current-system/sw/bin/grep \"Package id 0:\" | /run/current-system/sw/bin/tr -d '+' | /run/current-system/sw/bin/awk '{print $4}'";
+    };
+    "module/battery" = {
+      type = "internal/battery";
+      battery = "BAT0";
+      adapter = "AC";
+
+      format-low = "<animation-low> <label-low>";
+
+      label-charging = "%{F${primary}}AC%{F-} %percentage%%";
+      label-discharging = "%{F${primary}}BAT%{F-} %percentage%%";
+      label-full = "%{F${primary}}AC%{F-}";
+
+      animation-low-0 = "%{F${primary}}BAT%{F-}";
+      animation-low-1 = "%{F${alert}}LOW%{F-}";
+
+      full-at = 96;
+      low-at = 10; # default
+    };
+  };
+}
diff --git a/polybar/default.nix b/polybar/default.nix
index 67dceee..1872f01 100644
--- a/polybar/default.nix
+++ b/polybar/default.nix
@@ -125,31 +125,6 @@ in
         format-prefix = "CPU ";
         format-prefix-foreground = "${primary}";
       };
-      "module/cputemp" = {
-        type = "custom/script";
-
-        interval = 2;
-
-        exec = "/etc/profiles/per-user/elnu/bin/sensors | /run/current-system/sw/bin/grep \"Package id 0:\" | /run/current-system/sw/bin/tr -d '+' | /run/current-system/sw/bin/awk '{print $4}'";
-      };
-      # TODO: Only build battery module on ThinkPad host
-      "module/battery" = {
-        type = "internal/battery";
-        battery = "BAT0";
-        adapter = "AC";
-
-        format-low = "<animation-low> <label-low>";
-
-        label-charging = "%{F${primary}}AC%{F-} %percentage%%";
-        label-discharging = "%{F${primary}}BAT%{F-} %percentage%%";
-        label-full = "%{F${primary}}AC%{F-}";
-
-        animation-low-0 = "%{F${primary}}BAT%{F-}";
-        animation-low-1 = "%{F${alert}}LOW%{F-}";
-
-        full-at = 96;
-        low-at = 10; # default
-      };
       "module/date" = {
         type = "internal/date";