From fcb47056d2e6713d9b41dac06dcc13c97ec3a6d7 Mon Sep 17 00:00:00 2001 From: Fabian Hauser Date: Thu, 20 Mar 2025 13:40:57 +0200 Subject: [PATCH 1/3] Switch formatting to nixfmt-tree --- checks/default.nix | 7 +------ flake.nix | 4 +--- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/checks/default.nix b/checks/default.nix index ae33fc0..ab4442c 100644 --- a/checks/default.nix +++ b/checks/default.nix @@ -9,12 +9,7 @@ ${system} = { # Check project formatting - format = pkgs.runCommand "nixfmt-check" { } '' - set -euo pipefail - cd ${self} - ${self.formatter.${system}}/bin/formatter . --check - mkdir $out - ''; + format = self.formatter; #TODO(#29): Integration/System tests diff --git a/flake.nix b/flake.nix index d9dae25..dbb924f 100644 --- a/flake.nix +++ b/flake.nix @@ -50,9 +50,7 @@ checks = import ./checks/default.nix importParams; deploy = import ./deploy/default.nix importParams; devShells = import ./dev-shells/default.nix importParams; - formatter.${system} = pkgs.writeShellScriptBin "formatter" '' - ${pkgs.findutils}/bin/find $1 -type f -name '*.nix' -exec ${pkgs.nixfmt-rfc-style}/bin/nixfmt ''${@:2} {} + - ''; + formatter.${system} = pkgs.nixfmt-tree; nixosConfigurations = import ./nixos-configurations/default.nix importParams; nixosModules = import ./nixos-modules/default.nix importParams; packages = import ./packages/default.nix importParams; From d54febbb87e29a8023879bc8a435e419d253b2de Mon Sep 17 00:00:00 2001 From: Fabian Hauser Date: Thu, 20 Mar 2025 13:50:14 +0200 Subject: [PATCH 2/3] Enable forgejo email notifications --- nixos-modules/qois/git/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/nixos-modules/qois/git/default.nix b/nixos-modules/qois/git/default.nix index 719a3a0..2983a33 100644 --- a/nixos-modules/qois/git/default.nix +++ b/nixos-modules/qois/git/default.nix @@ -40,7 +40,11 @@ with lib; }; "ssh.minimum_key_sizes".RSA = 2047; session.COOKIE_SECURE = true; - service.DISABLE_REGISTRATION = true; + service = { + DISABLE_REGISTRATION = true; + ENABLE_NOTIFY_MAIL = true; + DEFAULT_KEEP_EMAIL_PRIVATE = true; + }; mailer = { ENABLED = true; PROTOCOL = "sendmail"; From d01da714fab4a94af7b58b1c04b98ed8caac9ed4 Mon Sep 17 00:00:00 2001 From: Fabian Hauser Date: Thu, 20 Mar 2025 13:40:57 +0200 Subject: [PATCH 3/3] Switch formatting to nixfmt-tree --- checks/default.nix | 7 +------ flake.nix | 4 +--- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/checks/default.nix b/checks/default.nix index ae33fc0..24211a0 100644 --- a/checks/default.nix +++ b/checks/default.nix @@ -9,12 +9,7 @@ ${system} = { # Check project formatting - format = pkgs.runCommand "nixfmt-check" { } '' - set -euo pipefail - cd ${self} - ${self.formatter.${system}}/bin/formatter . --check - mkdir $out - ''; + format = self.formatter.${system}; #TODO(#29): Integration/System tests diff --git a/flake.nix b/flake.nix index d9dae25..dbb924f 100644 --- a/flake.nix +++ b/flake.nix @@ -50,9 +50,7 @@ checks = import ./checks/default.nix importParams; deploy = import ./deploy/default.nix importParams; devShells = import ./dev-shells/default.nix importParams; - formatter.${system} = pkgs.writeShellScriptBin "formatter" '' - ${pkgs.findutils}/bin/find $1 -type f -name '*.nix' -exec ${pkgs.nixfmt-rfc-style}/bin/nixfmt ''${@:2} {} + - ''; + formatter.${system} = pkgs.nixfmt-tree; nixosConfigurations = import ./nixos-configurations/default.nix importParams; nixosModules = import ./nixos-modules/default.nix importParams; packages = import ./packages/default.nix importParams;