diff --git a/modules/plugins/notes/neorg/config.nix b/modules/plugins/notes/neorg/config.nix index f8c18ea9..76b7db4e 100644 --- a/modules/plugins/notes/neorg/config.nix +++ b/modules/plugins/notes/neorg/config.nix @@ -4,9 +4,7 @@ ... }: let inherit (lib.modules) mkIf mkMerge; - inherit (lib.nvim.dag) entryAnywhere; inherit (lib.nvim.binds) pushDownDefault; - inherit (lib.nvim.lua) toLuaObject; cfg = config.vim.notes.neorg; in { @@ -19,17 +17,21 @@ in { "nvim-nio" "pathlib-nvim" "plenary-nvim" - "neorg" "neorg-telescope" ]; + lazy.plugins.neorg = { + package = "neorg"; + setupModule = "neorg"; + inherit (cfg) setupOpts; + + ft = ["norg"]; + cmd = ["Neorg"]; + }; + binds.whichKey.register = pushDownDefault { "o" = "+Notes"; }; - - pluginRC.neorg = entryAnywhere '' - require('neorg').setup(${toLuaObject cfg.setupOpts}) - ''; }; } diff --git a/modules/plugins/notes/obsidian/config.nix b/modules/plugins/notes/obsidian/config.nix index 145ddff7..cf573cea 100644 --- a/modules/plugins/notes/obsidian/config.nix +++ b/modules/plugins/notes/obsidian/config.nix @@ -5,22 +5,32 @@ }: let inherit (lib.modules) mkIf mkMerge; inherit (lib.generators) mkLuaInline; - inherit (lib.nvim.dag) entryAnywhere; - inherit (lib.nvim.lua) toLuaObject; cfg = config.vim.notes.obsidian; in { config = mkIf cfg.enable { vim = { startPlugins = [ - "obsidian-nvim" "vim-markdown" "tabular" + "plenary-nvim" ]; - pluginRC.obsidian = entryAnywhere '' - require("obsidian").setup(${toLuaObject cfg.setupOpts}) - ''; + lazy.plugins.obsidian-nvim = { + package = "obsidian-nvim"; + # NOTE: packaged plugin directory is `obsidian.nvim`; loading by the + # spec key (`obsidian-nvim`) misses and makes `require("obsidian")` + # resolve to a loader function via lzn-auto-require. + # I don't love this, but I can't think of anything better + load = '' + vim.cmd.packadd("obsidian.nvim") + ''; + setupModule = "obsidian"; + inherit (cfg) setupOpts; + + ft = ["markdown"]; + cmd = ["Obsidian"]; + }; notes.obsidian.setupOpts = let # may not be defined diff --git a/modules/plugins/repl/conjure/conjure.nix b/modules/plugins/repl/conjure/conjure.nix index 83481af2..4dad0430 100644 --- a/modules/plugins/repl/conjure/conjure.nix +++ b/modules/plugins/repl/conjure/conjure.nix @@ -14,6 +14,32 @@ in { }; config = mkIf cfg.enable { - vim.startPlugins = [pkgs.vimPlugins.conjure]; + vim.lazy.plugins.conjure = { + package = pkgs.vimPlugins.conjure; + ft = [ + "clojure" + "fennel" + "janet" + "hy" + "julia" + "racket" + "scheme" + "lua" + "lisp" + "python" + "rust" + "sql" + "javascript" + "typescript" + "php" + "r" + ]; + cmd = [ + "ConjureSchool" + "ConjureEval" + "ConjureConnect" + "ConjureClientState" + ]; + }; }; }