1
0
Fork 0

Move pkgsets folder into project root to conform with option naming.

Add simple package filter to auto remove broken packages.
master
Kevin Baensch 3 years ago
parent 5242db83e2
commit ad76922338
Signed by: derped
GPG Key ID: C0F1D326C7626543
  1. 13
      fn.nix
  2. 4
      options/machine.nix
  3. 2
      pkgs/systemPackages.nix
  4. 0
      pkgsets/base.nix
  5. 0
      pkgsets/cpp.nix
  6. 0
      pkgsets/dict.nix
  7. 4
      pkgsets/emacs.nix
  8. 0
      pkgsets/emacs/company.nix
  9. 0
      pkgsets/emacs/doom-modeline.nix
  10. 0
      pkgsets/emacs/doom-themes.nix
  11. 0
      pkgsets/emacs/elpy.nix
  12. 0
      pkgsets/emacs/fcitx.nix
  13. 0
      pkgsets/emacs/flycheck.nix
  14. 0
      pkgsets/emacs/flyspell.nix
  15. 0
      pkgsets/emacs/latex.nix
  16. 0
      pkgsets/emacs/lsp.nix
  17. 0
      pkgsets/emacs/magit.nix
  18. 0
      pkgsets/emacs/mu4e.nix
  19. 0
      pkgsets/emacs/nix-mode.nix
  20. 0
      pkgsets/emacs/org.nix
  21. 0
      pkgsets/emacs/powerline.nix
  22. 0
      pkgsets/emacs/rust.nix
  23. 0
      pkgsets/emacs/solarized-theme.nix
  24. 0
      pkgsets/emacs/transmission.nix
  25. 0
      pkgsets/emacs/web-mode.nix
  26. 0
      pkgsets/emacs/yasnippet.nix
  27. 0
      pkgsets/extra.nix
  28. 0
      pkgsets/haskell-tools.nix
  29. 0
      pkgsets/haskell.nix
  30. 0
      pkgsets/java.nix
  31. 0
      pkgsets/mail_utils.nix
  32. 0
      pkgsets/python3.nix
  33. 0
      pkgsets/rustpkgs.nix
  34. 0
      pkgsets/server.nix
  35. 0
      pkgsets/uniProgs.nix
  36. 0
      pkgsets/xpkgs.nix

@ -17,4 +17,17 @@ rec {
lsf = p: (lst { p = p; });
lsd = p: (lst { p = p; t = "directory"; b = true; });
lsfRec = p: b: flatten ((map (np: lsfRec np b) (lsd p)) ++ (lst { p = p; b = b; }));
hasAttrs = aList: d: (map
(a:
(ifelse (isList a)
(hasAttrByPath a d)
(hasAttr a d)))
aList);
pkgFilter = l: (filter
(p: (
ifelse (elem true (hasAttrs [["meta" "broken"]] p))
(warn "Package ${p.name} is marked as broken." false)
true)
)
l);
}

@ -7,14 +7,14 @@ let
cfg = config.machine;
fn = import (toString ../fn.nix) { inherit lib; };
metapkgs = let
pPath = (toString ./../pkgs/pkgsets);
pPath = (toString ../pkgsets);
in (lists.forEach (fn.lsfRec pPath true) (v: replaceStrings [ "${pPath}/" "/" ".nix" ] [ "" "::" "" ] v));
pkgOption = pname: {
name = pname;
value = rec {
pkgwrap = mkOption {
type = with types; oneOf [ package (listOf package) ];
default = cfg.pkgsets."${pname}".pkgs;
default = (fn.pkgFilter cfg.pkgsets."${pname}".pkgs);
description = ''
Package Wrapper for packages using a wrapper function (like python, emacs, haskell, ...)
'';

@ -5,7 +5,7 @@ with lib;
let
cfg = config.machine;
fn = import (toString ../fn.nix) { inherit lib; };
pkgsets = map (v: (toString ./.) + "/pkgsets/${v}") (fn.lsf (toString ./pkgsets));
pkgsets = map (v: (toString ../.) + "/pkgsets/${v}") (fn.lsf (toString ../pkgsets));
in {
imports = pkgsets;

@ -4,7 +4,7 @@ with lib;
let
gitpkgs = import /nixpkgs {};
fn = import (toString ../../fn.nix) { inherit lib; };
fn = import (toString ../fn.nix) { inherit lib; };
modefiles = fn.lst { p = (toString ./emacs); b = true; };
in rec {
# nixpkgs.overlays = [
@ -13,7 +13,7 @@ in rec {
# }))
# ];
imports = [
../../options/emacs-init.nix
../options/emacs-init.nix
] ++ modefiles;
programs.emacs.init = {
Loading…
Cancel
Save