diff options
| author | Benedikt Peetz <benedikt.peetz@b-peetz.de> | 2025-02-04 11:19:23 +0100 |
|---|---|---|
| committer | Benedikt Peetz <benedikt.peetz@b-peetz.de> | 2025-02-04 11:19:23 +0100 |
| commit | 6b6d8d77aad98fd6e988d68fbee86254cb9e3aad (patch) | |
| tree | 32a5a12dcbc4e770f4b7620fcecdfa74cb8aaf1a /modules | |
| parent | fix(modules/river): Mark the `init` file executable (diff) | |
| download | nixos-config-6b6d8d77aad98fd6e988d68fbee86254cb9e3aad.zip | |
fix(hosts/{apzu,tiamata}): Use the correct neorg package in the mappings
Otherwise, the `neorg dmenu` started by river would provide nothing to
select.
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/home.legacy/pkgs/default.nix | 34 |
1 files changed, 23 insertions, 11 deletions
diff --git a/modules/home.legacy/pkgs/default.nix b/modules/home.legacy/pkgs/default.nix index 1a4c4a1b..1a763997 100644 --- a/modules/home.legacy/pkgs/default.nix +++ b/modules/home.legacy/pkgs/default.nix @@ -7,6 +7,18 @@ }: # TODO: Remove this whole file, and move each pkgs to a separate module. <2024-11-16> with pkgs; let + neorgFinal = + neorg.override + { + 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.settings.load."core.dirman".config.workspaces; + xdgConfigHome = config.xdg.configHome; + xdgDataHome = config.xdg.dataHome; + }; + Gui = { Terminals = [ # foot # wayland native terminal @@ -77,16 +89,7 @@ with pkgs; let Firefox = [ # `neorg` handles the integration between Firefox profiles and task # contexts - (neorg.override - { - 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.settings.load."core.dirman".config.workspaces; - xdgConfigHome = config.xdg.configHome; - xdgDataHome = config.xdg.dataHome; - }) + neorgFinal ]; }; @@ -194,7 +197,16 @@ with pkgs; let else builtins.attrValues x else [x]; in { - home.packages = + options.soispha.programs.neorg = { + package = lib.mkOption { + type = lib.types.package; + default = neorgFinal; + description = '' + The neorg package to use. + ''; + }; + }; + config.home.packages = [] ++ (with builtins; concatLists |