From 8d9c2a0ed290e95182d05254a141947fc2bfdeb0 Mon Sep 17 00:00:00 2001 From: ooks-io Date: Mon, 6 Jan 2025 16:27:13 +1100 Subject: [PATCH] neovim: changes to how we access nvf.lib --- modules/home/console/tools/editor/neovim.nix | 1 - outputs/lib/default.nix | 1 - outputs/lib/mkNeovim.nix | 12 ----------- outputs/pkgs/default.nix | 11 ++++++---- outputs/pkgs/ook-vim/config/default.nix | 10 +++++++++ outputs/pkgs/ook-vim/{ => config}/keymaps.nix | 0 .../ook-vim/{ => config}/modules/default.nix | 0 .../{ => config}/modules/plugins/default.nix | 0 .../plugins/gruvbox-material/config.nix | 2 +- .../plugins/gruvbox-material/default.nix | 0 .../modules/plugins/telescope/config.nix | 0 .../modules/plugins/telescope/default.nix | 0 outputs/pkgs/ook-vim/{ => config}/opts.nix | 0 .../pkgs/ook-vim/{ => config}/plugins/cmp.nix | 0 .../ook-vim/{ => config}/plugins/comments.nix | 0 .../ook-vim/{ => config}/plugins/default.nix | 0 .../ook-vim/{ => config}/plugins/filetree.nix | 0 .../pkgs/ook-vim/{ => config}/plugins/git.nix | 0 .../{ => config}/plugins/languages/bash.nix | 0 .../{ => config}/plugins/languages/css.nix | 0 .../plugins/languages/default.nix | 0 .../{ => config}/plugins/languages/go.nix | 0 .../{ => config}/plugins/languages/html.nix | 0 .../{ => config}/plugins/languages/lsp.nix | 0 .../{ => config}/plugins/languages/lua.nix | 0 .../plugins/languages/markdown.nix | 0 .../{ => config}/plugins/languages/nix.nix | 0 .../plugins/languages/treesitter.nix | 0 .../{ => config}/plugins/languages/ts.nix | 0 .../ook-vim/{ => config}/plugins/projects.nix | 0 .../ook-vim/{ => config}/plugins/snippets.nix | 0 .../{ => config}/plugins/statusline.nix | 0 .../{ => config}/plugins/telescope.nix | 0 .../ook-vim/{ => config}/plugins/terminal.nix | 0 .../pkgs/ook-vim/{ => config}/plugins/ui.nix | 0 .../ook-vim/{ => config}/plugins/utility.nix | 0 .../pkgs/ook-vim/{ => config}/settings.nix | 0 outputs/pkgs/ook-vim/{ => config}/theme.nix | 0 outputs/pkgs/ook-vim/default.nix | 21 +++++++++++-------- 39 files changed, 30 insertions(+), 28 deletions(-) delete mode 100644 outputs/lib/mkNeovim.nix create mode 100644 outputs/pkgs/ook-vim/config/default.nix rename outputs/pkgs/ook-vim/{ => config}/keymaps.nix (100%) rename outputs/pkgs/ook-vim/{ => config}/modules/default.nix (100%) rename outputs/pkgs/ook-vim/{ => config}/modules/plugins/default.nix (100%) rename outputs/pkgs/ook-vim/{ => config}/modules/plugins/gruvbox-material/config.nix (97%) rename outputs/pkgs/ook-vim/{ => config}/modules/plugins/gruvbox-material/default.nix (100%) rename outputs/pkgs/ook-vim/{ => config}/modules/plugins/telescope/config.nix (100%) rename outputs/pkgs/ook-vim/{ => config}/modules/plugins/telescope/default.nix (100%) rename outputs/pkgs/ook-vim/{ => config}/opts.nix (100%) rename outputs/pkgs/ook-vim/{ => config}/plugins/cmp.nix (100%) rename outputs/pkgs/ook-vim/{ => config}/plugins/comments.nix (100%) rename outputs/pkgs/ook-vim/{ => config}/plugins/default.nix (100%) rename outputs/pkgs/ook-vim/{ => config}/plugins/filetree.nix (100%) rename outputs/pkgs/ook-vim/{ => config}/plugins/git.nix (100%) rename outputs/pkgs/ook-vim/{ => config}/plugins/languages/bash.nix (100%) rename outputs/pkgs/ook-vim/{ => config}/plugins/languages/css.nix (100%) rename outputs/pkgs/ook-vim/{ => config}/plugins/languages/default.nix (100%) rename outputs/pkgs/ook-vim/{ => config}/plugins/languages/go.nix (100%) rename outputs/pkgs/ook-vim/{ => config}/plugins/languages/html.nix (100%) rename outputs/pkgs/ook-vim/{ => config}/plugins/languages/lsp.nix (100%) rename outputs/pkgs/ook-vim/{ => config}/plugins/languages/lua.nix (100%) rename outputs/pkgs/ook-vim/{ => config}/plugins/languages/markdown.nix (100%) rename outputs/pkgs/ook-vim/{ => config}/plugins/languages/nix.nix (100%) rename outputs/pkgs/ook-vim/{ => config}/plugins/languages/treesitter.nix (100%) rename outputs/pkgs/ook-vim/{ => config}/plugins/languages/ts.nix (100%) rename outputs/pkgs/ook-vim/{ => config}/plugins/projects.nix (100%) rename outputs/pkgs/ook-vim/{ => config}/plugins/snippets.nix (100%) rename outputs/pkgs/ook-vim/{ => config}/plugins/statusline.nix (100%) rename outputs/pkgs/ook-vim/{ => config}/plugins/telescope.nix (100%) rename outputs/pkgs/ook-vim/{ => config}/plugins/terminal.nix (100%) rename outputs/pkgs/ook-vim/{ => config}/plugins/ui.nix (100%) rename outputs/pkgs/ook-vim/{ => config}/plugins/utility.nix (100%) rename outputs/pkgs/ook-vim/{ => config}/settings.nix (100%) rename outputs/pkgs/ook-vim/{ => config}/theme.nix (100%) diff --git a/modules/home/console/tools/editor/neovim.nix b/modules/home/console/tools/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/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/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/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/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/keymaps.nix 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/keymaps.nix diff --git a/outputs/pkgs/ook-vim/modules/default.nix b/outputs/pkgs/ook-vim/config/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/plugins/default.nix b/outputs/pkgs/ook-vim/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/plugins/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/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/plugins/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/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/plugins/telescope/config.nix b/outputs/pkgs/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/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/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/plugins/cmp.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/plugins/cmp.nix diff --git a/outputs/pkgs/ook-vim/plugins/comments.nix b/outputs/pkgs/ook-vim/config/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/default.nix b/outputs/pkgs/ook-vim/config/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/filetree.nix b/outputs/pkgs/ook-vim/config/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/git.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/plugins/git.nix diff --git a/outputs/pkgs/ook-vim/plugins/languages/bash.nix b/outputs/pkgs/ook-vim/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/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/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/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/languages/html.nix b/outputs/pkgs/ook-vim/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/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/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/languages/markdown.nix b/outputs/pkgs/ook-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/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/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/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/projects.nix b/outputs/pkgs/ook-vim/config/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/snippets.nix b/outputs/pkgs/ook-vim/config/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/statusline.nix b/outputs/pkgs/ook-vim/config/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/telescope.nix b/outputs/pkgs/ook-vim/config/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/terminal.nix b/outputs/pkgs/ook-vim/config/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/ui.nix b/outputs/pkgs/ook-vim/config/plugins/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/utility.nix b/outputs/pkgs/ook-vim/config/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/settings.nix b/outputs/pkgs/ook-vim/config/settings.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/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