From 7df9eb7b4fd1c7383a7f67c3287e4dee8f5c592e Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Sat, 5 Apr 2025 23:57:55 +0100 Subject: [PATCH] Extract a node mixin --- home/opdavies/modules/default.nix | 1 - home/opdavies/modules/node.nix | 17 ----------------- hosts/PW05CH3L/configuration.nix | 1 + hosts/t480/configuration.nix | 1 + modules/mixins/node.nix | 19 +++++++++++++++++++ 5 files changed, 21 insertions(+), 18 deletions(-) delete mode 100644 home/opdavies/modules/node.nix create mode 100644 modules/mixins/node.nix diff --git a/home/opdavies/modules/default.nix b/home/opdavies/modules/default.nix index b248f871..6406b7dc 100644 --- a/home/opdavies/modules/default.nix +++ b/home/opdavies/modules/default.nix @@ -1,6 +1,5 @@ { imports = [ - ./node.nix ./ranger.nix ]; } diff --git a/home/opdavies/modules/node.nix b/home/opdavies/modules/node.nix deleted file mode 100644 index b0aae355..00000000 --- a/home/opdavies/modules/node.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ 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"; - }; -} diff --git a/hosts/PW05CH3L/configuration.nix b/hosts/PW05CH3L/configuration.nix index 8e34b2d5..b5427cd8 100644 --- a/hosts/PW05CH3L/configuration.nix +++ b/hosts/PW05CH3L/configuration.nix @@ -8,6 +8,7 @@ ../../modules/mixins/docker.nix ../../modules/mixins/fzf.nix ../../modules/mixins/git.nix + ../../modules/mixins/node.nix ../../modules/mixins/phpactor ../../modules/mixins/starship.nix ../../modules/mixins/tmux.nix diff --git a/hosts/t480/configuration.nix b/hosts/t480/configuration.nix index 8e1021a5..7bb4d69d 100644 --- a/hosts/t480/configuration.nix +++ b/hosts/t480/configuration.nix @@ -18,6 +18,7 @@ ../../modules/mixins/git.nix ../../modules/mixins/gtk.nix ../../modules/mixins/mpv.nix + ../../modules/mixins/node.nix ../../modules/mixins/phpactor ../../modules/mixins/pipewire.nix ../../modules/mixins/screenkey.nix diff --git a/modules/mixins/node.nix b/modules/mixins/node.nix new file mode 100644 index 00000000..823ba7a3 --- /dev/null +++ b/modules/mixins/node.nix @@ -0,0 +1,19 @@ +{ + home-manager.users.opdavies = + { 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"; + }; + }; +}