From c003878c6e0b67b9a43ad2f15608be035d813637 Mon Sep 17 00:00:00 2001
From: TheGeneralist <180094941+thegeneralist01@users.noreply.github.com>
Date: Sat, 14 Feb 2026 12:39:04 +0100
Subject: [PATCH 1/5] add pnpm

---
 modules/common/neovim.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/modules/common/neovim.nix b/modules/common/neovim.nix
index 977009f..6f49a90 100644
--- a/modules/common/neovim.nix
+++ b/modules/common/neovim.nix
@@ -36,6 +36,7 @@ in
 
           nodejs
           nodePackages."sass"
+          pnpm_9
         ]
         ++ optionals config.onLinux [
           #gcc_multi
@@ -64,10 +65,13 @@ in
       };
 
       # TODO: the two from the last (below) should be somehow moved to their own files
+      home.sessionVariables.PNPM_HOME = "$HOME/Library/pnpm";
+
       home.sessionPath = [
         "node_modules/.bin"
         "/opt/homebrew/bin"
         "$HOME/.npm-packages/bin"
+        "$PNPM_HOME"
       ];
     }
   ];

From 82173db312c910a7c4899ca377ae2e79296c550c Mon Sep 17 00:00:00 2001
From: TheGeneralist <180094941+thegeneralist01@users.noreply.github.com>
Date: Sat, 14 Feb 2026 12:38:41 +0100
Subject: [PATCH 2/5] comment out useless stuff

---
 modules/linux/shell/default.nix | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/modules/linux/shell/default.nix b/modules/linux/shell/default.nix
index b06e7f2..feee5a7 100644
--- a/modules/linux/shell/default.nix
+++ b/modules/linux/shell/default.nix
@@ -1,17 +1,17 @@
 { config, lib, pkgs, ... }: let
   inherit (lib) concatStringsSep const flatten getAttr mapAttrsToList mkForce unique;
 in {
-  users.defaultUserShell = pkgs.zsh;
-
-  environment.sessionVariables.SHELLS = config.home-manager.users
-  |> mapAttrsToList (const <| getAttr "shellsByPriority")
-  |> flatten
-  |> map (drv: "${drv}${drv.shellPath}")
-  |> unique
-  |> concatStringsSep ":";
-
-  environment.shellAliases = {
-    ls = mkForce null;
-    l  = mkForce null;
-  };
+  # users.defaultUserShell = pkgs.zsh;
+  #
+  # environment.sessionVariables.SHELLS = config.home-manager.users
+  # |> mapAttrsToList (const <| getAttr "shellsByPriority")
+  # |> flatten
+  # |> map (drv: "${drv}${drv.shellPath}")
+  # |> unique
+  # |> concatStringsSep ":";
+  #
+  # environment.shellAliases = {
+  #   ls = mkForce null;
+  #   l  = mkForce null;
+  # };
 }

From 08d7a88fd8575067b939c2b9ed7e45d4508e0550 Mon Sep 17 00:00:00 2001
From: TheGeneralist <180094941+thegeneralist01@users.noreply.github.com>
Date: Sat, 14 Feb 2026 12:46:56 +0100
Subject: [PATCH 3/5] set pnpm home per OS

---
 modules/common/neovim.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/common/neovim.nix b/modules/common/neovim.nix
index 6f49a90..bcaf944 100644
--- a/modules/common/neovim.nix
+++ b/modules/common/neovim.nix
@@ -65,7 +65,8 @@ in
       };
 
       # TODO: the two from the last (below) should be somehow moved to their own files
-      home.sessionVariables.PNPM_HOME = "$HOME/Library/pnpm";
+      home.sessionVariables.PNPM_HOME =
+        if config.inDarwin then "$HOME/Library/pnpm" else "$HOME/.local/share/pnpm";
 
       home.sessionPath = [
         "node_modules/.bin"

From 4026c0fc2a05b025397c545fdcced3f1bfc5bc1c Mon Sep 17 00:00:00 2001
From: TheGeneralist <180094941+thegeneralist01@users.noreply.github.com>
Date: Sat, 14 Feb 2026 14:19:08 +0100
Subject: [PATCH 4/5] Revert "comment out useless stuff"

This reverts commit 82173db312c910a7c4899ca377ae2e79296c550c.
---
 modules/linux/shell/default.nix | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/modules/linux/shell/default.nix b/modules/linux/shell/default.nix
index feee5a7..b06e7f2 100644
--- a/modules/linux/shell/default.nix
+++ b/modules/linux/shell/default.nix
@@ -1,17 +1,17 @@
 { config, lib, pkgs, ... }: let
   inherit (lib) concatStringsSep const flatten getAttr mapAttrsToList mkForce unique;
 in {
-  # users.defaultUserShell = pkgs.zsh;
-  #
-  # environment.sessionVariables.SHELLS = config.home-manager.users
-  # |> mapAttrsToList (const <| getAttr "shellsByPriority")
-  # |> flatten
-  # |> map (drv: "${drv}${drv.shellPath}")
-  # |> unique
-  # |> concatStringsSep ":";
-  #
-  # environment.shellAliases = {
-  #   ls = mkForce null;
-  #   l  = mkForce null;
-  # };
+  users.defaultUserShell = pkgs.zsh;
+
+  environment.sessionVariables.SHELLS = config.home-manager.users
+  |> mapAttrsToList (const <| getAttr "shellsByPriority")
+  |> flatten
+  |> map (drv: "${drv}${drv.shellPath}")
+  |> unique
+  |> concatStringsSep ":";
+
+  environment.shellAliases = {
+    ls = mkForce null;
+    l  = mkForce null;
+  };
 }

From 6d6c3975f54076349a4e9d20e2b02a050c55b73f Mon Sep 17 00:00:00 2001
From: TheGeneralist <180094941+thegeneralist01@users.noreply.github.com>
Date: Sat, 14 Feb 2026 17:11:34 +0100
Subject: [PATCH 5/5] fix pnpm path

---
 modules/common/neovim.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/common/neovim.nix b/modules/common/neovim.nix
index bcaf944..4230d2b 100644
--- a/modules/common/neovim.nix
+++ b/modules/common/neovim.nix
@@ -66,7 +66,7 @@ in
 
       # TODO: the two from the last (below) should be somehow moved to their own files
       home.sessionVariables.PNPM_HOME =
-        if config.inDarwin then "$HOME/Library/pnpm" else "$HOME/.local/share/pnpm";
+        if config.isDarwin then "$HOME/Library/pnpm" else "$HOME/.local/share/pnpm";
 
       home.sessionPath = [
         "node_modules/.bin"