mirror of
https://github.com/NotAShelf/nvf.git
synced 2024-11-02 11:31:15 +00:00
f9789432f9
* modules: switch to gerg's neovim-wrapper * modules: use initViml instead of writing the file * treewide: make the entire generated config lua based * docs: remove mentions of configRC * plugins/treesitter: remove vim.cmd hack * treewide: move resolveDag to lib * modules/wrapper(rc): fix typo * treewide: migrate to pluginRC for correct DAG order The "new" DAG order is as follows: - (luaConfigPre) - globalsScript - basic - theme - pluginConfigs - extraPluginConfigs - mappings - (luaConfigPost) * plugins/theme: fix theme DAG place * plugins/theme: fix fixed theme DAG place * modules/wrapper(rc): add removed option module for configRC * docs: add dag-entries chapter, add release note entry * fix: formatting CI * languages/nix: add missing `local` * docs: fix page link * docs: add mention of breaking changes at the start of the release notes * plugins/neo-tree: convert to pluginRC * modules/wrapper(rc): add back entryAnywhere * modules/wrapper(rc): expose pluginRC * apply raf patch --------- Co-authored-by: NotAShelf <raf@notashelf.dev>
50 lines
1.2 KiB
Nix
50 lines
1.2 KiB
Nix
{
|
|
config,
|
|
lib,
|
|
...
|
|
}: 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.orgmode;
|
|
in {
|
|
config = mkIf cfg.enable (mkMerge [
|
|
{
|
|
vim = {
|
|
startPlugins = [
|
|
"orgmode-nvim"
|
|
];
|
|
|
|
binds.whichKey.register = pushDownDefault {
|
|
"<leader>o" = "+Notes";
|
|
};
|
|
|
|
pluginRC.orgmode = entryAnywhere ''
|
|
-- Treesitter configuration
|
|
require('nvim-treesitter.configs').setup {
|
|
|
|
-- If TS highlights are not enabled at all, or disabled via `disable` prop,
|
|
-- highlighting will fallback to default Vim syntax highlighting
|
|
highlight = {
|
|
enable = true,
|
|
-- Required for spellcheck, some LaTex highlights and
|
|
-- code block highlights that do not have ts grammar
|
|
additional_vim_regex_highlighting = {'org'},
|
|
},
|
|
}
|
|
|
|
require('orgmode').setup(${toLuaObject cfg.setupOpts})
|
|
'';
|
|
};
|
|
}
|
|
|
|
(mkIf cfg.treesitter.enable {
|
|
vim.treesitter.enable = true;
|
|
|
|
vim.treesitter.grammars = [cfg.treesitter.orgPackage];
|
|
})
|
|
]);
|
|
}
|