OOKNET                             [ /  search the index  ]  
──────────────────────────────────────────────────────────────────────────────────────
══════════════════════════════════════════════════════════════════════════════════════
OOKNET   [ /  search  ]  
────────────────────────────────────────────────
════════════════════════════════════════════════
 
HASH      8d9c2a0ed290
DATE      2025-01-06
SUBJECT   neovim: changes to how we access nvf.lib
FILES     39 CHANGED
HASH      8d9c2a0ed290
DATE      2025-01-06
SUBJECT   neovim: changes to how we access
          nvf.lib
FILES     39 CHANGED
 

diff --git a/modules/home/console/tools/editor/neovim.nix b/modules/home/console/t
ools/editor/neovim.nix
index ef9f32b..5f55570 100644
--- a/modules/home/console/tools/editor/neovim.nix
+++ b/modules/home/console/tools/editor/neovim.nix
@@ -14,4 +14,3 @@ in {
     home.sessionVariables.EDITOR = mkIf (console.editor == "nvim") "nvim";
   };
 }
-

diff --git a/modules/home/console/tools/edit
or/neovim.nix b/modules/home/console/tools/e
ditor/neovim.nix
index ef9f32b..5f55570 100644
--- a/modules/home/console/tools/editor/neov
im.nix
+++ b/modules/home/console/tools/editor/neov
im.nix
@@ -14,4 +14,3 @@ in {
     home.sessionVariables.EDITOR = mkIf (co
nsole.editor == "nvim") "nvim";
   };
 }
-
 

diff --git a/outputs/lib/default.nix b/outputs/lib/default.nix
index c695419..3991faf 100644
--- a/outputs/lib/default.nix
+++ b/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;};

diff --git a/outputs/lib/default.nix b/outpu
ts/lib/default.nix
index c695419..3991faf 100644
--- a/outputs/lib/default.nix
+++ b/outputs/lib/default.nix
@@ -8,7 +8,6 @@
   # my scuffed lib
   ook-lib = {
     builders = import ./builders.nix {inher
it self lib inputs;};
-    mkNeovim = import ./mkNeovim.nix {inher
it inputs;};
     math = import ./math.nix {inherit lib;}
;
     container = import ./containers.nix {in
herit lib config;};
     services = import ./services.nix {inher
it lib;};
 

diff --git a/outputs/lib/mkNeovim.nix b/outputs/lib/mkNeovim.nix
deleted file mode 100644
index 951d4f0..0000000
--- a/outputs/lib/mkNeovim.nix
+++ /dev/null
@@ -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

diff --git a/outputs/lib/mkNeovim.nix b/outp
uts/lib/mkNeovim.nix
deleted file mode 100644
index 951d4f0..0000000
--- a/outputs/lib/mkNeovim.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{inputs, ...}: let
-  inherit (inputs.nvf.lib) neovimConfigurat
ion;
-
-  mkNeovim = pkgs: modules:
-    (neovimConfiguration {
-      inherit pkgs;
-      extraSpecialArgs = {inherit inputs;};
-      inherit modules;
-    })
-    .neovim;
-in
-  mkNeovim
 

diff --git a/outputs/pkgs/default.nix b/outputs/pkgs/default.nix
index a89ffa1..6624778 100644
--- a/outputs/pkgs/default.nix
+++ b/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;};
     };
   };
 }

diff --git a/outputs/pkgs/default.nix b/outp
uts/pkgs/default.nix
index a89ffa1..6624778 100644
--- a/outputs/pkgs/default.nix
+++ b/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-conf
ig];
+      #ook-vim = mkNeovim pkgs [ook-vim-con
fig];
+      ook-vim = callPackage ./ook-vim {inhe
rit inputs pkgs lib;};
     };
   };
 }
 

diff --git a/outputs/pkgs/ook-vim/config/default.nix b/outputs/pkgs/ook-vim/config
/default.nix
new file mode 100644
index 0000000..93fee2d
--- /dev/null
+++ b/outputs/pkgs/ook-vim/config/default.nix
@@ -0,0 +1,10 @@
+{
+  imports = [
+    ./settings.nix
+    ./opts.nix
+    ./theme.nix
+    ./keymaps.nix
+    ./plugins
+    ./modules
+  ];
+}

diff --git a/outputs/pkgs/ook-vim/config/def
ault.nix b/outputs/pkgs/ook-vim/config/defau
lt.nix
new file mode 100644
index 0000000..93fee2d
--- /dev/null
+++ b/outputs/pkgs/ook-vim/config/default.ni
x
@@ -0,0 +1,10 @@
+{
+  imports = [
+    ./settings.nix
+    ./opts.nix
+    ./theme.nix
+    ./keymaps.nix
+    ./plugins
+    ./modules
+  ];
+}
 

diff --git a/outputs/pkgs/ook-vim/keymaps.nix b/outputs/pkgs/ook-vim/config/keymap
s.nix
similarity index 100%
rename from outputs/pkgs/ook-vim/keymaps.nix
rename to outputs/pkgs/ook-vim/config/keymaps.nix

diff --git a/outputs/pkgs/ook-vim/keymaps.ni
x b/outputs/pkgs/ook-vim/config/keymaps.nix
similarity index 100%
rename from outputs/pkgs/ook-vim/keymaps.nix
rename to outputs/pkgs/ook-vim/config/keymap
s.nix
 

diff --git a/outputs/pkgs/ook-vim/modules/default.nix b/outputs/pkgs/ook-vim/confi
g/modules/default.nix
similarity index 100%
rename from outputs/pkgs/ook-vim/modules/default.nix
rename to outputs/pkgs/ook-vim/config/modules/default.nix

diff --git a/outputs/pkgs/ook-vim/modules/de
fault.nix b/outputs/pkgs/ook-vim/config/modu
les/default.nix
similarity index 100%
rename from outputs/pkgs/ook-vim/modules/def
ault.nix
rename to outputs/pkgs/ook-vim/config/module
s/default.nix
 

diff --git a/outputs/pkgs/ook-vim/modules/plugins/default.nix b/outputs/pkgs/ook-v
im/config/modules/plugins/default.nix
similarity index 100%
rename from outputs/pkgs/ook-vim/modules/plugins/default.nix
rename to outputs/pkgs/ook-vim/config/modules/plugins/default.nix

diff --git a/outputs/pkgs/ook-vim/modules/pl
ugins/default.nix b/outputs/pkgs/ook-vim/con
fig/modules/plugins/default.nix
similarity index 100%
rename from outputs/pkgs/ook-vim/modules/plu
gins/default.nix
rename to outputs/pkgs/ook-vim/config/module
s/plugins/default.nix
 

diff --git a/outputs/pkgs/ook-vim/modules/plugins/gruvbox-material/config.nix b/ou
tputs/pkgs/ook-vim/config/modules/plugins/gruvbox-material/config.nix
similarity index 97%
rename from outputs/pkgs/ook-vim/modules/plugins/gruvbox-material/config.nix
rename to outputs/pkgs/ook-vim/config/modules/plugins/gruvbox-material/config.nix
index d03cab7..bfe4345 100644
--- a/outputs/pkgs/ook-vim/modules/plugins/gruvbox-material/config.nix
+++ b/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 {

diff --git a/outputs/pkgs/ook-vim/modules/pl
ugins/gruvbox-material/config.nix b/outputs/
pkgs/ook-vim/config/modules/plugins/gruvbox-
material/config.nix
similarity index 97%
rename from outputs/pkgs/ook-vim/modules/plu
gins/gruvbox-material/config.nix
rename to outputs/pkgs/ook-vim/config/module
s/plugins/gruvbox-material/config.nix
index d03cab7..bfe4345 100644
--- a/outputs/pkgs/ook-vim/modules/plugins/g
ruvbox-material/config.nix
+++ b/outputs/pkgs/ook-vim/config/modules/pl
ugins/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) entryAf
ter;
+  inherit (lib.nvim.dag) entryAfter;
 
   cfg = config.vim.gruvbox-material;
 in {
 

diff --git a/outputs/pkgs/ook-vim/modules/plugins/gruvbox-material/default.nix b/o
utputs/pkgs/ook-vim/config/modules/plugins/gruvbox-material/default.nix
similarity index 100%
rename from outputs/pkgs/ook-vim/modules/plugins/gruvbox-material/default.nix
rename to outputs/pkgs/ook-vim/config/modules/plugins/gruvbox-material/default.nix

diff --git a/outputs/pkgs/ook-vim/modules/pl
ugins/gruvbox-material/default.nix b/outputs
/pkgs/ook-vim/config/modules/plugins/gruvbox
-material/default.nix
similarity index 100%
rename from outputs/pkgs/ook-vim/modules/plu
gins/gruvbox-material/default.nix
rename to outputs/pkgs/ook-vim/config/module
s/plugins/gruvbox-material/default.nix
 

diff --git a/outputs/pkgs/ook-vim/modules/plugins/telescope/config.nix b/outputs/p
kgs/ook-vim/config/modules/plugins/telescope/config.nix
similarity index 100%
rename from outputs/pkgs/ook-vim/modules/plugins/telescope/config.nix
rename to outputs/pkgs/ook-vim/config/modules/plugins/telescope/config.nix

diff --git a/outputs/pkgs/ook-vim/modules/pl
ugins/telescope/config.nix b/outputs/pkgs/oo
k-vim/config/modules/plugins/telescope/confi
g.nix
similarity index 100%
rename from outputs/pkgs/ook-vim/modules/plu
gins/telescope/config.nix
rename to outputs/pkgs/ook-vim/config/module
s/plugins/telescope/config.nix
 

diff --git a/outputs/pkgs/ook-vim/modules/plugins/telescope/default.nix b/outputs/
pkgs/ook-vim/config/modules/plugins/telescope/default.nix
similarity index 100%
rename from outputs/pkgs/ook-vim/modules/plugins/telescope/default.nix
rename to outputs/pkgs/ook-vim/config/modules/plugins/telescope/default.nix

diff --git a/outputs/pkgs/ook-vim/modules/pl
ugins/telescope/default.nix b/outputs/pkgs/o
ok-vim/config/modules/plugins/telescope/defa
ult.nix
similarity index 100%
rename from outputs/pkgs/ook-vim/modules/plu
gins/telescope/default.nix
rename to outputs/pkgs/ook-vim/config/module
s/plugins/telescope/default.nix
 

diff --git a/outputs/pkgs/ook-vim/opts.nix b/outputs/pkgs/ook-vim/config/opts.nix
similarity index 100%
rename from outputs/pkgs/ook-vim/opts.nix
rename to outputs/pkgs/ook-vim/config/opts.nix

diff --git a/outputs/pkgs/ook-vim/opts.nix b
/outputs/pkgs/ook-vim/config/opts.nix
similarity index 100%
rename from outputs/pkgs/ook-vim/opts.nix
rename to outputs/pkgs/ook-vim/config/opts.n
ix
 

diff --git a/outputs/pkgs/ook-vim/plugins/cmp.nix b/outputs/pkgs/ook-vim/config/pl
ugins/cmp.nix
similarity index 100%
rename from outputs/pkgs/ook-vim/plugins/cmp.nix
rename to outputs/pkgs/ook-vim/config/plugins/cmp.nix

diff --git a/outputs/pkgs/ook-vim/plugins/cm
p.nix b/outputs/pkgs/ook-vim/config/plugins/
cmp.nix
similarity index 100%
rename from outputs/pkgs/ook-vim/plugins/cmp
.nix
rename to outputs/pkgs/ook-vim/config/plugin
s/cmp.nix
 

diff --git a/outputs/pkgs/ook-vim/plugins/comments.nix b/outputs/pkgs/ook-vim/conf
ig/plugins/comments.nix
similarity index 100%
rename from outputs/pkgs/ook-vim/plugins/comments.nix
rename to outputs/pkgs/ook-vim/config/plugins/comments.nix

diff --git a/outputs/pkgs/ook-vim/plugins/co
mments.nix b/outputs/pkgs/ook-vim/config/plu
gins/comments.nix
similarity index 100%
rename from outputs/pkgs/ook-vim/plugins/com
ments.nix
rename to outputs/pkgs/ook-vim/config/plugin
s/comments.nix
 

diff --git a/outputs/pkgs/ook-vim/plugins/default.nix b/outputs/pkgs/ook-vim/confi
g/plugins/default.nix
similarity index 100%
rename from outputs/pkgs/ook-vim/plugins/default.nix
rename to outputs/pkgs/ook-vim/config/plugins/default.nix

diff --git a/outputs/pkgs/ook-vim/plugins/de
fault.nix b/outputs/pkgs/ook-vim/config/plug
ins/default.nix
similarity index 100%
rename from outputs/pkgs/ook-vim/plugins/def
ault.nix
rename to outputs/pkgs/ook-vim/config/plugin
s/default.nix
 

diff --git a/outputs/pkgs/ook-vim/plugins/filetree.nix b/outputs/pkgs/ook-vim/conf
ig/plugins/filetree.nix
similarity index 100%
rename from outputs/pkgs/ook-vim/plugins/filetree.nix
rename to outputs/pkgs/ook-vim/config/plugins/filetree.nix

diff --git a/outputs/pkgs/ook-vim/plugins/fi
letree.nix b/outputs/pkgs/ook-vim/config/plu
gins/filetree.nix
similarity index 100%
rename from outputs/pkgs/ook-vim/plugins/fil
etree.nix
rename to outputs/pkgs/ook-vim/config/plugin
s/filetree.nix
 

diff --git a/outputs/pkgs/ook-vim/plugins/git.nix b/outputs/pkgs/ook-vim/config/pl
ugins/git.nix
similarity index 100%
rename from outputs/pkgs/ook-vim/plugins/git.nix
rename to outputs/pkgs/ook-vim/config/plugins/git.nix

diff --git a/outputs/pkgs/ook-vim/plugins/gi
t.nix b/outputs/pkgs/ook-vim/config/plugins/
git.nix
similarity index 100%
rename from outputs/pkgs/ook-vim/plugins/git
.nix
rename to outputs/pkgs/ook-vim/config/plugin
s/git.nix
 

diff --git a/outputs/pkgs/ook-vim/plugins/languages/bash.nix b/outputs/pkgs/ook-vi
m/config/plugins/languages/bash.nix
similarity index 100%
rename from outputs/pkgs/ook-vim/plugins/languages/bash.nix
rename to outputs/pkgs/ook-vim/config/plugins/languages/bash.nix

diff --git a/outputs/pkgs/ook-vim/plugins/la
nguages/bash.nix b/outputs/pkgs/ook-vim/conf
ig/plugins/languages/bash.nix
similarity index 100%
rename from outputs/pkgs/ook-vim/plugins/lan
guages/bash.nix
rename to outputs/pkgs/ook-vim/config/plugin
s/languages/bash.nix
 

diff --git a/outputs/pkgs/ook-vim/plugins/languages/css.nix b/outputs/pkgs/ook-vim
/config/plugins/languages/css.nix
similarity index 100%
rename from outputs/pkgs/ook-vim/plugins/languages/css.nix
rename to outputs/pkgs/ook-vim/config/plugins/languages/css.nix

diff --git a/outputs/pkgs/ook-vim/plugins/la
nguages/css.nix b/outputs/pkgs/ook-vim/confi
g/plugins/languages/css.nix
similarity index 100%
rename from outputs/pkgs/ook-vim/plugins/lan
guages/css.nix
rename to outputs/pkgs/ook-vim/config/plugin
s/languages/css.nix
 

diff --git a/outputs/pkgs/ook-vim/plugins/languages/default.nix b/outputs/pkgs/ook
-vim/config/plugins/languages/default.nix
similarity index 100%
rename from outputs/pkgs/ook-vim/plugins/languages/default.nix
rename to outputs/pkgs/ook-vim/config/plugins/languages/default.nix

diff --git a/outputs/pkgs/ook-vim/plugins/la
nguages/default.nix b/outputs/pkgs/ook-vim/c
onfig/plugins/languages/default.nix
similarity index 100%
rename from outputs/pkgs/ook-vim/plugins/lan
guages/default.nix
rename to outputs/pkgs/ook-vim/config/plugin
s/languages/default.nix
 

diff --git a/outputs/pkgs/ook-vim/plugins/languages/go.nix b/outputs/pkgs/ook-vim/
config/plugins/languages/go.nix
similarity index 100%
rename from outputs/pkgs/ook-vim/plugins/languages/go.nix
rename to outputs/pkgs/ook-vim/config/plugins/languages/go.nix

diff --git a/outputs/pkgs/ook-vim/plugins/la
nguages/go.nix b/outputs/pkgs/ook-vim/config
/plugins/languages/go.nix
similarity index 100%
rename from outputs/pkgs/ook-vim/plugins/lan
guages/go.nix
rename to outputs/pkgs/ook-vim/config/plugin
s/languages/go.nix
 

diff --git a/outputs/pkgs/ook-vim/plugins/languages/html.nix b/outputs/pkgs/ook-vi
m/config/plugins/languages/html.nix
similarity index 100%
rename from outputs/pkgs/ook-vim/plugins/languages/html.nix
rename to outputs/pkgs/ook-vim/config/plugins/languages/html.nix

diff --git a/outputs/pkgs/ook-vim/plugins/la
nguages/html.nix b/outputs/pkgs/ook-vim/conf
ig/plugins/languages/html.nix
similarity index 100%
rename from outputs/pkgs/ook-vim/plugins/lan
guages/html.nix
rename to outputs/pkgs/ook-vim/config/plugin
s/languages/html.nix
 

diff --git a/outputs/pkgs/ook-vim/plugins/languages/lsp.nix b/outputs/pkgs/ook-vim
/config/plugins/languages/lsp.nix
similarity index 100%
rename from outputs/pkgs/ook-vim/plugins/languages/lsp.nix
rename to outputs/pkgs/ook-vim/config/plugins/languages/lsp.nix

diff --git a/outputs/pkgs/ook-vim/plugins/la
nguages/lsp.nix b/outputs/pkgs/ook-vim/confi
g/plugins/languages/lsp.nix
similarity index 100%
rename from outputs/pkgs/ook-vim/plugins/lan
guages/lsp.nix
rename to outputs/pkgs/ook-vim/config/plugin
s/languages/lsp.nix
 

diff --git a/outputs/pkgs/ook-vim/plugins/languages/lua.nix b/outputs/pkgs/ook-vim
/config/plugins/languages/lua.nix
similarity index 100%
rename from outputs/pkgs/ook-vim/plugins/languages/lua.nix
rename to outputs/pkgs/ook-vim/config/plugins/languages/lua.nix

diff --git a/outputs/pkgs/ook-vim/plugins/la
nguages/lua.nix b/outputs/pkgs/ook-vim/confi
g/plugins/languages/lua.nix
similarity index 100%
rename from outputs/pkgs/ook-vim/plugins/lan
guages/lua.nix
rename to outputs/pkgs/ook-vim/config/plugin
s/languages/lua.nix
 

diff --git a/outputs/pkgs/ook-vim/plugins/languages/markdown.nix b/outputs/pkgs/oo
k-vim/config/plugins/languages/markdown.nix
similarity index 100%
rename from outputs/pkgs/ook-vim/plugins/languages/markdown.nix
rename to outputs/pkgs/ook-vim/config/plugins/languages/markdown.nix

diff --git a/outputs/pkgs/ook-vim/plugins/la
nguages/markdown.nix b/outputs/pkgs/ook-vim/
config/plugins/languages/markdown.nix
similarity index 100%
rename from outputs/pkgs/ook-vim/plugins/lan
guages/markdown.nix
rename to outputs/pkgs/ook-vim/config/plugin
s/languages/markdown.nix
 

diff --git a/outputs/pkgs/ook-vim/plugins/languages/nix.nix b/outputs/pkgs/ook-vim
/config/plugins/languages/nix.nix
similarity index 100%
rename from outputs/pkgs/ook-vim/plugins/languages/nix.nix
rename to outputs/pkgs/ook-vim/config/plugins/languages/nix.nix

diff --git a/outputs/pkgs/ook-vim/plugins/la
nguages/nix.nix b/outputs/pkgs/ook-vim/confi
g/plugins/languages/nix.nix
similarity index 100%
rename from outputs/pkgs/ook-vim/plugins/lan
guages/nix.nix
rename to outputs/pkgs/ook-vim/config/plugin
s/languages/nix.nix
 

diff --git a/outputs/pkgs/ook-vim/plugins/languages/treesitter.nix b/outputs/pkgs/
ook-vim/config/plugins/languages/treesitter.nix
similarity index 100%
rename from outputs/pkgs/ook-vim/plugins/languages/treesitter.nix
rename to outputs/pkgs/ook-vim/config/plugins/languages/treesitter.nix

diff --git a/outputs/pkgs/ook-vim/plugins/la
nguages/treesitter.nix b/outputs/pkgs/ook-vi
m/config/plugins/languages/treesitter.nix
similarity index 100%
rename from outputs/pkgs/ook-vim/plugins/lan
guages/treesitter.nix
rename to outputs/pkgs/ook-vim/config/plugin
s/languages/treesitter.nix
 

diff --git a/outputs/pkgs/ook-vim/plugins/languages/ts.nix b/outputs/pkgs/ook-vim/
config/plugins/languages/ts.nix
similarity index 100%
rename from outputs/pkgs/ook-vim/plugins/languages/ts.nix
rename to outputs/pkgs/ook-vim/config/plugins/languages/ts.nix

diff --git a/outputs/pkgs/ook-vim/plugins/la
nguages/ts.nix b/outputs/pkgs/ook-vim/config
/plugins/languages/ts.nix
similarity index 100%
rename from outputs/pkgs/ook-vim/plugins/lan
guages/ts.nix
rename to outputs/pkgs/ook-vim/config/plugin
s/languages/ts.nix
 

diff --git a/outputs/pkgs/ook-vim/plugins/projects.nix b/outputs/pkgs/ook-vim/conf
ig/plugins/projects.nix
similarity index 100%
rename from outputs/pkgs/ook-vim/plugins/projects.nix
rename to outputs/pkgs/ook-vim/config/plugins/projects.nix

diff --git a/outputs/pkgs/ook-vim/plugins/pr
ojects.nix b/outputs/pkgs/ook-vim/config/plu
gins/projects.nix
similarity index 100%
rename from outputs/pkgs/ook-vim/plugins/pro
jects.nix
rename to outputs/pkgs/ook-vim/config/plugin
s/projects.nix
 

diff --git a/outputs/pkgs/ook-vim/plugins/snippets.nix b/outputs/pkgs/ook-vim/conf
ig/plugins/snippets.nix
similarity index 100%
rename from outputs/pkgs/ook-vim/plugins/snippets.nix
rename to outputs/pkgs/ook-vim/config/plugins/snippets.nix

diff --git a/outputs/pkgs/ook-vim/plugins/sn
ippets.nix b/outputs/pkgs/ook-vim/config/plu
gins/snippets.nix
similarity index 100%
rename from outputs/pkgs/ook-vim/plugins/sni
ppets.nix
rename to outputs/pkgs/ook-vim/config/plugin
s/snippets.nix
 

diff --git a/outputs/pkgs/ook-vim/plugins/statusline.nix b/outputs/pkgs/ook-vim/co
nfig/plugins/statusline.nix
similarity index 100%
rename from outputs/pkgs/ook-vim/plugins/statusline.nix
rename to outputs/pkgs/ook-vim/config/plugins/statusline.nix

diff --git a/outputs/pkgs/ook-vim/plugins/st
atusline.nix b/outputs/pkgs/ook-vim/config/p
lugins/statusline.nix
similarity index 100%
rename from outputs/pkgs/ook-vim/plugins/sta
tusline.nix
rename to outputs/pkgs/ook-vim/config/plugin
s/statusline.nix
 

diff --git a/outputs/pkgs/ook-vim/plugins/telescope.nix b/outputs/pkgs/ook-vim/con
fig/plugins/telescope.nix
similarity index 100%
rename from outputs/pkgs/ook-vim/plugins/telescope.nix
rename to outputs/pkgs/ook-vim/config/plugins/telescope.nix

diff --git a/outputs/pkgs/ook-vim/plugins/te
lescope.nix b/outputs/pkgs/ook-vim/config/pl
ugins/telescope.nix
similarity index 100%
rename from outputs/pkgs/ook-vim/plugins/tel
escope.nix
rename to outputs/pkgs/ook-vim/config/plugin
s/telescope.nix
 

diff --git a/outputs/pkgs/ook-vim/plugins/terminal.nix b/outputs/pkgs/ook-vim/conf
ig/plugins/terminal.nix
similarity index 100%
rename from outputs/pkgs/ook-vim/plugins/terminal.nix
rename to outputs/pkgs/ook-vim/config/plugins/terminal.nix

diff --git a/outputs/pkgs/ook-vim/plugins/te
rminal.nix b/outputs/pkgs/ook-vim/config/plu
gins/terminal.nix
similarity index 100%
rename from outputs/pkgs/ook-vim/plugins/ter
minal.nix
rename to outputs/pkgs/ook-vim/config/plugin
s/terminal.nix
 

diff --git a/outputs/pkgs/ook-vim/plugins/ui.nix b/outputs/pkgs/ook-vim/config/plu
gins/ui.nix
similarity index 100%
rename from outputs/pkgs/ook-vim/plugins/ui.nix
rename to outputs/pkgs/ook-vim/config/plugins/ui.nix

diff --git a/outputs/pkgs/ook-vim/plugins/ui
.nix b/outputs/pkgs/ook-vim/config/plugins/u
i.nix
similarity index 100%
rename from outputs/pkgs/ook-vim/plugins/ui.
nix
rename to outputs/pkgs/ook-vim/config/plugin
s/ui.nix
 

diff --git a/outputs/pkgs/ook-vim/plugins/utility.nix b/outputs/pkgs/ook-vim/confi
g/plugins/utility.nix
similarity index 100%
rename from outputs/pkgs/ook-vim/plugins/utility.nix
rename to outputs/pkgs/ook-vim/config/plugins/utility.nix

diff --git a/outputs/pkgs/ook-vim/plugins/ut
ility.nix b/outputs/pkgs/ook-vim/config/plug
ins/utility.nix
similarity index 100%
rename from outputs/pkgs/ook-vim/plugins/uti
lity.nix
rename to outputs/pkgs/ook-vim/config/plugin
s/utility.nix
 

diff --git a/outputs/pkgs/ook-vim/settings.nix b/outputs/pkgs/ook-vim/config/setti
ngs.nix
similarity index 100%
rename from outputs/pkgs/ook-vim/settings.nix
rename to outputs/pkgs/ook-vim/config/settings.nix

diff --git a/outputs/pkgs/ook-vim/settings.n
ix b/outputs/pkgs/ook-vim/config/settings.ni
x
similarity index 100%
rename from outputs/pkgs/ook-vim/settings.ni
x
rename to outputs/pkgs/ook-vim/config/settin
gs.nix
 

diff --git a/outputs/pkgs/ook-vim/theme.nix b/outputs/pkgs/ook-vim/config/theme.ni
x
similarity index 100%
rename from outputs/pkgs/ook-vim/theme.nix
rename to outputs/pkgs/ook-vim/config/theme.nix

diff --git a/outputs/pkgs/ook-vim/theme.nix 
b/outputs/pkgs/ook-vim/config/theme.nix
similarity index 100%
rename from outputs/pkgs/ook-vim/theme.nix
rename to outputs/pkgs/ook-vim/config/theme.
nix
 

diff --git a/outputs/pkgs/ook-vim/default.nix b/outputs/pkgs/ook-vim/default.nix
index 93fee2d..9bcc5ed 100644
--- a/outputs/pkgs/ook-vim/default.nix
+++ b/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

diff --git a/outputs/pkgs/ook-vim/default.ni
x b/outputs/pkgs/ook-vim/default.nix
index 93fee2d..9bcc5ed 100644
--- a/outputs/pkgs/ook-vim/default.nix
+++ b/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.neovimConfigura
tion {
+    inherit pkgs;
+    extraSpecialArgs = {inherit inputs;};
+    modules = [configuration];
+  };
+in
+  ooks-vim.neovim
 
[ BACK TO LOG ]
──────────────────────────────────────────────────────────────────────────────────────
OOKNET
────────────────────────────────────────────────
OOKNET