diff --git a/flake.nix b/flake.nix index a194ba0..2c3b61c 100644 --- a/flake.nix +++ b/flake.nix @@ -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; + }; + }; + }); } diff --git a/modules/grafana.nix b/modules/grafana.nix index 80e5059..982caa4 100644 --- a/modules/grafana.nix +++ b/modules/grafana.nix @@ -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"; diff --git a/modules/hedgedoc.nix b/modules/hedgedoc.nix index 512d35b..34147a0 100644 --- a/modules/hedgedoc.nix +++ b/modules/hedgedoc.nix @@ -29,6 +29,6 @@ in config.services.portunus.seedSettings.groups = lib.optional (cfg.userGroup != null) { long_name = "Hedgedoc Users"; name = cfg.userGroup; - permissions = {}; + permissions = { }; }; } diff --git a/modules/hydra.nix b/modules/hydra.nix index 9e2ddb5..fd73bdd 100644 --- a/modules/hydra.nix +++ b/modules/hydra.nix @@ -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)); } diff --git a/modules/intel.nix b/modules/intel.nix index f5c61a8..9062311 100644 --- a/modules/intel.nix +++ b/modules/intel.nix @@ -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 diff --git a/modules/nextcloud.nix b/modules/nextcloud.nix index 3934d0c..70b939f 100644 --- a/modules/nextcloud.nix +++ b/modules/nextcloud.nix @@ -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 { diff --git a/modules/no-x-libs.nix b/modules/no-x-libs.nix index e0a7950..96d547c 100644 --- a/modules/no-x-libs.nix +++ b/modules/no-x-libs.nix @@ -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; }; + })); + }; } diff --git a/modules/vaultwarden.nix b/modules/vaultwarden.nix index 899f604..9f30a14 100644 --- a/modules/vaultwarden.nix +++ b/modules/vaultwarden.nix @@ -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 {