refactor: replace 'with' with attrValues

2024-08-31 19:16:06 -04:00 · 2024-08-31 19:16:06 -04:00 · 194c140dc1
commit 194c140dc1
parent b47c11362d
56 changed files with 675 additions and 608 deletions
--- a/common/modules/locale.nix
+++ b/common/modules/locale.nix
@ -10,27 +10,33 @@
      };
    };

-    packages = with pkgs; [
-      (nerdfonts.override {
-        fonts = [
-          "JetBrainsMono"
-          "Go-Mono"
-          "Iosevka"
-          "NerdFontsSymbolsOnly"
-          "SpaceMono"
-          "Ubuntu"
-          "Noto"
-        ];
-      })
-      noto-fonts
-      noto-fonts-cjk
-      noto-fonts-emoji
-      liberation_ttf
-      font-awesome
-      meslo-lgs-nf
-      jetbrains-mono
-      ubuntu_font_family
-    ];
+    packages =
+      [
+        (pkgs.nerdfonts.override {
+          fonts = [
+            "JetBrainsMono"
+            "Go-Mono"
+            "Iosevka"
+            "NerdFontsSymbolsOnly"
+            "SpaceMono"
+            "Ubuntu"
+            "Noto"
+          ];
+        })
+      ]
+      ++ (builtins.attrValues {
+        inherit
+          (pkgs)
+          noto-fonts
+          noto-fonts-cjk
+          noto-fonts-emoji
+          liberation_ttf
+          font-awesome
+          meslo-lgs-nf
+          jetbrains-mono
+          ubuntu_font_family
+          ;
+      });
  };

  # Select internationalisation properties.