From f12308326e09a35d83c1dc6b63d3aafbd316c466 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Madeleine=20Sydney=20=C5=9Alaga?= <msyds@deertopia.net>
Date: Sun, 14 Sep 2025 01:12:04 -0600
Subject: [PATCH] refactor: Remove 'defaults' abstraction

---
 modules/nixos/defaults.nix               | 15 ------------
 modules/nixos/defaults/documentation.nix | 30 ------------------------
 modules/nixos/defaults/nixpkgs.nix       | 20 ----------------
 modules/nixos/documentation.nix          | 24 +++++++++++++++++++
 modules/nixos/nixpkgs.nix                | 14 +++++++++++
 5 files changed, 38 insertions(+), 65 deletions(-)
 delete mode 100644 modules/nixos/defaults.nix
 delete mode 100644 modules/nixos/defaults/documentation.nix
 delete mode 100644 modules/nixos/defaults/nixpkgs.nix
 create mode 100644 modules/nixos/documentation.nix
 create mode 100644 modules/nixos/nixpkgs.nix

diff --git a/modules/nixos/defaults.nix b/modules/nixos/defaults.nix
deleted file mode 100644
index cb1b358..0000000
--- a/modules/nixos/defaults.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-let
-  # TODO: Move to a fucking utility library already!
-  listNixFilesInDirectory = dir:
-    builtins.attrNames
-      (lib.filterAttrs
-        (k: _v: lib.hasSuffix ".nix" k)
-        (builtins.readDir dir));
-in {
-  imports =
-    builtins.map
-      (k: ./defaults/${k})
-      (listNixFilesInDirectory ./defaults);
-}
diff --git a/modules/nixos/defaults/documentation.nix b/modules/nixos/defaults/documentation.nix
deleted file mode 100644
index 200373e..0000000
--- a/modules/nixos/defaults/documentation.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let cfg = config.sydnix.defaults.documentation;
-in {
-  options = {
-    sydnix.defaults.documentation = {
-      enable = mkOption {
-        description = "Madeleine's default documentation settings";
-        default = true;
-        type = types.bool;
-      };
-    };
-  };
-
-  config = mkIf cfg.enable {
-    documentation = {
-      man.enable = true;
-      info.enable = true;
-    };
-
-    environment.systemPackages = with pkgs; [
-      man-pages
-      stdman
-      man-pages-posix
-      stdmanpages
-    ];
-  };
-}
diff --git a/modules/nixos/defaults/nixpkgs.nix b/modules/nixos/defaults/nixpkgs.nix
deleted file mode 100644
index 60d5f73..0000000
--- a/modules/nixos/defaults/nixpkgs.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let cfg = config.sydnix.defaults.nixpkgs;
-in {
-  options = {
-    sydnix.defaults.nixpkgs = {
-      enable = mkOption {
-        description = "Madeleine's default Nixpkgs settings";
-        default = true;
-        type = types.bool;
-      };
-    };
-  };
-
-  config = mkIf cfg.enable {
-    nixpkgs.config.allowUnfree = true;
-  };
-}
diff --git a/modules/nixos/documentation.nix b/modules/nixos/documentation.nix
new file mode 100644
index 0000000..87484d3
--- /dev/null
+++ b/modules/nixos/documentation.nix
@@ -0,0 +1,24 @@
+{ config, lib, pkgs, ... }:
+
+let cfg = config.sydnix.documentation;
+in {
+  options.sydnix.documentation = {
+    enable = lib.mkEnableOption "man and info pages" // {
+      default = true;
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    documentation = {
+      man.enable = true;
+      info.enable = true;
+    };
+
+    environment.systemPackages = with pkgs; [
+      man-pages
+      stdman
+      man-pages-posix
+      stdmanpages
+    ];
+  };
+}
diff --git a/modules/nixos/nixpkgs.nix b/modules/nixos/nixpkgs.nix
new file mode 100644
index 0000000..8b961d3
--- /dev/null
+++ b/modules/nixos/nixpkgs.nix
@@ -0,0 +1,14 @@
+{ config, lib, pkgs, ... }:
+
+let cfg = config.sydnix.nixpkgs;
+in {
+  options.sydnix.nixpkgs = {
+    enable = lib.mkEnableOption "some default Nixpkgs settings" // {
+      default = true;
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    nixpkgs.config.allowUnfree = true;
+  };
+}