From 7039c8fe5c71d702aae4e1b7d2d7ed8fc03bbe91 Mon Sep 17 00:00:00 2001
From: Danilo Reyes <CaptainJawZ@protonmail.com>
Date: Sun, 15 Dec 2024 18:33:19 -0600
Subject: [PATCH] used pipe-operator on module import lambdas

---
 base.nix             | 12 ++++++------
 modules/apps.nix     | 10 ++++------
 modules/dev.nix      | 10 ++++------
 modules/scripts.nix  |  3 ++-
 modules/servers.nix  |  3 ++-
 modules/services.nix | 10 ++++------
 modules/shell.nix    | 10 ++++------
 7 files changed, 26 insertions(+), 32 deletions(-)

diff --git a/base.nix b/base.nix
index a7441fd..1dbb1e9 100644
--- a/base.nix
+++ b/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";
diff --git a/modules/apps.nix b/modules/apps.nix
index 617a79a..dcb1abc 100644
--- a/modules/apps.nix
+++ b/modules/apps.nix
@@ -1,12 +1,10 @@
 { lib, ... }:
 {
   imports =
-    let
-      appFiles = builtins.filter (file: builtins.match ".*\\.nix" file != null) (
-        builtins.attrNames (builtins.readDir ./apps)
-      );
-    in
-    map (file: ./apps/${file}) appFiles;
+    builtins.readDir ./apps
+    |> builtins.attrNames
+    |> builtins.filter (file: builtins.match ".*\\.nix" file != null)
+    |> map (file: ./apps/${file});
   my = {
     dev.gameDev.enable = lib.mkDefault false;
     apps = {
diff --git a/modules/dev.nix b/modules/dev.nix
index 1a53bee..379cbfa 100644
--- a/modules/dev.nix
+++ b/modules/dev.nix
@@ -1,12 +1,10 @@
 { lib, ... }:
 {
   imports =
-    let
-      devFiles = builtins.filter (file: builtins.match ".*\\.nix" file != null) (
-        builtins.attrNames (builtins.readDir ./dev)
-      );
-    in
-    map (file: ./dev/${file}) devFiles;
+    builtins.readDir ./dev
+    |> builtins.attrNames
+    |> builtins.filter (file: builtins.match ".*\\.nix" file != null)
+    |> map (file: ./dev/${file});
   my.emacs.enable = lib.mkDefault false;
   my.dev = {
     sh.enable = lib.mkDefault false;
diff --git a/modules/scripts.nix b/modules/scripts.nix
index ddf3b26..e3d10e9 100644
--- a/modules/scripts.nix
+++ b/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;
diff --git a/modules/servers.nix b/modules/servers.nix
index 4e04e6c..9dd45ef 100644
--- a/modules/servers.nix
+++ b/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 = {
diff --git a/modules/services.nix b/modules/services.nix
index 728faeb..71b74df 100644
--- a/modules/services.nix
+++ b/modules/services.nix
@@ -1,12 +1,10 @@
 { lib, ... }:
 {
   imports =
-    let
-      serviceFiles = builtins.filter (file: builtins.match ".*\\.nix" file != null) (
-        builtins.attrNames (builtins.readDir ./services)
-      );
-    in
-    map (file: ./services/${file}) serviceFiles;
+    builtins.readDir ./services
+    |> builtins.attrNames
+    |> builtins.filter (file: builtins.match ".*\\.nix" file != null)
+    |> map (file: ./services/${file});
   my.services = {
     network.enable = lib.mkDefault false;
     nvidia.enable = lib.mkDefault false;
diff --git a/modules/shell.nix b/modules/shell.nix
index bd3528f..a129f42 100644
--- a/modules/shell.nix
+++ b/modules/shell.nix
@@ -1,12 +1,10 @@
 { lib, ... }:
 {
   imports =
-    let
-      shellFiles = builtins.filter (file: builtins.match ".*\\.nix" file != null) (
-        builtins.attrNames (builtins.readDir ./shell)
-      );
-    in
-    map (file: ./shell/${file}) shellFiles;
+    builtins.readDir ./shell
+    |> builtins.attrNames
+    |> builtins.filter (file: builtins.match ".*\\.nix" file != null)
+    |> map (file: ./shell/${file});
   my.shell = {
     exercism.enable = lib.mkDefault false;
     multimedia.enable = lib.mkDefault false;