refactor: flake for better docs support

.github/README.md

@@ -59,13 +59,14 @@
   - ⚸ [Lilith](../hosts/lilith/) A NixOS ISO image that can be quickly deployed and accessed via ssh
   - 🪄 [Luz](../hosts/luz/) A server configuration for some of my infrastructure
   - 𖤍 [Valkyrie](../hosts/valkyrie/) A WSL2 machine 
-  - ⚠️ [Tatsumaki](../hosts/tatsumaki/) A WIP macOS host 
-- 📖 [lib](../lib/) Useful repeated functions
+  - 💮 [Tatsumaki](../hosts/tatsumaki/) A WIP macOS host
+- 📚 [lib](../lib/) Useful repeated functions
 - 🧩 [flake](../flake/) NixOS parts breaking down the complex configuration into smaller more manageable chunks
+- 📝 [docs](../docs/) Documentation for the configuration which can be found [here](https://isabelroses.github.io/dotfiles/)
 - 🔌 [modules](../modules/)
   - [base](../modules/base/) The base configuration settings, which are common between all systems
-  - [options](../modules/options/) Selectable settings that can be used to toggle certain settings
-  - [extra](../modules/extra) Extra configuration modules, for home-manager and NixOS
+    - [options](../modules/base/options/) Selectable settings that can be used to toggle certain settings
+  - [extra](../modules/extra) Extra configuration modules, for home-manager and Nix Darwin and NixOS
   - [profiles](../modules/profiles/) System type configurations (e.g. laptop, servers, desktop)
 
 ### Install Notes

flake/pkgs/docs/default.nix → docs/default.nix

@@ -1,41 +1,39 @@
 # All credits to @nekowinston for this script
-# See https://github.com/nekowinston/nur
 # modfied from https://github.com/nekowinston/nur/blob/49cfefd3c252f4c56725df01f817d1a8b93447d8/docs/default.nix
 {
   lib,
   pkgs,
   ...
 }: let
+  inherit (lib) mkForce filterAttrs scrubDerivations removePrefix;
+
   mkEval = module:
     lib.evalModules {
       modules = [
         module
         {
           _module = {
-            pkgs = lib.mkForce (lib.scrubDerivations "pkgs" pkgs);
+            pkgs = mkForce (scrubDerivations "pkgs" pkgs);
             check = false;
           };
         }
       ];
       specialArgs = {inherit pkgs;};
     };
 
-  css = ./pandoc.css;
-
-  goBack = ../../..;
-
   mkDoc = name: options: let
     doc = pkgs.nixosOptionsDoc {
-      options = lib.filterAttrs (n: _: n != "_module") options;
+      options = filterAttrs (n: _: n != "_module") options;
+      documentType = "none";
       transformOptions = opt:
         opt
         // {
           declarations =
             map
             (decl:
-              if lib.hasPrefix (toString (goBack + /.)) (toString decl)
+              if lib.hasPrefix (toString ../.) (toString decl)
               then let
-                subpath = lib.removePrefix "/" (lib.removePrefix (toString (goBack + /.)) (toString decl));
+                subpath = removePrefix "/" (removePrefix (toString ../.) (toString decl));
               in {
                 url = "https://github.com/isabelroses/dotfiles/tree/main/${subpath}";
                 name = subpath;
@@ -56,19 +54,20 @@
   convert = md:
     pkgs.runCommand "isabelroses-dotfiles.html" {nativeBuildInputs = with pkgs; [pandoc texinfo];} ''
       mkdir $out
-      cp ${css} style.css
+      cp ${./pandoc.css} style.css
       pandoc -o file.texi ${builtins.concatStringsSep " " md}
       texi2any ./file.texi --html --split=chapter --css-include=./style.css --document-language=en -o $out
     '';
 
-  modulesPath = goBack + /modules;
+  modulesPath = ../modules;
   extraModulesPath = modulesPath + /extra;
 
-  # interalEval = mkEval (import (modulesPath + /options));
+  # internalEval = mkEval (import (modulesPath + /base));
   nixosEval = mkEval (import (extraModulesPath + /nixos));
   darwinEval = mkEval (import (extraModulesPath + /darwin));
   hmEval = mkEval (import (extraModulesPath + /home-manager));
-  # internal = mkDoc "internal" interalEval.options;
+
+  # internal = mkDoc "internal" internalEval.options.modules;
   nixos = mkDoc "nixos" nixosEval.options;
   darwin = mkDoc "darwin" darwinEval.options;
   hm = mkDoc "home-manager" hmEval.options;

flake/modules/default.nix

@@ -6,7 +6,9 @@
 in {
   flake = {
     nixosModules = {
-      wakapi = mkModule /modules/extra/nixos/wakapi;
+      internal = mkModule /modules/base;
+
+      wakapi = mkModule /modules/extra/nixos/wakapi.nix;
 
       # i do not provide a default module, so throw an error
       default = builtins.throw "There is no default module.";
@@ -18,7 +20,7 @@ in {
     };
 
     homeManagerModules = {
-      gtklock = mkModule /modules/extra/home-manager/gtklock;
+      gtklock = mkModule /modules/extra/home-manager/gtklock.nix;
 
       default = builtins.throw "There is no default module.";
     };

flake/pkgs/default.nix

@@ -5,7 +5,7 @@ _: {
     ...
   }: {
     packages = let
-      docs = pkgs.callPackage ./docs {};
+      docs = pkgs.callPackage ../../docs {};
     in {
       # docs-md = docs.md;
       docs-html = docs.html;

hosts/default.nix

@@ -11,9 +11,6 @@
   # base modules, are the base of this system configuration and are shared across all systems (so the basics)
   base = modulePath + /base;
 
-  # options module, these allow for quick configuration
-  options = modulePath + /options;
-
   # profiles module, these are sensible defaults for given hardware sets
   # or meta profiles that are used to configure the system based on the requirements of the given machine
   profilesPath = modulePath + /profiles; # the base directory for the types module
@@ -35,7 +32,7 @@
   homes = ../home; # home-manager configurations
 
   # a list of shared modules
-  shared = [base options homes];
+  shared = [base homes];
 
   # extra specialArgs that are on all machines
   sharedArgs = {inherit lib;};

modules/base/default.nix

@@ -1,7 +1,8 @@
-_: {
+{
   imports = [
     ./host # host configurations
     ./gaming # super cool procrastinations related things
+    ./options # options module, these allow for quick configuration
     ./secrets # shhh
     ./services # allows for per-system system services to be enabled
   ];

modules/base/host/hardware/media/sound/default.nix

@@ -1,7 +1,7 @@
 {
   lib,
-  config,
   pkgs,
+  config,
   inputs,
   ...
 }: let

modules/extra/home-manager/default.nix

@@ -1,5 +1,5 @@
 {
   imports = [
-    ./gtklock
+    ./gtklock.nix
   ];
 }

modules/extra/nixos/default.nix

@@ -1,5 +1,5 @@
-_: {
+{
   imports = [
-    ./wakapi
+    ./wakapi.nix
   ];
 }