diff --git a/modules/hm/dev.nix b/modules/hm/dev.nix index 67aa95e..5e58c72 100644 --- a/modules/hm/dev.nix +++ b/modules/hm/dev.nix @@ -1,4 +1,9 @@ -{ lib, config, ... }: +{ + pkgs, + lib, + config, + ... +}: let cfg = config.jhome.dev; in @@ -6,12 +11,12 @@ in config = lib.flip lib.pipe [ - (lib.mkIf (config.jhome.enable && cfg.enable)) lib.mkMerge + (lib.mkIf (config.jhome.enable && cfg.enable)) ] [ (lib.mkIf cfg.rust.enable { - home.packages = [ pkgs.rustup ] ++ devcfg.rust.extraPackages; + home.packages = [ pkgs.rustup ] ++ cfg.rust.extraPackages; # Background code checker (for Rust) programs.bacon = { enable = true; @@ -26,8 +31,8 @@ in }) { home = { - sessionVariables.MANPAGER = lib.optionalString devcfg.neovimAsManPager "nvim -c 'Man!' -o -"; - packages = devcfg.extraPackages; + sessionVariables.MANPAGER = lib.optionalString cfg.neovimAsManPager "nvim -c 'Man!' -o -"; + packages = cfg.extraPackages; }; # Github CLI