diff options
| author | Benedikt Peetz <benedikt.peetz@b-peetz.de> | 2024-12-14 14:50:08 +0100 |
|---|---|---|
| committer | Benedikt Peetz <benedikt.peetz@b-peetz.de> | 2024-12-14 14:50:08 +0100 |
| commit | 08c0020ceca7b267561511d36e56037380c57ea9 (patch) | |
| tree | dcd4adbe61f1d82d971df190dce93f5950fe2678 | |
| parent | fix(modules/inputMethods): Remove (diff) | |
| download | nixos-config-08c0020ceca7b267561511d36e56037380c57ea9.zip | |
refactor(modules/nvim/plgs/neorg): Migrate to new RFC 42 module
| -rw-r--r-- | modules/by-name/nv/nvim/plgs/neorg/default.nix | 72 | ||||
| -rw-r--r-- | modules/home.legacy/pkgs/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/by-name/ne/neorg/package.nix | 4 |
3 files changed, 42 insertions, 38 deletions
diff --git a/modules/by-name/nv/nvim/plgs/neorg/default.nix b/modules/by-name/nv/nvim/plgs/neorg/default.nix index 41c80673..03afb16c 100644 --- a/modules/by-name/nv/nvim/plgs/neorg/default.nix +++ b/modules/by-name/nv/nvim/plgs/neorg/default.nix @@ -19,43 +19,47 @@ in { neorg = { enable = true; - lazyLoading = true; + telescopeIntegration.enable = true; - modules = { - "core.defaults" = { - __empty = null; - }; - "core.esupports.metagen".config = { - type = "auto"; - }; - "core.journal".config = { - workspace = "journal"; - }; - "core.keybinds".config = { - __empty = null; - }; - "core.completion".config = { - engine = "nvim-cmp"; - }; - "core.concealer".config = { - __empty = null; - }; - "core.dirman".config = { - workspaces = { - general = "~/repos/notes/general"; - journal = "~/repos/notes/journal"; - projects = "~/repos/notes/projects"; + settings = { + lazy_loading = true; + + load = { + "core.defaults" = { + __empty = null; + }; + "core.esupports.metagen".config = { + type = "auto"; + }; + "core.journal".config = { + workspace = "journal"; + }; + "core.keybinds".config = { + __empty = null; + }; + "core.completion".config = { + engine = "nvim-cmp"; + }; + "core.concealer".config = { + __empty = null; + }; + "core.dirman".config = { + workspaces = { + general = "~/repos/notes/general"; + journal = "~/repos/notes/journal"; + projects = "~/repos/notes/projects"; + }; + }; + "core.export".config = { + __empty = null; + }; + "core.integrations.telescope".config = { + __empty = null; }; - }; - "core.export".config = { - __empty = null; - }; - "core.integrations.telescope".config = { - __empty = null; - }; - "core.ui.calendar".config = { - __empty = null; + "core.ui.calendar".config = { + __empty = null; + }; }; }; }; diff --git a/modules/home.legacy/pkgs/default.nix b/modules/home.legacy/pkgs/default.nix index d75504b4..1a4c4a1b 100644 --- a/modules/home.legacy/pkgs/default.nix +++ b/modules/home.legacy/pkgs/default.nix @@ -79,11 +79,11 @@ with pkgs; let # contexts (neorg.override { - defaultNeorgProjectDir = config.programs.nixvim.plugins.neorg.modules."core.dirman".config.workspaces.projects; + defaultNeorgProjectDir = config.programs.nixvim.plugins.neorg.settings.load."core.dirman".config.workspaces.projects; allProjectsNewline = config.soispha.taskwarrior.projects.projects_newline; allProjectsComma = config.soispha.taskwarrior.projects.projects_comma; allProjectsPipe = config.soispha.taskwarrior.projects.projects_pipe; - allWorkspaces = config.programs.nixvim.plugins.neorg.modules."core.dirman".config.workspaces; + allWorkspaces = config.programs.nixvim.plugins.neorg.settings.load."core.dirman".config.workspaces; xdgConfigHome = config.xdg.configHome; xdgDataHome = config.xdg.dataHome; }) diff --git a/pkgs/by-name/ne/neorg/package.nix b/pkgs/by-name/ne/neorg/package.nix index b654476e..a9ab1ca8 100644 --- a/pkgs/by-name/ne/neorg/package.nix +++ b/pkgs/by-name/ne/neorg/package.nix @@ -9,11 +9,11 @@ gawk, findutils, # config - defaultNeorgProjectDir ? "/no-default-dir", # homeConfig.programs.nixvim.plugins.neorg.modules."core.dirman".config.workspaces.projects + defaultNeorgProjectDir ? "/no-default-dir", # homeConfig.programs.nixvim.plugins.neorg.settings.load."core.dirman".config.workspaces.projects allProjectsNewline ? "", # homeConfig.soispha.taskwarrior.projects.projects_newline allProjectsComma ? "", # homeConfig.soispha.taskwarrior.projects.projects_comma allProjectsPipe ? "", # homeConfig.soispha.taskwarrior.projects.projects_pipe - allWorkspaces ? {}, # homeConfig.programs.nixvim.plugins.neorg.modules."core.dirman".config.workspaces + allWorkspaces ? {}, # homeConfig.programs.nixvim.plugins.neorg.settings.load."core.dirman".config.workspaces xdgConfigHome ? builtins.getEnv "XDG_CONFIG_HOME", xdgDataHome ? builtins.getEnv "XDG_DATA_HOME", }: |