From 8ae219fb8326f2bbe1b4a8b730c9ee32394c304a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Geoffrey=20=E2=80=9CFrogeye=E2=80=9D=20Preud=27homme?=
 <geoffrey@frogeye.fr>
Date: Sun, 22 Oct 2023 22:50:22 +0200
Subject: [PATCH] nix: Remove unecessary module handling

Who would have thought, someone thought about this before me :shockedpikachu:
---
 config/nix/configuration.nix  | 14 ++++++++------
 config/nix/recursiveMerge.nix | 23 -----------------------
 2 files changed, 8 insertions(+), 29 deletions(-)
 delete mode 100644 config/nix/recursiveMerge.nix

diff --git a/config/nix/configuration.nix b/config/nix/configuration.nix
index d616772..e27de2a 100644
--- a/config/nix/configuration.nix
+++ b/config/nix/configuration.nix
@@ -1,7 +1,9 @@
 { config, pkgs, ... }:
-let
-  recursiveMerge = import ./recursiveMerge.nix;
-  getModule = name: import (./modules + "/${name}.nix") { inherit config pkgs; };
-  loadModules = modules: recursiveMerge ((map getModule) modules);
-in
-loadModules [ "common" "desktop" "battery" "wireless" ]
+{
+  imports = [
+    ./modules/common.nix
+    ./modules/desktop.nix
+    ./modules/battery.nix
+    ./modules/wireless.nix
+  ];
+}
diff --git a/config/nix/recursiveMerge.nix b/config/nix/recursiveMerge.nix
deleted file mode 100644
index 6c3d87d..0000000
--- a/config/nix/recursiveMerge.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-let
-
-  pkgs = import <nixpkgs> { };
-  # Somehow, if fed the pkgs from a nix-build, it creates an infinite recursion, hence the search path
-  lib = pkgs.lib;
-
-  recursiveMerge = with lib; attrList:
-    let f = attrPath:
-      zipAttrsWith (n: values:
-        if tail values == [ ]
-        then head values
-        else if all isList values
-        then unique (concatLists values)
-        else if all isAttrs values
-        then f (attrPath ++ [ n ]) values
-        else last values
-      );
-    in f [ ] attrList;
-
-
-in
-
-recursiveMerge