From 3aacd1eb092fc72e7faedea2a499c9147a913c68 Mon Sep 17 00:00:00 2001 From: Chris Dombroski Date: Tue, 24 Sep 2024 22:26:49 -0400 Subject: [PATCH] Remove unneed common.nix --- nixos-modules/common.nix | 8 -------- nixos-modules/default.nix | 9 ++++++++- 2 files changed, 8 insertions(+), 9 deletions(-) delete mode 100644 nixos-modules/common.nix diff --git a/nixos-modules/common.nix b/nixos-modules/common.nix deleted file mode 100644 index daf4479..0000000 --- a/nixos-modules/common.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ lib, ... }: -{ - imports = builtins.map (n: ./common/${n}) ( - builtins.attrNames ( - lib.filterAttrs (k: v: v == "regular" && lib.hasSuffix ".nix" k) (builtins.readDir ./common) - ) - ); -} diff --git a/nixos-modules/default.nix b/nixos-modules/default.nix index 70b4a6b..daf4479 100644 --- a/nixos-modules/default.nix +++ b/nixos-modules/default.nix @@ -1 +1,8 @@ -{ imports = [ ./common.nix ]; } +{ lib, ... }: +{ + imports = builtins.map (n: ./common/${n}) ( + builtins.attrNames ( + lib.filterAttrs (k: v: v == "regular" && lib.hasSuffix ".nix" k) (builtins.readDir ./common) + ) + ); +}