used pipe-operator on module import lambdas

base.nix

@@ -7,16 +7,16 @@
 }:
 {
   imports =
-    let
-      moduleFiles = builtins.filter (file: builtins.match ".*\\.nix" file != null) (
-        builtins.attrNames (builtins.readDir ./modules)
-      );
-    in
     [
       inputs.home-manager.nixosModules.home-manager
       ./jawz.nix
     ]
-    ++ (map (file: ./modules/${file}) moduleFiles);
+    ++ (
+      builtins.readDir ./modules
+      |> builtins.attrNames
+      |> builtins.filter (file: builtins.match ".*\\.nix" file != null)
+      |> map (file: ./modules/${file})
+    );
   system.stateVersion = "24.11";
   sops = {
     defaultSopsFormat = "yaml";

modules/apps.nix

@@ -1,12 +1,10 @@
 { lib, ... }:
 {
   imports =
-    let
+    builtins.readDir ./apps
-      appFiles = builtins.filter (file: builtins.match ".*\\.nix" file != null) (
+    |> builtins.attrNames
-        builtins.attrNames (builtins.readDir ./apps)
+    |> builtins.filter (file: builtins.match ".*\\.nix" file != null)
-      );
+    |> map (file: ./apps/${file});
-    in
-    map (file: ./apps/${file}) appFiles;
   my = {
     dev.gameDev.enable = lib.mkDefault false;
     apps = {

modules/dev.nix

@@ -1,12 +1,10 @@
 { lib, ... }:
 {
   imports =
-    let
+    builtins.readDir ./dev
-      devFiles = builtins.filter (file: builtins.match ".*\\.nix" file != null) (
+    |> builtins.attrNames
-        builtins.attrNames (builtins.readDir ./dev)
+    |> builtins.filter (file: builtins.match ".*\\.nix" file != null)
-      );
+    |> map (file: ./dev/${file});
-    in
-    map (file: ./dev/${file}) devFiles;
   my.emacs.enable = lib.mkDefault false;
   my.dev = {
     sh.enable = lib.mkDefault false;

modules/scripts.nix

@@ -1,7 +1,8 @@
 { lib, ... }:
 {
   imports =
-    builtins.attrNames (builtins.readDir ./scripts)
+    builtins.readDir ./scripts
+    |> builtins.attrNames
     |> builtins.filter (file: builtins.match ".*\\.nix" file != null && file != "base.nix")
     |> map (file: ./scripts/${file});
   my.units.download.enable = lib.mkDefault false;

modules/servers.nix

@@ -16,7 +16,8 @@ let
 in
 {
   imports =
-    builtins.attrNames (builtins.readDir ./servers)
+    builtins.readDir ./servers
+    |> builtins.attrNames
     |> builtins.filter (file: builtins.match ".*\\.nix" file != null && file != "setup.nix")
     |> map (file: ./servers/${file});
   options.my = {

modules/services.nix

@@ -1,12 +1,10 @@
 { lib, ... }:
 {
   imports =
-    let
+    builtins.readDir ./services
-      serviceFiles = builtins.filter (file: builtins.match ".*\\.nix" file != null) (
+    |> builtins.attrNames
-        builtins.attrNames (builtins.readDir ./services)
+    |> builtins.filter (file: builtins.match ".*\\.nix" file != null)
-      );
+    |> map (file: ./services/${file});
-    in
-    map (file: ./services/${file}) serviceFiles;
   my.services = {
     network.enable = lib.mkDefault false;
     nvidia.enable = lib.mkDefault false;

modules/shell.nix

@@ -1,12 +1,10 @@
 { lib, ... }:
 {
   imports =
-    let
+    builtins.readDir ./shell
-      shellFiles = builtins.filter (file: builtins.match ".*\\.nix" file != null) (
+    |> builtins.attrNames
-        builtins.attrNames (builtins.readDir ./shell)
+    |> builtins.filter (file: builtins.match ".*\\.nix" file != null)
-      );
+    |> map (file: ./shell/${file});
-    in
-    map (file: ./shell/${file}) shellFiles;
   my.shell = {
     exercism.enable = lib.mkDefault false;
     multimedia.enable = lib.mkDefault false;