flake.nix

@@ -250,8 +250,8 @@
         system,
       }: {
         default = pkgs.mkShell {
-          buildInputs = with pkgs; [
+          buildInputs = [
-            just
+            pkgs.just
             self.packages.${system}.nvim
           ];
           QEMU_OPTS_WL = "--enable-kvm -smp 4 -device virtio-gpu-rutabaga,gfxstream-vulkan=on,cross-domain=on,hostmem=2G,wsi=headless";

nvim/augroups.nix

@@ -1,13 +1,6 @@
-{
+{helpers, ...}: let
-  lib,
-  config,
-  helpers,
-  ...
-}: let
   inherit (helpers) mkRaw;
-  cfg = config.jhome.nvim;
+in {
-in
-  lib.mkIf cfg.enable {
   autoGroups = {
     "highlightOnYank" = {};
     "lspConfig" = {};
@@ -91,4 +84,4 @@ in
         '';
     }
   ];
-  }
+}

nvim/default.nix

@@ -1,5 +1,14 @@
-{pkgs, ...} @ opts: {
+{
+  lib,
+  pkgs,
+  config,
+  helpers,
+  ...
+}: let
+  # Force inputs to be included
+  nixvim = import ./nixvim.nix {inherit lib pkgs config helpers;};
+in {
   imports = [./options.nix];
 
-  config.programs.nixvim = (import ./nixvim.nix opts).config;
+  config.programs.nixvim = nixvim.config;
 }

nvim/mappings.nix

@@ -1,15 +1,6 @@
-{
+{helpers, ...}: let
-  lib,
-  config,
-  helpers,
-  ...
-}: let
   inherit (helpers) mkRaw;
-
+in [
-  cfg = config.jhome.nvim;
-in
-  lib.mkIf cfg.enable {
-    keymaps = [
   # Quickfix
   {
     mode = "n";
@@ -154,5 +145,4 @@ in
     action = mkRaw "require('nvim-silicon').clip";
     options.desc = "Snap Code (to clipboard)";
   }
-    ];
+]
-  }

nvim/nixvim.nix

@@ -10,14 +10,18 @@
   darwinAvailable = args ? darwinConfig;
   canSetAsDefault = hmAvailable || nixosAvailable;
   notStandalone = hmAvailable || nixosAvailable || darwinAvailable;
+  augroups = import ./augroups.nix args;
 in {
-  imports = [./options.nix ./plugins.nix ./mappings.nix ./augroups.nix];
+  imports = [./options.nix];
 
   config = lib.mkMerge [
     (lib.optionalAttrs canSetAsDefault {defaultEditor = lib.mkDefault true;})
     (lib.optionalAttrs notStandalone {enable = lib.mkDefault true;})
     (lib.mkIf cfg.enable {
       package = pkgs.unstable.neovim-unwrapped;
+      inherit (augroups) autoGroups autoCmd;
+      plugins = import ./plugins.nix args;
+      keymaps = import ./mappings.nix args;
       globals.mapleader = " ";
       # Appearance
       colorschemes.gruvbox = {

nvim/plugins.nix

@@ -2,14 +2,10 @@
   lib,
   pkgs,
   helpers,
-  config,
   ...
 }: let
   inherit (helpers) mkRaw;
-  cfg = config.jhome.nvim;
+in {
-in
-  lib.mkIf cfg.enable {
-    plugins = {
   bacon = {
     enable = true;
     settings.quickfix.enabled = true;
@@ -243,5 +239,4 @@ in
     enable = true;
     settings.auto_close = true;
   };
-    };
+}
-  }