colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

modules/packages: clean up loose typing of sane.packages

Browse Source
This commit is contained in:
colin
2023-01-02 07:16:16 +00:00
parent b8f7f68d4c
commit cf0bf8190e
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/home-manager/default.nix
View File

@@ -10,10 +10,10 @@ with lib;
let let
cfg = config.sane.home-manager; cfg = config.sane.home-manager;
# extract package from `sane.packages.enabledUserPkgs` # extract package from `sane.packages.enabledUserPkgs`
pkg-list = pkgspec: builtins.map (e: e.pkg or e) pkgspec; pkg-list = pkgspec: builtins.map (e: e.pkg) pkgspec;
# extract `dir` from `sane.packages.enabledUserPkgs` # extract `dir` from `sane.packages.enabledUserPkgs`
dir-list = pkgspec: builtins.concatLists (builtins.map (e: e.dir or []) pkgspec); dir-list = pkgspec: builtins.concatLists (builtins.map (e: e.dir) pkgspec);
private-list = pkgspec: builtins.concatLists (builtins.map (e: e.private or []) pkgspec); private-list = pkgspec: builtins.concatLists (builtins.map (e: e.private) pkgspec);
feeds = import ./feeds.nix { inherit lib; }; feeds = import ./feeds.nix { inherit lib; };
in in
{ {

2
modules/packages.nix
View File

@@ -300,7 +300,7 @@ in
++ (if cfg.enableGuiPkgs then guiPkgs else []) ++ (if cfg.enableGuiPkgs then guiPkgs else [])
++ (if cfg.enableDevPkgs then devPkgs else []) ++ (if cfg.enableDevPkgs then devPkgs else [])
; ;
type = types.listOf (types.either types.package types.attrs); type = types.listOf (types.coercedTo types.package (p: { pkg = p; }) pkgSpec);
description = "generated from other config options"; description = "generated from other config options";
}; };
}; };