From e511bc4812c59151c2c58289f19e97c9bb3d9b42 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Wed, 28 Sep 2022 19:13:41 +0200
Subject: [PATCH] Remove redundant null filters

---
 modules/apps.nix           | 7 ++-----
 modules/checks.nix         | 5 +----
 modules/devShells.nix      | 5 +----
 modules/legacyPackages.nix | 5 +----
 modules/packages.nix       | 7 ++-----
 5 files changed, 7 insertions(+), 22 deletions(-)

diff --git a/modules/apps.nix b/modules/apps.nix
index d3fbc07..f081552 100644
--- a/modules/apps.nix
+++ b/modules/apps.nix
@@ -83,11 +83,8 @@ in
   config = {
     flake.apps =
       mapAttrs
-        (k: v: v.apps)
-        (filterAttrs
-          (k: v: v.apps != null)
-          config.allSystems
-        );
+        (k: v: v.apps or { })
+        config.allSystems;
 
     perInput = system: flake:
       optionalAttrs (flake?apps.${system}) {
diff --git a/modules/checks.nix b/modules/checks.nix
index 87338ae..de515e8 100644
--- a/modules/checks.nix
+++ b/modules/checks.nix
@@ -42,10 +42,7 @@ in
     flake.checks =
       mapAttrs
         (k: v: v.checks)
-        (filterAttrs
-          (k: v: v.checks != null)
-          config.allSystems
-        );
+        config.allSystems;
 
     perInput = system: flake:
       optionalAttrs (flake?checks.${system}) {
diff --git a/modules/devShells.nix b/modules/devShells.nix
index 94a1042..7cbcc12 100644
--- a/modules/devShells.nix
+++ b/modules/devShells.nix
@@ -43,10 +43,7 @@ in
     flake.devShells =
       mapAttrs
         (k: v: v.devShells)
-        (filterAttrs
-          (k: v: v.devShells != null)
-          config.allSystems
-        );
+        config.allSystems;
 
     perInput = system: flake:
       optionalAttrs (flake?devShells.${system}) {
diff --git a/modules/legacyPackages.nix b/modules/legacyPackages.nix
index 6cd4da3..69d1baf 100644
--- a/modules/legacyPackages.nix
+++ b/modules/legacyPackages.nix
@@ -41,10 +41,7 @@ in
     flake.legacyPackages =
       mapAttrs
         (k: v: v.legacyPackages)
-        (filterAttrs
-          (k: v: v.legacyPackages != null)
-          config.allSystems
-        );
+        config.allSystems;
 
     perInput = system: flake:
       optionalAttrs (flake?legacyPackages.${system}) {
diff --git a/modules/packages.nix b/modules/packages.nix
index 50be309..8c08a09 100644
--- a/modules/packages.nix
+++ b/modules/packages.nix
@@ -42,11 +42,8 @@ in
   config = {
     flake.packages =
       mapAttrs
-        (k: v: v.packages)
-        (filterAttrs
-          (k: v: v.packages != null)
-          config.allSystems
-        );
+        (k: v: v.packages or { })
+        config.allSystems;
 
     perInput = system: flake:
       optionalAttrs (flake?packages.${system}) {