From 09cd3ec2a51284d7800b3692d311a9dd76f4f3c3 Mon Sep 17 00:00:00 2001 From: Colin Date: Sat, 28 Sep 2024 09:53:59 +0000 Subject: [PATCH] refactor: hosts/modules/roles/dev-machine: fewer file-level inherits --- hosts/modules/roles/dev-machine.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/hosts/modules/roles/dev-machine.nix b/hosts/modules/roles/dev-machine.nix index 977a94f67..8c65d0e21 100644 --- a/hosts/modules/roles/dev-machine.nix +++ b/hosts/modules/roles/dev-machine.nix @@ -1,11 +1,10 @@ { config, lib, ... }: let - inherit (lib) mkIf mkMerge mkOption types; cfg = config.sane.roles.dev-machine; in { - options.sane.roles.dev-machine = mkOption { + options.sane.roles.dev-machine = with lib; mkOption { type = types.bool; default = false; description = '' @@ -14,13 +13,13 @@ in ''; }; - config = mkMerge [ - ({ + config = with lib; mkMerge [ + { sane.programs.docsets.config.rustPkgs = [ # "lemmy-server" # "mx-sanebot" ]; - }) + } (mkIf cfg { sane.programs.docsets.enableFor.system = true; # sane.programs.ldd-aarch64.enableFor.user.colin = true; #< requires binfmt