From 59d500f8644047aaed2af9675d00a62c86f880bb Mon Sep 17 00:00:00 2001 From: NAHO <90870942+trueNAHO@users.noreply.github.com> Date: Wed, 25 Jun 2025 23:20:20 +0200 Subject: [PATCH 1/2] firefox: simplify derivation declaration --- modules/firefox/hm.nix | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/modules/firefox/hm.nix b/modules/firefox/hm.nix index 68f679f5..dd8c8e60 100644 --- a/modules/firefox/hm.nix +++ b/modules/firefox/hm.nix @@ -5,9 +5,9 @@ }: { imports = - map + lib.mapAttrsToList ( - { name, humanName }: + name: humanName: lib.modules.importApply ./each-config.nix { inherit mkTarget @@ -16,18 +16,9 @@ ; } ) - [ - { - name = "firefox"; - humanName = "Firefox"; - } - { - name = "librewolf"; - humanName = "LibreWolf"; - } - { - name = "floorp"; - humanName = "Floorp"; - } - ]; + { + "firefox" = "Firefox"; + "librewolf" = "LibreWolf"; + "floorp" = "Floorp"; + }; } From 32b2c1c85df463c7cf45bc99dd8825e9e22080cc Mon Sep 17 00:00:00 2001 From: NAHO <90870942+trueNAHO@users.noreply.github.com> Date: Wed, 25 Jun 2025 23:21:56 +0200 Subject: [PATCH 2/2] firefox: simplify inherit formatting --- modules/firefox/hm.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/modules/firefox/hm.nix b/modules/firefox/hm.nix index dd8c8e60..74faf8ec 100644 --- a/modules/firefox/hm.nix +++ b/modules/firefox/hm.nix @@ -9,11 +9,7 @@ ( name: humanName: lib.modules.importApply ./each-config.nix { - inherit - mkTarget - name - humanName - ; + inherit mkTarget name humanName; } ) {