fixes npm

modules/env.nix

@@ -3,15 +3,6 @@
   lib,
   ...
 }: {
-  environment.shellInit = ''
-    if [ -d "$HOME/.cargo/bin" ]; then
-      export PATH="$PATH:$HOME/.cargo/bin"
-    fi
-    if [ -d "$HOME/.npm-global/bin" ]; then
-      export PATH="$PATH:$HOME/.npm-global/bin"
-    fi
-  '';
-
   environment.variables = {
     EDITOR = "nvim";
     VISUAL = "nvim";
@@ -24,7 +15,6 @@
       pkgs.openssl.dev
       pkgs.libxml2.dev
       pkgs.zlib.dev
-      pkgs.ffmpeg
       pkgs.portaudio
       pkgs.alsa-lib
       pkgs.stdenv.cc.cc
@@ -41,14 +31,12 @@
       pkgs.mangohud
       pkgs.portaudio
       pkgs.alsa-lib
-      pkgs.ffmpeg
       pkgs.stdenv.cc.cc.lib
       pkgs.xorg.libX11
       pkgs.xorg.libXtst
       pkgs.xorg.libXi
       pkgs.glib
     ];
-    NPM_CONFIG_PREFIX = "$HOME/.npm-global";
   };
 
   environment.pathsToLink = [

modules/npm.nix

@@ -3,57 +3,45 @@
   pkgs,
   lib,
   ...
-}:
+}: let
-# TODO:bandaid fix for now
-let
-  npmGlobalDir = "/home/cobray/.npm-global";
   npmConf = pkgs.writeText "npmrc" ''
-    prefix=${npmGlobalDir}
+    prefix=${"$"}{HOME}/.npm-global
-    cache=/home/cobray/.npm
+    cache=${"$"}{HOME}/.npm
-    init-module=/home/cobray/.npm-init.js
+    init-module=${"$"}{HOME}/.npm-init.js
   '';
 in {
-  options.npm = {
+  options.npm.enable = lib.mkEnableOption "system-wide npm environment";
-    enable = lib.mkEnableOption "System NPM Environment";
+
-  };
   config = lib.mkIf config.npm.enable {
     environment.systemPackages = with pkgs; [
       nodejs_22
       nodePackages.npm
-      electron
       yarn
       bun
-      deno
+      pnpm
-      nodePackages.eslint
+      electron
+      nodePackages.typescript
       nodePackages.prettier
+      nodePackages.eslint
       nodePackages.sql-formatter
       nodePackages.markdownlint-cli
       nodePackages.stylelint
       nodePackages.htmlhint
       nodePackages.jsonlint
-      nodePackages.pnpm
-      nodePackages.typescript
     ];
-    environment.variables = {
+
-      PATH = [
+    environment.sessionVariables.PATH =
-        "${pkgs.nodejs_22}/bin"
+      lib.mkAfter ":${"$"}{HOME}/.npm-global/bin";
-        "${npmGlobalDir}/bin"
+
-      ];
-    };
     environment.etc."npmrc".source = npmConf;
-    systemd.user.services.npm-setup = {
+
-      description = "Set up NPM user configuration";
+    systemd.user.services."npm-setup" = {
+      description = "Install .npmrc";
       wantedBy = ["default.target"];
       script = ''
-        if [ ! -f ~/.npmrc ]; then
+        install -m600 -D ${npmConf} "$HOME/.npmrc"
-          cp ${npmConf} ~/.npmrc
-          chmod u+rw ~/.npmrc
-        fi
       '';
-      serviceConfig = {
+      serviceConfig.Type = "oneshot";
-        Type = "oneshot";
-        RemainAfterExit = true;
-      };
     };
   };
 }