WIP

flake-modules/default.nix

@@ -6,18 +6,17 @@
 }:
 {
   imports = [
-    ./checks.nix
     ./devshell.nix
     ./git-hooks.nix
     ./lib.nix
+    ./nixvim.nix
     ./overlays.nix
     ./pkgs-by-name.nix
     ./treefmt.nix
   ];
 
   perSystem =
     {
-      self',
       system,
       ...
     }:
@@ -27,7 +26,5 @@
         overlays = lib.attrValues self.overlays;
         config.allowUnfree = true;
       };
-
-      packages.default = self'.packages.khanelivim;
     };
 }

flake-modules/nixvim.nix

@@ -0,0 +1,33 @@
+{ inputs, self, ... }:
+{
+  imports = [
+    inputs.nixvim.flakeModules.default
+  ];
+
+  nixvim = {
+    packages.enable = true;
+    checks.enable = true;
+  };
+
+  flake.nixvimModules = {
+    default = ../modules/nixvim;
+  };
+
+  perSystem =
+    { config, system, ... }:
+    {
+      nixvimConfigurations = {
+        default = inputs.nixvim.lib.evalNixvim {
+          inherit system;
+          modules = [
+            self.nixvimModules.default
+          ];
+        };
+      };
+
+      packages = {
+        # Lets you start nixvim using `nix run`
+        default = config.packages.nixvim-default;
+      };
+    };
+}

flake.nix

@@ -10,7 +10,7 @@
     nix-darwin.inputs.nixpkgs.follows = "nixpkgs";
     nix-darwin.url = "github:LnL7/nix-darwin";
     nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
-    nixvim.url = "github:nix-community/nixvim";
+    nixvim.url = "github:MattSturgeon/nixvim/template/evalNixvim";
     pkgs-by-name-for-flake-parts.url = "github:drupol/pkgs-by-name-for-flake-parts";
     treefmt-nix.url = "github:numtide/treefmt-nix";