diff options
| -rw-r--r-- | hosts/apzu/default.nix | 3 | ||||
| -rw-r--r-- | hosts/tiamat/default.nix | 3 | ||||
| -rw-r--r-- | modules/home.legacy/pkgs/default.nix | 34 |
3 files changed, 27 insertions, 13 deletions
diff --git a/hosts/apzu/default.nix b/hosts/apzu/default.nix index 6ba6828a..331da147 100644 --- a/hosts/apzu/default.nix +++ b/hosts/apzu/default.nix @@ -2,6 +2,7 @@ lib, pkgs, baseLib, + config, ... }: { imports = [ @@ -59,7 +60,7 @@ # Launcher "<Meta-R>" = {command = ["spawn" "${lib.getExe pkgs.rofi} -show combi -modes combi -combi-modes 'window, drun, run' -show-icons"];}; - "<Meta-<F1>>" = {command = ["spawn" "${lib.getExe pkgs.neorg} dmenu"];}; + "<Meta-<F1>>" = {command = ["spawn" "${lib.getExe config.home-manager.users.soispha.soispha.programs.neorg.package} dmenu"];}; "<Meta-<F2>>" = {command = ["spawn" "${lib.getExe pkgs.keepassxc}"];}; "<Meta-<F3>>" = {command = ["spawn" "${lib.getExe pkgs.signal-desktop}"];}; # "<Meta-<F4>>" = {command = ["spawn" "${lib.getExe pkgs.steam}"];}; diff --git a/hosts/tiamat/default.nix b/hosts/tiamat/default.nix index 17c7e72e..d18c0533 100644 --- a/hosts/tiamat/default.nix +++ b/hosts/tiamat/default.nix @@ -4,6 +4,7 @@ baseLib, qmk_firmware, system, + config, ... }: { imports = [ @@ -67,7 +68,7 @@ # Launcher "O" = {command = ["spawn" "${lib.getExe pkgs.rofi} -show combi -modes combi -combi-modes 'window,drun,run' -show-icons"];}; - "P" = {command = ["spawn" "${lib.getExe pkgs.neorg} dmenu"];}; + "P" = {command = ["spawn" "${lib.getExe config.home-manager.users.soispha.soispha.programs.neorg.package} dmenu"];}; "Q" = {command = ["spawn" "${lib.getExe pkgs.keepassxc}"];}; # "R" = {command = ["spawn" "nheko"];}; "S" = {command = ["spawn" "${lib.getExe pkgs.signal-desktop}"];}; 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 |