Code cleanup.

This commit is contained in:
Kevin Baensch 2019-09-06 11:38:02 +02:00
parent 9b6cea1696
commit 94e969abd9
4 changed files with 10 additions and 13 deletions

View file

@ -4,7 +4,7 @@ with lib;
let
cfg = config.machine;
optPkgs = package: pkgstring: optionals (elem pkgstring cfg.pkgs) package;
optPkgs = package: pkgstring: optionals (elem pkgstring cfg.pkgs) (toList package);
gitpkgs = import /nixpkgs {};
stablepkgs = import <nixos-stable> {};
@ -278,13 +278,13 @@ let
in {
environment.systemPackages = base
++ (optPkgs dict "dict")
++ (optPkgs [emacs] "emacs")
++ (optPkgs emacs "emacs")
++ (optPkgs extra "extra")
++ (optPkgs mail_utils "mailutils")
++ (optPkgs cpp "cpp")
++ (optPkgs [haskell] "haskell")
++ (optPkgs haskell "haskell")
++ (optPkgs java "java")
++ (optPkgs [python3] "python3")
++ (optPkgs python3 "python3")
++ (optPkgs rustpkgs "rustpkgs")
++ (optPkgs server "server")
++ (optPkgs uniProgs "uniProgs")