Asserted formatting fixes

This commit is contained in:
Sandro - 2024-01-08 14:47:38 +01:00
parent a3ccbc1f17
commit 63ad42397e
Signed by: sandro
GPG Key ID: 3AF5A43A3EECC2E5
8 changed files with 51 additions and 52 deletions

View File

@ -22,16 +22,14 @@
);
in
{
lib = args:
let
lib' = importDirToKey "lib" args;
in
lib' // {
# some functions get promoted to be directly under libS
inherit (lib'.doc) mkModuleDoc mkMdBook;
inherit (lib'.modules) mkOpinionatedOption mkRecursiveDefault;
inherit (lib'.ssh) mkPubKey;
};
lib = args: let
lib' = importDirToKey "lib" args;
in lib' // {
# some functions get promoted to be directly under libS
inherit (lib'.doc) mkModuleDoc mkMdBook;
inherit (lib'.modules) mkOpinionatedOption mkRecursiveDefault;
inherit (lib'.ssh) mkPubKey;
};
# NOTE: requires libS to be imported once which can be done like:
# _module.args.libS = lib.mkOverride 1001 (nixos-modules.lib { inherit lib config; });
@ -53,25 +51,24 @@
_module.args.libS = lib.mkOverride 1000 (self.lib { inherit lib config; });
imports = fileList "modules";
};
} // flake-utils.lib.eachDefaultSystem (system:
let
libS = self.lib { config = { }; inherit lib; pkgs = nixpkgs.legacyPackages.${system}; };
in
{
packages = rec {
options-doc-md = libS.mkModuleDoc {
modules = [
({ config, lib, ... }: {
_module.args.libS = self.lib { inherit config lib; };
})
self.nixosModule
];
urlPrefix = "https://github.com/SuperSandro2000/nixos-modules/tree/master/";
};
options-doc = libS.mkMdBook {
projectName = "nixos-modules";
moduleDoc = options-doc-md;
};
} // flake-utils.lib.eachDefaultSystem (system: let
libS = self.lib { config = { }; inherit lib; pkgs = nixpkgs.legacyPackages.${system}; };
in {
packages = rec {
options-doc-md = libS.mkModuleDoc {
modules = [
({ config, lib, ... }: {
_module.args.libS = self.lib { inherit config lib; };
})
self.nixosModule
];
urlPrefix = "https://github.com/SuperSandro2000/nixos-modules/tree/master/";
};
});
options-doc = libS.mkMdBook {
projectName = "nixos-modules";
moduleDoc = options-doc-md;
};
};
});
}

View File

@ -95,7 +95,7 @@ in
};
config.services.nginx = lib.mkIf (cfg.enable && cfg.configureNginx) {
upstreams.grafana.servers."unix:${cfg.settings.server.socket}" = {};
upstreams.grafana.servers."unix:${cfg.settings.server.socket}" = { };
virtualHosts = {
"${cfg.settings.server.domain}".locations = {
"/".proxyPass = "http://grafana";

View File

@ -29,6 +29,6 @@ in
config.services.portunus.seedSettings.groups = lib.optional (cfg.userGroup != null) {
long_name = "Hedgedoc Users";
name = cfg.userGroup;
permissions = {};
permissions = { };
};
}

View File

@ -83,9 +83,11 @@ in
name = cfg.userGroup;
permissions = { };
})
] ++ lib.flatten (map lib.attrValues (map (lib.mapAttrs (ldapGroup: _: {
long_name = "Hydra Role ${ldapGroup}";
name = ldapGroup;
permissions = { };
})) cfg.roleMappings));
] ++ lib.flatten (map lib.attrValues (map
(lib.mapAttrs (ldapGroup: _: {
long_name = "Hydra Role ${ldapGroup}";
name = ldapGroup;
permissions = { };
}))
cfg.roleMappings));
}

View File

@ -7,7 +7,7 @@
config = {
hardware.opengl = {
extraPackages = with pkgs; lib.mkIf config.hardware.intelGPU [
extraPackages = with pkgs; lib.mkIf config.hardware.intelGPU [
intel-compute-runtime # OpenCL library for iGPU
# video encoding/decoding hardware acceleration
intel-media-driver # broadwell or newer

View File

@ -164,10 +164,10 @@ in
# 1080 files/photos app when viewing picture
${occ} config:app:set --value="256 1080" previewgenerator heightSizes
'';
serviceConfig = {
Type = "oneshot";
User = "nextcloud";
};
serviceConfig = {
Type = "oneshot";
User = "nextcloud";
};
};
nextcloud-setup = lib.mkIf cfg.configureRecognize {

View File

@ -2,12 +2,12 @@
# this module extends the environment.noXlibs setting with yet to merge and upstream overwrites
{
config = lib.mkIf config.environment.noXlibs {
nixpkgs.overlays = lib.singleton (lib.const (super: {
nginx = super.nginx.override { withImageFilter = false; };
config = lib.mkIf config.environment.noXlibs {
nixpkgs.overlays = lib.singleton (lib.const (super: {
nginx = super.nginx.override { withImageFilter = false; };
# https://github.com/NixOS/nixpkgs/pull/213783
vte = super.vte.override { gtkVersion = null; };
}));
};
# https://github.com/NixOS/nixpkgs/pull/213783
vte = super.vte.override { gtkVersion = null; };
}));
};
}

View File

@ -22,16 +22,16 @@ in
};
config = lib.mkIf cfg.enable {
assertions = [ {
assertions = [{
assertion = cfg.configureNginx -> cfg.domain != null;
message = ''
Setting services.vaultwarden.configureNginx to true requires configuring services.vaultwarden.domain!
'';
} ];
}];
nixpkgs.overlays = lib.mkIf cfg.recommendedDefaults [
(final: prev: {
vaultwarden = prev.vaultwarden.overrideAttrs ({ patches ? [], ... }: {
vaultwarden = prev.vaultwarden.overrideAttrs ({ patches ? [ ], ... }: {
patches = patches ++ [
# add eu region push support
(final.fetchpatch {