From bd8c22853fda3972e39dd8907409f0afbb1b9e12 Mon Sep 17 00:00:00 2001 From: Minijackson Date: Mon, 4 Nov 2024 15:33:51 +0100 Subject: [PATCH 1/3] editorconfig: don't check Nix style already done with Alejandra --- .editorconfig | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.editorconfig b/.editorconfig index 1a74260d..d8d214e6 100644 --- a/.editorconfig +++ b/.editorconfig @@ -14,6 +14,10 @@ insert_final_newline = unset indent_style = space indent_size = 2 +# Formatting is checked with the Nix formatter, +# no need to check it with eclint +eclint_indent_style = unset + [*.md] indent_style = space From 64974992cf484c05c1a38e726fe4beec58826b3e Mon Sep 17 00:00:00 2001 From: Minijackson Date: Mon, 4 Nov 2024 15:34:43 +0100 Subject: [PATCH 2/3] pkgs/docs: fix formatting --- pkgs/docs/default.nix | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/pkgs/docs/default.nix b/pkgs/docs/default.nix index d1d16ee6..6075e8e4 100644 --- a/pkgs/docs/default.nix +++ b/pkgs/docs/default.nix @@ -16,21 +16,24 @@ iocOptions = documentation.options.iocOptions iocConfig; nixosOptions = documentation.options.nixosOptions nixosConfig; - nixosOptionsAttrSet = (epnixLib.inputs.nixpkgs.lib.nixosSystem { - inherit (stdenvNoCC) system; - modules = [ - epnixLib.inputs.self.nixosModules.nixos - ]; - }).options; + nixosOptionsAttrSet = + (epnixLib.inputs.nixpkgs.lib.nixosSystem { + inherit (stdenvNoCC) system; + modules = [ + epnixLib.inputs.self.nixosModules.nixos + ]; + }) + .options; isOurs = option: lib.any (lib.hasPrefix "${epnixLib.inputs.self}") option.declarations; isVisible = option: !option.internal; - relativePath = path: lib.pipe path [ - (lib.splitString "/") - (lib.sublist 4 255) - (lib.concatStringsSep "/") - ]; + relativePath = path: + lib.pipe path [ + (lib.splitString "/") + (lib.sublist 4 255) + (lib.concatStringsSep "/") + ]; # rev = epnixLib.inputs.self.sourceInfo.rev or "master"; @@ -38,7 +41,7 @@ nixdomainLib.optionAttrSetToDocList (lib.filter isOurs) (lib.filter isVisible) - (map (x: x // { declarations = map relativePath x.declarations; })) + (map (x: x // {declarations = map relativePath x.declarations;})) (map (x: lib.nameValuePair x.name x)) lib.listToAttrs builtins.toJSON From 259c83d359230fe0adb0af69b562327e17fa8e53 Mon Sep 17 00:00:00 2001 From: Minijackson Date: Mon, 4 Nov 2024 16:33:32 +0100 Subject: [PATCH 3/3] ioc/common: fix devShell failed evaluation --- ioc/modules/common.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/ioc/modules/common.nix b/ioc/modules/common.nix index 4954c92c..60a0b2ee 100644 --- a/ioc/modules/common.nix +++ b/ioc/modules/common.nix @@ -54,6 +54,7 @@ with lib; { nixpkgs.overlays = [ epnix.inputs.poetry2nix.overlays.default epnix.inputs.bash-lib.overlay + epnix.inputs.sphinxcontrib-nixdomain.overlays.default epnix.overlays.default ]; };