neovim: changes to how we access nvf.lib

modules/home/console/tools/editor/neovim.nix

@@ -14,4 +14,3 @@ in {
     home.sessionVariables.EDITOR = mkIf (console.editor == "nvim") "nvim";
   };
 }
-

outputs/lib/default.nix

@@ -8,7 +8,6 @@
   # my scuffed lib
   ook-lib = {
     builders = import ./builders.nix {inherit self lib inputs;};
-    mkNeovim = import ./mkNeovim.nix {inherit inputs;};
     math = import ./math.nix {inherit lib;};
     container = import ./containers.nix {inherit lib config;};
     services = import ./services.nix {inherit lib;};

outputs/lib/mkNeovim.nix

@@ -1,12 +0,0 @@
-{inputs, ...}: let
-  inherit (inputs.nvf.lib) neovimConfiguration;
-
-  mkNeovim = pkgs: modules:
-    (neovimConfiguration {
-      inherit pkgs;
-      extraSpecialArgs = {inherit inputs;};
-      inherit modules;
-    })
-    .neovim;
-in
-  mkNeovim

outputs/pkgs/default.nix

@@ -1,7 +1,9 @@
-{ook, ...}: {
+{
+  inputs,
+  lib,
+  ...
+}: {
   perSystem = {pkgs, ...}: let
-    inherit (ook.lib) mkNeovim;
-    ook-vim-config = import ./ook-vim;
     inherit (pkgs) callPackage;
   in {
     packages = {
@@ -10,7 +12,8 @@
       website = callPackage ./website {};
       caddy-with-cloudflare = callPackage ./caddy-with-cloudflare {};
 
-      ook-vim = mkNeovim pkgs [ook-vim-config];
+      #ook-vim = mkNeovim pkgs [ook-vim-config];
+      ook-vim = callPackage ./ook-vim {inherit inputs pkgs lib;};
     };
   };
 }

outputs/pkgs/ook-vim/config/default.nix

@@ -0,0 +1,10 @@
+{
+  imports = [
+    ./settings.nix
+    ./opts.nix
+    ./theme.nix
+    ./keymaps.nix
+    ./plugins
+    ./modules
+  ];
+}

outputs/pkgs/ook-vim/config/modules/plugins/gruvbox-material/config.nix

@@ -7,7 +7,7 @@
 }: let
   inherit (lib) mkOption mkIf boolToString;
   inherit (lib.types) bool enum lines;
-  inherit (inputs.nvf.lib.nvim.dag) entryAfter;
+  inherit (lib.nvim.dag) entryAfter;
 
   cfg = config.vim.gruvbox-material;
 in {

outputs/pkgs/ook-vim/default.nix

@@ -1,10 +1,13 @@
 {
-  imports = [
-    ./settings.nix
-    ./opts.nix
-    ./theme.nix
-    ./keymaps.nix
-    ./plugins
-    ./modules
-  ];
-}
+  inputs,
+  pkgs,
+  ...
+}: let
+  configuration = import ./config;
+  ooks-vim = inputs.nvf.lib.neovimConfiguration {
+    inherit pkgs;
+    extraSpecialArgs = {inherit inputs;};
+    modules = [configuration];
+  };
+in
+  ooks-vim.neovim