Add package for nixvim configuration

flake.lock

@@ -338,11 +338,11 @@
         "pre-commit-hooks": "pre-commit-hooks"
       },
       "locked": {
-        "lastModified": 1698328085,
-        "narHash": "sha256-32Vk8PCa57B4mIXdVTbDrKoHBO5FTm5ZaSwiph9PwIo=",
+        "lastModified": 1698386104,
+        "narHash": "sha256-/QwUn8G1ERjl82RFFTTI/2ulOTV9Mbeog97old9tZl0=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "e1138cda396c7b925989cf6158496787051cf3f7",
+        "rev": "315bc508ee0bfb62b6608f8f445126158ca2cc35",
         "type": "github"
       },
       "original": {

flake.nix

@@ -78,7 +78,11 @@
         };
       in {
         formatter = pkgs.nixfmt;
-        packages = { jlink = pkgs.callPackage ./externals/packages/jlink { }; };
+        packages = {
+          jlink = pkgs.callPackage ./externals/packages/jlink { };
+          nvim = inputs.nixvim.legacyPackages."${system}".makeNixvim
+            (import ./sets/nvim.nix { inherit pkgs inputs; });
+        };
       });
 }
 

sets/nvim.nix

@@ -1,14 +1,6 @@
-{ pkgs, inputs, ... }:
+{ pkgs, ... }:
 
 {
-  imports = [ inputs.nixvim.nixosModules.nixvim ];
-
-  environment.sessionVariables = {
-    EDITOR = "nvim";
-    VISUAL = "nvim";
-  };
-  programs.nixvim = {
-    enable = true;
   vimAlias = true;
 
   # Basic editing / QoL
@@ -176,5 +168,4 @@
       })
     end
   '';
-  };
 }

sets/workstation.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ pkgs, inputs, ... }@args:
 
 {
   imports = [
@@ -6,9 +6,9 @@
     ./packages.nix
     ./pipewire.nix
     ./base.nix
-    ./nvim.nix
     ../home
     ./nix-index.nix
+    inputs.nixvim.nixosModules.nixvim
   ];
 
   i18n.defaultLocale = "de_DE.UTF-8";
@@ -16,10 +16,13 @@
 
   environment = {
     variables.EDITOR = "nvim";
+    variables.VISUAL = "nvim";
     variables.TERMINAL = "kitty";
     enableDebugInfo = true;
   };
 
+  programs.nixvim = import ./nvim.nix args // { enable = true; };
+
   services = {
     avahi = {
       enable = true;