From 4c68a511b028d7c75ee3e05583c86589123edd42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Delenk?= <lotte@chir.rs>
Date: Thu, 7 Nov 2024 09:38:09 +0100
Subject: [PATCH] add html documentation to graphical systems

---
 config/documentation.nix             | 7 +++++++
 config/graphical.nix                 | 1 +
 config/graphical/plymouth.nix        | 2 ++
 modules/default.nix                  | 1 -
 modules/nix/autoupdater.nix          | 1 +
 programs/desktop/firefox/default.nix | 9 +++++++--
 users/home-manager.nix               | 2 --
 7 files changed, 18 insertions(+), 5 deletions(-)
 create mode 100644 config/documentation.nix

diff --git a/config/documentation.nix b/config/documentation.nix
new file mode 100644
index 00000000..01419dec
--- /dev/null
+++ b/config/documentation.nix
@@ -0,0 +1,7 @@
+{...}: {
+  documentation.nixos.includeAllModules = true;
+  home-manager.users.darkkirb.manual = {
+    html.enable = true;
+    json.enable = true;
+  };
+}
diff --git a/config/graphical.nix b/config/graphical.nix
index 8b5e7cf7..efdd3721 100644
--- a/config/graphical.nix
+++ b/config/graphical.nix
@@ -3,5 +3,6 @@
   isGraphical = true;
   imports = [
     ./kde
+    ./documentation.nix
   ];
 }
diff --git a/config/graphical/plymouth.nix b/config/graphical/plymouth.nix
index a3f6c539..7c3e541f 100644
--- a/config/graphical/plymouth.nix
+++ b/config/graphical/plymouth.nix
@@ -1,3 +1,5 @@
+# Unlike other modules in this directory, this one is not enabled by default
+# The default graphical configuration would enable this, the verbose configuration would not.
 {config, ...}: {
   boot = {
     plymouth.enable = true;
diff --git a/modules/default.nix b/modules/default.nix
index 1d42cb43..66e28db4 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -15,7 +15,6 @@ with lib; {
     disko.nixosModules.default
     ./hydra/build-server.nix
     "${home-manager}/nixos"
-    nur.nixosModules.nur
   ];
   options.isGraphical = mkEnableOption "Whether or not this configuration is a graphical install";
   options.isInstaller = mkEnableOption "Whether or not this configuration is an installer and has no access to secrets";
diff --git a/modules/nix/autoupdater.nix b/modules/nix/autoupdater.nix
index f4b22cc1..30d684a1 100644
--- a/modules/nix/autoupdater.nix
+++ b/modules/nix/autoupdater.nix
@@ -29,6 +29,7 @@ in
         type = types.str;
         description = "Job name to use";
         default = "nixosConfigurations.${config.networking.hostName}";
+        defaultText = literalExpression ''"nixosConfigurations.''${config.networking.hostName}"'';
       };
       specialisation = mkOption {
         type = types.nullOr types.str;
diff --git a/programs/desktop/firefox/default.nix b/programs/desktop/firefox/default.nix
index 66b5fee7..e1a7706e 100644
--- a/programs/desktop/firefox/default.nix
+++ b/programs/desktop/firefox/default.nix
@@ -2,6 +2,7 @@
   pkgs,
   config,
   lib,
+  nur,
   ...
 }: let
   extensions = {
@@ -97,12 +98,16 @@
       "scripting"
     ];
   };
+  nur' = import nur {
+    nurpkgs = pkgs;
+    inherit pkgs;
+  };
 in {
   programs.firefox = {
     enable = true;
     profiles.default = {
       containersForce = true;
-      extensions = map (v: config.nur.repos.rycee.firefox-addons.${v}) (lib.attrNames extensions);
+      extensions = map (v: nur'.repos.rycee.firefox-addons.${v}) (lib.attrNames extensions);
       settings = {
         "extensions.autoDisableScopes" = 0;
         "toolkit.legacyUserProfileCustomizations.stylesheets" = true;
@@ -135,7 +140,7 @@ in {
       unaccepted =
         lib.subtractLists
         v
-        config.nur.repos.rycee.firefox-addons.${k}.meta.mozPermissions;
+        nur'.repos.rycee.firefox-addons.${k}.meta.mozPermissions;
     in {
       assertion = unaccepted == [];
       message = ''
diff --git a/users/home-manager.nix b/users/home-manager.nix
index ff5ee0a3..f99c7ab1 100644
--- a/users/home-manager.nix
+++ b/users/home-manager.nix
@@ -4,7 +4,6 @@
   inputs',
   config,
   sops-nix,
-  nur,
   ...
 }: {
   home-manager = {
@@ -21,7 +20,6 @@
       ./common
       "${impermanence}/home-manager.nix"
       sops-nix.homeManagerModules.sops
-      nur.nixosModules.nur
     ];
   };
 }