flake-modules/nvim.nix

@@ -1,4 +1,4 @@
-{ inputs, ... }:
+{ inputs, lib, ... }:
 {
   flake.overlays.nixvim = inputs.nixvim.overlays.default;
 
@@ -7,7 +7,7 @@
     let
       nixvimLib = inputs.nixvim.lib.${system};
       nixvim = inputs.nixvim.legacyPackages.${system};
-      module = {
+      moduleDev = {
         inherit pkgs;
         extraSpecialArgs = {
           inherit (inputs) unstable;
@@ -15,12 +15,24 @@
         };
         module = import ../nvim/standalone.nix { standalone = true; };
       };
+      moduleHeadless = {
+        inherit pkgs;
+        extraSpecialArgs = {
+          inherit (inputs) unstable;
+          inherit system;
+        };
+        module = {
+          imports = [ (import ../nvim/standalone.nix { standalone = true; }) ];
+          config.jhome.nvim.dev.enable = false;
+        };
+      };
     in
     {
       # Check standalone nvim build
-      checks.nvim = nixvimLib.check.mkTestDerivationFromNixvimModule module;
+      checks.nvimDev = nixvimLib.check.mkTestDerivationFromNixvimModule moduleDev;
+      checks.nvimHeadless = nixvimLib.check.mkTestDerivationFromNixvimModule moduleHeadless;
 
       # Nvim standalone module
-      packages.nvim = nixvim.makeNixvimWithModule module;
+      packages.nvim = nixvim.makeNixvimWithModule moduleDev;
     };
 }

nvim/augroups.nix

@@ -1,6 +1,13 @@
-{ helpers, ... }:
+{
+  config,
+  helpers,
+  lib,
+  ...
+}:
 let
   inherit (helpers) mkRaw;
+  cfg = config.jhome.nvim;
+  dev = cfg.dev.enable;
 in
 {
   config = {
@@ -9,7 +16,8 @@ in
       "lspConfig" = { };
       "restoreCursorPosition" = { };
     };
-    autoCmd = [
+    autoCmd =
+      [
         {
           group = "highlightOnYank";
           event = "TextYankPost";
@@ -43,7 +51,8 @@ in
                 end
               '';
         }
-      {
+      ]
+      ++ lib.optional dev {
         group = "lspConfig";
         event = "LspAttach";
         pattern = "*";
@@ -94,7 +103,6 @@ in
                 vim.keymap.set('n', 'gi', vim.lsp.buf.implementation, { desc = '[G]o to [I]mplementation', ${opts} })
               end
             '';
-      }
+      };
-    ];
   };
 }

nvim/mappings.nix

@@ -1,9 +1,17 @@
-{ helpers, ... }:
+{
+  lib,
+  config,
+  helpers,
+  ...
+}:
 let
   inherit (helpers) mkRaw;
+  cfg = config.jhome.nvim;
+  dev = cfg.dev.enable;
 in
 {
-  config.keymaps = [
+  config.keymaps =
+    [
       # Quickfix
       {
         mode = "n";
@@ -194,17 +202,6 @@ in
             '';
         options.desc = "Find Quickfix";
       }
-    {
-      mode = "n";
-      key = "<leader>w";
-      action =
-        mkRaw
-          # lua
-          ''
-            require('conform').format
-          '';
-      options.desc = "Format buffer";
-    }
       # Nvim Silicon
       {
         mode = "v";
@@ -218,5 +215,16 @@ in
             '';
         options.desc = "Snap Code (to clipboard)";
       }
-  ];
+    ]
+    ++ lib.optional dev {
+      mode = "n";
+      key = "<leader>w";
+      action =
+        mkRaw
+          # lua
+          ''
+            require('conform').format
+          '';
+      options.desc = "Format buffer";
+    };
 }