From b8c7e95643b54b5d2a51cbfa55d3e42087e2ff80 Mon Sep 17 00:00:00 2001 From: RGBCube Date: Tue, 2 Jan 2024 13:57:46 +0300 Subject: [PATCH] mkIf isn't what I expected it to be --- modules/git/default.nix | 2 +- modules/nix/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/git/default.nix b/modules/git/default.nix index 05de79d..78eff97 100644 --- a/modules/git/default.nix +++ b/modules/git/default.nix @@ -60,7 +60,7 @@ homeConfiguration { push.autoSetupRemote = true; url."ssh://git@github.com/".insteadOf = "https://github.com/"; - } // lib.mkIf ulib.isDesktop { + } // lib.optionalAttrs ulib.isDesktop { commit.gpgSign = true; gpg.format = "ssh"; user.signingKey = "~/.ssh/id_rsa"; diff --git a/modules/nix/default.nix b/modules/nix/default.nix index 7887056..12b372f 100644 --- a/modules/nix/default.nix +++ b/modules/nix/default.nix @@ -18,7 +18,7 @@ systemConfiguration { registry = (lib.filterAttrs (name: value: value != {}) (builtins.mapAttrs - (name: value: lib.mkIf (value ? sourceInfo) { + (name: value: lib.optionalAttrs (value ? sourceInfo) { flake = value; }) inputs)) // { default.flake = inputs.nixpkgs; };