From 34874dd592278af8f4e499cba4dcd88934818ff6 Mon Sep 17 00:00:00 2001
From: Chris Kruining <chris@kruining.eu>
Date: Tue, 18 Mar 2025 22:30:48 +0100
Subject: [PATCH] restoring to latest 'valid' state

---
 hosts/manwe/users/chris/test.nix |  4 ----
 hosts/orome/users/chris/test.nix |  4 ----
 hosts/orome/users/kaas/test.nix  |  4 ----
 lib/nixos.nix                    | 20 ++++++++------------
 lib/user.nix                     |  2 +-
 modules/home/options.nix         | 18 ------------------
 6 files changed, 9 insertions(+), 43 deletions(-)
 delete mode 100644 hosts/manwe/users/chris/test.nix
 delete mode 100644 hosts/orome/users/chris/test.nix
 delete mode 100644 hosts/orome/users/kaas/test.nix
 delete mode 100644 modules/home/options.nix

diff --git a/hosts/manwe/users/chris/test.nix b/hosts/manwe/users/chris/test.nix
deleted file mode 100644
index 3dc0c6f..0000000
--- a/hosts/manwe/users/chris/test.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-{ ... }:
-{
-  kaas = false;
-}
diff --git a/hosts/orome/users/chris/test.nix b/hosts/orome/users/chris/test.nix
deleted file mode 100644
index 0fe32ba..0000000
--- a/hosts/orome/users/chris/test.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-{ ... }:
-{
-  kaas = true;
-}
diff --git a/hosts/orome/users/kaas/test.nix b/hosts/orome/users/kaas/test.nix
deleted file mode 100644
index 0fe32ba..0000000
--- a/hosts/orome/users/kaas/test.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-{ ... }:
-{
-  kaas = true;
-}
diff --git a/lib/nixos.nix b/lib/nixos.nix
index 6cf5850..305781c 100644
--- a/lib/nixos.nix
+++ b/lib/nixos.nix
@@ -20,10 +20,8 @@ in rec
 
       specialArgs = {inherit lib inputs system; };
 
-      modules =
-      let
+      modules = let
         stateVersion = "23.11";
-
         users = attrNames (mapModules "${path}/users" (p: p));
       in [
         inputs.nixos-boot.nixosModules.default
@@ -60,17 +58,15 @@ in rec
         (filterAttrs (n: v: !elem n ["system"]) attrs)
         ../. # ../default.nix
         (import path)
-      ];
-      # ++ (map (user: {
-      #   _module.args.user = user;
+      ]
+      ++ (map (user: {
+        _module.args.user = user;
 
-      #   imports = [
-      #     "${path}/users/${user}/test.nix"
-      #   ]
-      #   ++ (mapModulesRec' ../modules/home (file: file));
+        imports = []
+        ++ (mapModulesRec' ../modules/home (file: file));
 
-      #   modules.${user} = (import "${path}/users/${user}/default.nix" args);
-      # }) users);
+        modules.${user} = (import "${path}/users/${user}/default.nix" args);
+      }) users);
     };
 
   mapHosts = dir: attrs @ {system ? system, ...}:
diff --git a/lib/user.nix b/lib/user.nix
index 7aaa2b4..38821a2 100644
--- a/lib/user.nix
+++ b/lib/user.nix
@@ -27,7 +27,7 @@ in rec
     name = removeSuffix ".nix" (baseNameOf path);
   in
     {
-      imports = (mapModulesRec' ../modules/home (file: file));
+      # imports = (mapModulesRec' ../modules/home (file: file));
       home = {
         inherit stateVersion;
         sessionPath = [ "$SNEEUWVLOK_BIN" "$XDG_BIN_HOME" "$PATH" ]; # Pretty sure I don't need this.
diff --git a/modules/home/options.nix b/modules/home/options.nix
deleted file mode 100644
index 85515d3..0000000
--- a/modules/home/options.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ lib, user, config, ... }:
-{
-  options = let
-    inherit (lib) mkOption;
-  in
-  {
-    kaas = mkOption {
-      type = lib.types.bool;
-      default = true;
-      example = true;
-      description = "";
-    };
-  };
-
-  config = {
-    modules.${user}.themes.enable = config.kaas;
-  };
-}