diff --git a/flake.nix b/flake.nix index 07562d4..f457240 100644 --- a/flake.nix +++ b/flake.nix @@ -44,7 +44,7 @@ conformDefaults = { scopes = [ ]; }; contributorCovenantDefaults = { enable = false; }; developerCertificateOfOriginDefaults = { enable = false; }; - dotnetDefaults = { enable = false; format = false; }; + dotnetDefaults = { enable = false; csharpier = false; format = false; }; prettierDefaults = { proseWrap = "preserve"; }; rustDefaults = { enable = false; }; licenseDefaults = { enable = false; filename = "LICENSE.md"; }; @@ -89,7 +89,7 @@ pkgs.nodePackages.prettier pkgs.nixpkgs-fmt ] - ++ pkgs.lib.lists.optional (dotnet // dotnetDefaults).enable [ + ++ pkgs.lib.lists.optional (dotnet // dotnetDefaults).csharpier [ pkgs.csharpier ]; diff --git a/src/configs/editorconfig.nix b/src/configs/editorconfig.nix index da28185..20eb654 100644 --- a/src/configs/editorconfig.nix +++ b/src/configs/editorconfig.nix @@ -101,70 +101,6 @@ let resharper_xmldoc_indent_child_elements = "ZeroIndent"; resharper_xmldoc_indent_text = "ZeroIndent"; resharper_xmldoc_insert_final_newline = false; - #} - #// pkgs.lib.attrsets.optionalAttrs inputs.dotnet.format { - # # csharpier settings - # # https://csharpier.com/docs/IntegratingWithLinters - # "dotnet_diagnostic.IDE0055.severity" = "none"; - # "dotnet_diagnostic.SA1000.severity" = "none"; - # "dotnet_diagnostic.SA1009.severity" = "none"; - # "dotnet_diagnostic.SA1111.severity" = "none"; - # "dotnet_diagnostic.SA1118.severity" = "none"; - # "dotnet_diagnostic.SA1137.severity" = "none"; - # "dotnet_diagnostic.SA1413.severity" = "none"; - # "dotnet_diagnostic.SA1500.severity" = "none"; - # "dotnet_diagnostic.SA1501.severity" = "none"; - # "dotnet_diagnostic.SA1502.severity" = "none"; - # "dotnet_diagnostic.SA1504.severity" = "none"; - # "dotnet_diagnostic.SA1516.severity" = "none"; - # "dotnet_diagnostic.SA1001.severity" = "none"; - # "dotnet_diagnostic.SA1002.severity" = "none"; - # "dotnet_diagnostic.SA1003.severity" = "none"; - # "dotnet_diagnostic.SA1007.severity" = "none"; - # "dotnet_diagnostic.SA1008.severity" = "none"; - # "dotnet_diagnostic.SA1010.severity" = "none"; - # "dotnet_diagnostic.SA1011.severity" = "none"; - # "dotnet_diagnostic.SA1012.severity" = "none"; - # "dotnet_diagnostic.SA1013.severity" = "none"; - # "dotnet_diagnostic.SA1014.severity" = "none"; - # "dotnet_diagnostic.SA1015.severity" = "none"; - # "dotnet_diagnostic.SA1016.severity" = "none"; - # "dotnet_diagnostic.SA1017.severity" = "none"; - # "dotnet_diagnostic.SA1018.severity" = "none"; - # "dotnet_diagnostic.SA1019.severity" = "none"; - # "dotnet_diagnostic.SA1020.severity" = "none"; - # "dotnet_diagnostic.SA1021.severity" = "none"; - # "dotnet_diagnostic.SA1022.severity" = "none"; - # "dotnet_diagnostic.SA1023.severity" = "none"; - # "dotnet_diagnostic.SA1024.severity" = "none"; - # "dotnet_diagnostic.SA1025.severity" = "none"; - # "dotnet_diagnostic.SA1026.severity" = "none"; - # "dotnet_diagnostic.SA1027.severity" = "none"; - # "dotnet_diagnostic.SA1028.severity" = "none"; - # "dotnet_diagnostic.SA1102.severity" = "none"; - # "dotnet_diagnostic.SA1103.severity" = "none"; - # "dotnet_diagnostic.SA1104.severity" = "none"; - # "dotnet_diagnostic.SA1105.severity" = "none"; - # "dotnet_diagnostic.SA1107.severity" = "none"; - # "dotnet_diagnostic.SA1110.severity" = "none"; - # "dotnet_diagnostic.SA1112.severity" = "none"; - # "dotnet_diagnostic.SA1113.severity" = "none"; - # "dotnet_diagnostic.SA1114.severity" = "none"; - # "dotnet_diagnostic.SA1115.severity" = "none"; - # "dotnet_diagnostic.SA1116.severity" = "none"; - # "dotnet_diagnostic.SA1117.severity" = "none"; - # "dotnet_diagnostic.SA1127.severity" = "none"; - # "dotnet_diagnostic.SA1128.severity" = "none"; - # "dotnet_diagnostic.SA1136.severity" = "none"; - # "dotnet_diagnostic.SA1505.severity" = "none"; - # "dotnet_diagnostic.SA1506.severity" = "none"; - # "dotnet_diagnostic.SA1507.severity" = "none"; - # "dotnet_diagnostic.SA1508.severity" = "none"; - # "dotnet_diagnostic.SA1509.severity" = "none"; - # "dotnet_diagnostic.SA1510.severity" = "none"; - # "dotnet_diagnostic.SA1511.severity" = "none"; - # "dotnet_diagnostic.SA1517.severity" = "none"; - # "dotnet_diagnostic.SA1518.severity" = "none"; }; "*.md" = { diff --git a/src/configs/treefmt.nix b/src/configs/treefmt.nix index 9de4bfb..e7642bc 100644 --- a/src/configs/treefmt.nix +++ b/src/configs/treefmt.nix @@ -26,7 +26,7 @@ let excludes = [ "**.min.js" ]; }; } - // pkgs.lib.attrsets.optionalAttrs dotnet.enable { + // pkgs.lib.attrsets.optionalAttrs dotnet.csharpier { csharpier = { command = "${pkgs.csharpier}/bin/dotnet-csharpier"; includes = [ "*.cs" ];