refactor: replaced all with with builtins.attrValues

nixos/default.nix

@@ -58,54 +58,67 @@ let
 in {
   flake.nixosModules = {
     personal = {
-      imports = with modules; [
-        android
-        audio
-        bluetooth
-        corectrl
-        dconf
-        disks
-        firejail
-        flatpak
-        fonts
-        nur
-        plasma
-        printing
-        sddm
-        steam
-        sysstat
-        virtualization
-      ];
+      imports = builtins.attrValues {
+        inherit
+          (modules)
+          android
+          audio
+          bluetooth
+          corectrl
+          dconf
+          disks
+          firejail
+          flatpak
+          fonts
+          nur
+          plasma
+          printing
+          sddm
+          steam
+          sysstat
+          virtualization
+          ;
+      };
     };
 
     desktop = {
-      imports = with modules; [
-        syncthing
-        # ollama
-      ];
+      imports = builtins.attrValues {
+        inherit
+          (modules)
+          syncthing
+          # ollama
+          
+          ;
+      };
     };
 
     server = {
-      imports = with modules; [
-        services
-      ];
+      imports = builtins.attrValues {
+        inherit
+          (modules)
+          services
+          ;
+      };
     };
 
     shared = {
-      imports = with modules; [
-        accounts
-        doas
-        environment
-        gvfs
-        home-manager
-        locale
-        nix
-        rsyncd
-        sops
-        ssh
-        system
-        xserver
-      ];
+      imports = builtins.attrValues {
+        inherit
+          (modules)
+          accounts
+          doas
+          environment
+          gvfs
+          home-manager
+          locale
+          nix
+          rsyncd
+          sops
+          ssh
+          system
+          xserver
+          ;
+      };
     };
   };
 }

nixos/modules/android.nix

@@ -1,6 +1,9 @@
 {pkgs, ...}: {
   programs.adb.enable = true;
-  services.udev.packages = with pkgs; [
-    android-udev-rules
-  ];
+  services.udev.packages = builtins.attrValues {
+    inherit
+      (pkgs)
+      android-udev-rules
+      ;
+  };
 }

nixos/modules/fonts.nix

@@ -1,9 +1,12 @@
 {pkgs, ...}: {
   fonts = {
     fontconfig.defaultFonts.emoji = ["Noto Fonts Color Emoji"];
-    packages = with pkgs; [
-      noto-fonts-color-emoji
-      open-dyslexic
-    ];
+    packages = builtins.attrValues {
+      inherit
+        (pkgs)
+        noto-fonts-color-emoji
+        open-dyslexic
+        ;
+    };
   };
 }

nixos/modules/gnome.nix

@@ -14,17 +14,21 @@
       games.enable = false;
       gnome-online-accounts.enable = true;
     };
-    udev.packages = with pkgs; [
-      gnome.gnome-settings-daemon
-    ];
+    udev.packages = builtins.attrValues {
+      inherit
+        (pkgs.gnome)
+        gnome-settings-daemon
+        ;
+    };
   };
   environment = {
     variables = {
       # WEBKIT_FORCE_SANDBOX = "0";
       # WEBKIT_DISABLE_COMPOSITING_MODE = "1";
     };
-    gnome.excludePackages =
-      (with pkgs; [
+    gnome.excludePackages = builtins.attrValues {
+      inherit
+        (pkgs)
         gnome-photos
         gnome-tour
         epiphany # web browser
@@ -34,8 +38,9 @@
         totem # video player
         yelp # help viewer
         gnome-calendar
-      ])
-      ++ (with pkgs.gnome; [
+        ;
+      inherit
+        (pkgs.gnome)
         gnome-music
         tali # poker game
         iagno # go game
@@ -46,6 +51,7 @@
         gnome-maps
         gnome-contacts
         gnome-characters
-      ]);
+        ;
+    };
   };
 }

nixos/modules/plasma.nix

@@ -2,12 +2,15 @@
   services = {
     desktopManager.plasma6.enable = true;
   };
-  environment.plasma6.excludePackages = with pkgs.kdePackages; [
-    plasma-browser-integration
-    konsole
-    kate
-    spectacle
-    kdeconnect-kde
-    khelpcenter
-  ];
+  environment.plasma6.excludePackages = builtins.attrValues {
+    inherit
+      (pkgs.kdePackages)
+      plasma-browser-integration
+      konsole
+      kate
+      spectacle
+      kdeconnect-kde
+      khelpcenter
+      ;
+  };
 }

nixos/modules/services/peertube.nix

@@ -23,12 +23,15 @@ in {
       user = service.name;
       plugins = {
         enable = true;
-        plugins = with pkgs; [
-          peertube-plugin-livechat
-          peertube-plugin-matomo
-          peertube-plugin-transcoding-custom-quality
-          peertube-theme-dark
-        ];
+        plugins = builtins.attrValues {
+          inherit
+            (pkgs)
+            peertube-plugin-livechat
+            peertube-plugin-matomo
+            peertube-plugin-transcoding-custom-quality
+            peertube-theme-dark
+            ;
+        };
       };
 
       secrets = {