diff --git a/nixos-modules/sops/default.nix b/nixos-modules/sops/default.nix index 33bc526..b87ee47 100644 --- a/nixos-modules/sops/default.nix +++ b/nixos-modules/sops/default.nix @@ -11,7 +11,9 @@ let in { options.jopejoe1.sops = { - enable = (lib.mkEnableOption "Enable sops") // { default = true;}; + enable = (lib.mkEnableOption "Enable sops") // { + default = true; + }; }; config = lib.mkIf cfg.enable { diff --git a/systems/hetzner/default.nix b/systems/hetzner/default.nix index dc39ce2..50ff0b8 100644 --- a/systems/hetzner/default.nix +++ b/systems/hetzner/default.nix @@ -42,8 +42,14 @@ networking.firewall = { enable = true; - allowedTCPPorts = [ 21 80 ]; - allowedUDPPorts = [ 21 80 ]; + allowedTCPPorts = [ + 21 + 80 + ]; + allowedUDPPorts = [ + 21 + 80 + ]; }; systemd.network.networks."10-uplink".networkConfig.Address = "2a01:4f8:a0:31e5::/64"; diff --git a/systems/hetzner/nginx.nix b/systems/hetzner/nginx.nix index d81a24c..54f201b 100644 --- a/systems/hetzner/nginx.nix +++ b/systems/hetzner/nginx.nix @@ -58,7 +58,8 @@ "cache.missing.ninja" = { forceSSL = true; enableACME = true; - locations."/".proxyPass = "http://${config.services.nix-serve.bindAddress}:${toString config.services.nix-serve.port}"; + locations."/".proxyPass = + "http://${config.services.nix-serve.bindAddress}:${toString config.services.nix-serve.port}"; }; "nix.missing.ninja" = { forceSSL = true; @@ -98,23 +99,29 @@ urlPrefix = "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/blob/master/"; } { - optionsJSON = (import "${self.inputs.nixpkgs}/nixos/release.nix" { }).options + /share/doc/nixos/options.json; + optionsJSON = + (import "${self.inputs.nixpkgs}/nixos/release.nix" { }).options + /share/doc/nixos/options.json; name = "NixOS"; urlPrefix = "https://github.com/NixOS/nixpkgs/tree/master/"; } { - optionsJSON = self.inputs.home-manager.packages.${pkgs.stdenv.system}.docs-html.passthru.home-manager-options.nixos + /share/doc/nixos/options.json; + optionsJSON = + self.inputs.home-manager.packages.${pkgs.stdenv.system}.docs-html.passthru.home-manager-options.nixos + + /share/doc/nixos/options.json; name = "Home Manager NixOS"; urlPrefix = "https://github.com/nix-community/home-manager/tree/master/"; } { - optionsJSON = self.inputs.home-manager.packages.${pkgs.stdenv.system}.docs-json + /share/doc/home-manager/options.json; + optionsJSON = + self.inputs.home-manager.packages.${pkgs.stdenv.system}.docs-json + + /share/doc/home-manager/options.json; optionsPrefix = "home-manager.users."; name = "Home Manager"; urlPrefix = "https://github.com/nix-community/home-manager/tree/master/"; } { - optionsJSON = self.inputs.nixvim.packages.${pkgs.stdenv.system}.options-json + /share/doc/nixos/options.json; + optionsJSON = + self.inputs.nixvim.packages.${pkgs.stdenv.system}.options-json + /share/doc/nixos/options.json; optionsPrefix = "programs.nixvim"; name = "NixVim"; urlPrefix = "https://github.com/nix-community/nixvim/tree/main/"; diff --git a/systems/omoikane/disk.nix b/systems/omoikane/disk.nix index 06fd1be..4d56549 100644 --- a/systems/omoikane/disk.nix +++ b/systems/omoikane/disk.nix @@ -1,4 +1,4 @@ -{...}: +{ ... }: { disko.devices = { disk = { diff --git a/systems/zap/wp-test.nix b/systems/zap/wp-test.nix index a5bdf45..668e0fe 100644 --- a/systems/zap/wp-test.nix +++ b/systems/zap/wp-test.nix @@ -121,11 +121,9 @@ if ! test -e "${hostStateDir}/secret-keys.php"; then umask 0177 echo "> "${hostStateDir}/secret-keys.php" - ${ - lib.concatMapStringsSep "\n" (var: '' - echo "define('${var}', '`tr -dc a-zA-Z0-9 > "${hostStateDir}/secret-keys.php" - '') secretsVars - } + ${lib.concatMapStringsSep "\n" (var: '' + echo "define('${var}', '`tr -dc a-zA-Z0-9 > "${hostStateDir}/secret-keys.php" + '') secretsVars} echo "?>" >> "${hostStateDir}/secret-keys.php" chmod 440 "${hostStateDir}/secret-keys.php" fi