gensokyo-zone/infrastructure
1
0
Fork 0
mirror of https://github.com/gensokyo-zone/infrastructure.git synced 2026-02-09 20:39:18 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

unnecessary and necessary parenthesis

Browse source
This commit is contained in:
kat witch 2021-08-08 02:22:39 +01:00
parent d13d0e85ef
commit e61b522f3f
No known key found for this signature in database
GPG key ID: 1B477797DCA5EC72
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
default.nix
View file

@ -39,9 +39,9 @@ let
# This is where the meta config is evaluated. # This is where the meta config is evaluated.
eval = lib.evalModules { eval = lib.evalModules {
modules = lib.singleton metaConfig modules = lib.singleton metaConfig
++ (lib.attrValues (removeAttrs argGen.targets ["common"])) ++ lib.attrValues (removeAttrs argGen.targets ["common"])
++ (lib.attrValues hosts) ++ lib.attrValues hosts
++ (lib.optional (builtins.pathExists ./config/trusted/meta.nix) ./config/trusted/meta.nix) ++ lib.optional (builtins.pathExists ./config/trusted/meta.nix) ./config/trusted/meta.nix
++ lib.singleton ./config/modules/meta/default.nix; ++ lib.singleton ./config/modules/meta/default.nix;
specialArgs = { specialArgs = {

4
pkgs/lib/host-import.nix
View file

@ -1,8 +1,8 @@
{ lib }: { hostName, profiles }: with lib; filter builtins.pathExists [ { lib }: { hostName, profiles }: with lib; filter builtins.pathExists [
(../../config/hosts + "/${hostName}/nixos.nix") (../../config/hosts + "/${hostName}/nixos.nix")
(../../config/trusted/hosts + "/${hostName}/nixos.nix") (../../config/trusted/hosts + "/${hostName}/nixos.nix")
] ++ if builtins.isList profiles.base.imports then profiles.base.imports ] ++ (if builtins.isList profiles.base.imports then profiles.base.imports
else singleton profiles.base.imports ++ singleton { else singleton profiles.base.imports) ++ singleton {
home-manager.users.kat = { home-manager.users.kat = {
imports = filter builtins.pathExists [ imports = filter builtins.pathExists [
(../../config/hosts + "/${hostName}/home.nix") (../../config/hosts + "/${hostName}/home.nix")