add html documentation to graphical systems
Some checks reported errors
Hydra nixosConfigurations.container-default-x86_64-linux Hydra build #24153 of nixos-config:pr618:nixosConfigurations.container-default-x86_64-linux
Hydra nixosConfigurations.pc-installer Hydra build #24156 of nixos-config:pr618:nixosConfigurations.pc-installer
Hydra nixosConfigurations.not522 Hydra build #24154 of nixos-config:pr618:nixosConfigurations.not522
Hydra nixosConfigurations.container-default-riscv64-linux Hydra build #24152 of nixos-config:pr618:nixosConfigurations.container-default-riscv64-linux
Hydra nixosConfigurations.container-default-aarch64-linux Hydra build #24151 of nixos-config:pr618:nixosConfigurations.container-default-aarch64-linux
Hydra nixosConfigurations.not522-installer Hydra build #24155 of nixos-config:pr618:nixosConfigurations.not522-installer
Hydra checks.x86_64-linux.containers-default Hydra build #24150 of nixos-config:pr618:checks.x86_64-linux.containers-default
Some checks reported errors
Hydra nixosConfigurations.container-default-x86_64-linux Hydra build #24153 of nixos-config:pr618:nixosConfigurations.container-default-x86_64-linux
Hydra nixosConfigurations.pc-installer Hydra build #24156 of nixos-config:pr618:nixosConfigurations.pc-installer
Hydra nixosConfigurations.not522 Hydra build #24154 of nixos-config:pr618:nixosConfigurations.not522
Hydra nixosConfigurations.container-default-riscv64-linux Hydra build #24152 of nixos-config:pr618:nixosConfigurations.container-default-riscv64-linux
Hydra nixosConfigurations.container-default-aarch64-linux Hydra build #24151 of nixos-config:pr618:nixosConfigurations.container-default-aarch64-linux
Hydra nixosConfigurations.not522-installer Hydra build #24155 of nixos-config:pr618:nixosConfigurations.not522-installer
Hydra checks.x86_64-linux.containers-default Hydra build #24150 of nixos-config:pr618:checks.x86_64-linux.containers-default
This commit is contained in:
parent
6370a21542
commit
4c68a511b0
7 changed files with 18 additions and 5 deletions
7
config/documentation.nix
Normal file
7
config/documentation.nix
Normal file
|
@ -0,0 +1,7 @@
|
|||
{...}: {
|
||||
documentation.nixos.includeAllModules = true;
|
||||
home-manager.users.darkkirb.manual = {
|
||||
html.enable = true;
|
||||
json.enable = true;
|
||||
};
|
||||
}
|
|
@ -3,5 +3,6 @@
|
|||
isGraphical = true;
|
||||
imports = [
|
||||
./kde
|
||||
./documentation.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;
|
||||
|
|
|
@ -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";
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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 = ''
|
||||
|
|
|
@ -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
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue