diff --git a/home-manager/opdavies/PW05CH3L.nix b/home-manager/opdavies/PW05CH3L.nix
index 9b1c4b50..f2548364 100644
--- a/home-manager/opdavies/PW05CH3L.nix
+++ b/home-manager/opdavies/PW05CH3L.nix
@@ -6,7 +6,6 @@
   features = {
     cli = {
       bookmarkthis.enable = true;
-      node.enable = true;
       starship.enable = true;
       zsh.enable = true;
     };
diff --git a/home-manager/opdavies/t480.nix b/home-manager/opdavies/t480.nix
index c44a3d42..9e0a5c83 100644
--- a/home-manager/opdavies/t480.nix
+++ b/home-manager/opdavies/t480.nix
@@ -9,7 +9,6 @@
   features = {
     cli = {
       bookmarkthis.enable = true;
-      node.enable = true;
       starship.enable = true;
       zsh.enable = true;
     };
diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix
index bbc83f21..16df9ee8 100644
--- a/modules/home-manager/default.nix
+++ b/modules/home-manager/default.nix
@@ -2,7 +2,6 @@
   imports = [
     ./bookmarkthis.nix
     ./dev-commit.nix
-    ./node.nix
     ./starship.nix
     ./zsh
   ];
diff --git a/modules/home-manager/node.nix b/modules/home-manager/node.nix
deleted file mode 100644
index fba772c1..00000000
--- a/modules/home-manager/node.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ config, lib, ... }:
-
-with lib;
-
-let
-  cfg = config.features.cli.node;
-
-  inherit (config.xdg) configHome dataHome stateHome;
-in
-{
-  options.features.cli.node.enable = mkEnableOption "Enable node";
-
-  config = mkIf cfg.enable {
-    xdg.configFile."${config.home.sessionVariables.NPM_CONFIG_USERCONFIG}".text = ''
-      cache=${configHome}/npm
-      init-module=${configHome}/npm/config/npm-init.js
-      logs-dir=${stateHome}/npm/logs
-      prefix=${dataHome}/npm
-    '';
-
-    home.sessionVariables = {
-      NPM_CONFIG_USERCONFIG = "${configHome}/npm/npmrc";
-    };
-  };
-}
diff --git a/modules2/node.nix b/modules2/node.nix
new file mode 100644
index 00000000..55ec9367
--- /dev/null
+++ b/modules2/node.nix
@@ -0,0 +1,19 @@
+{
+  flake.modules.homeManager.base =
+    { config, ... }:
+    let
+      inherit (config.xdg) configHome dataHome stateHome;
+    in
+    {
+      xdg.configFile."${config.home.sessionVariables.NPM_CONFIG_USERCONFIG}".text = ''
+        cache=${configHome}/npm
+        init-module=${configHome}/npm/config/npm-init.js
+        logs-dir=${stateHome}/npm/logs
+        prefix=${dataHome}/npm
+      '';
+
+      home.sessionVariables = {
+        NPM_CONFIG_USERCONFIG = "${configHome}/npm/npmrc";
+      };
+    };
+}