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/nixosModules/ags/default.nix
+++ b/nixosModules/ags/default.nix
@ -111,23 +111,26 @@ in {

            packages =
              [
+                (pkgs.callPackage ./clipboard {})
                # TODO: replace with matugen
                self.packages.${pkgs.system}.coloryou
              ]
-              ++ (with pkgs; [
-                # ags
-                dart-sass
-                bun
-                playerctl
-                (callPackage ./clipboard {})
-
-                ## gui
-                pavucontrol # TODO: replace with ags widget
-              ])
-              ++ (optionals cfgDesktop.isTouchscreen (with pkgs; [
-                lisgd
-                ydotool
-              ]));
+              ++ (builtins.attrValues {
+                inherit
+                  (pkgs)
+                  dart-sass
+                  bun
+                  playerctl
+                  pavucontrol # TODO: replace with ags widget
+                  ;
+              })
+              ++ (optionals cfgDesktop.isTouchscreen (builtins.attrValues {
+                inherit
+                  (pkgs)
+                  lisgd
+                  ydotool
+                  ;
+              }));
          };

          wayland.windowManager.hyprland = {