neovim: switch to my neovim-config flake

flake.nix

@@ -40,8 +40,8 @@
       url = "github:numtide/treefmt-nix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    nixvim = {
-      url = "github:nix-community/nixvim";
+    neovim-config = {
+      url = "github:LorenzBischof/neovim-config";
       inputs.nixpkgs.follows = "nixpkgs";
     };
   };
@@ -59,7 +59,7 @@
       numen,
       nixos-generators,
       treefmt-nix,
-      nixvim,
+      neovim-config,
       ...
     }@inputs:
     let
@@ -77,6 +77,9 @@
             "dotnet-sdk-wrapped-6.0.428"
           ];
         };
+        overlays = [
+          neovim-config.overlays.default
+        ];
       };
       treefmtEval = treefmt-nix.lib.evalModule pkgs ./treefmt.nix;
     in
@@ -194,20 +197,6 @@
           };
           format = "install-iso";
         };
-        nvim =
-          let
-            nixvimLib = nixvim.lib.${system};
-            nixvim' = nixvim.legacyPackages.${system};
-            nixvimModule = {
-              inherit pkgs;
-              module = import ./nvim;
-              extraSpecialArgs = {
-                inherit self inputs;
-              };
-            };
-            nvim = nixvim'.makeNixvimWithModule nixvimModule;
-          in
-          nvim;
       };
       formatter.${system} = treefmtEval.config.build.wrapper;
       checks.${system} = {

hosts/laptop/home.nix

@@ -60,9 +60,7 @@
     # fonts
     font-awesome
     nerd-fonts.dejavu-sans-mono
-    self.packages.${pkgs.system}.nvim
   ];
-  home.sessionVariables.EDITOR = "nvim";
 
   systemd.user.startServices = true;
   gtk = {

hosts/wsl/home.nix

@@ -72,7 +72,6 @@ in
   services.ssh-agent.enable = true;
 
   home = {
-    sessionVariables.EDITOR = "nvim";
     packages = with pkgs; [
       golangci-lint
       kubectl
@@ -94,10 +93,6 @@ in
       docker-compose
       awscli2
       open-policy-agent
-
-      (self.packages.${pkgs.system}.nvim.extend {
-        plugins.avante.enable = false;
-      })
     ];
     # Home Manager needs a bit of information about you and the paths it should
     # manage.

modules/home-manager/shell/default.nix

@@ -10,6 +10,7 @@
     kubectl
     ripgrep
     dtrx
+    nvim-pkg
   ];
   programs = {
     direnv = {
@@ -65,6 +66,7 @@
     };
   };
 
+  home.sessionVariables.EDITOR = "nvim";
   home.file = {
     ".zshrc-extra".source = ./initextra;
   };