diff --git a/hosts/nixedo/modules/nginx/sites.nix b/hosts/nixedo/modules/nginx/sites.nix index bcf733e1..76cb9be3 100644 --- a/hosts/nixedo/modules/nginx/sites.nix +++ b/hosts/nixedo/modules/nginx/sites.nix @@ -10,27 +10,27 @@ let in { inherit port root url; } // overrides; - sites = - [ - { - root = "/var/www/vhosts/website-sculpin"; - port = ports.nginx-website-2025; - url = "2025.oliverdavies.uk"; + sites = [ + { + root = "/var/www/vhosts/website-sculpin"; + port = ports.nginx-website-2025; + url = "2025.oliverdavies.uk"; - extraConfig = '' - add_header X-Robots-Tag "noindex, nofollow"; - ''; - } + extraConfig = '' + add_header X-Robots-Tag "noindex, nofollow"; + ''; + } - (mkSite "eric" { - rootSuffix = "/public"; + (mkSite "eric" { + rootSuffix = "/public"; - extraConfig = '' - add_header X-Robots-Tag "noindex, nofollow"; - ''; - }) - ] - ++ map + extraConfig = '' + add_header X-Robots-Tag "noindex, nofollow"; + ''; + }) + ] + ++ + map ( domain: mkSite domain { diff --git a/modules2/home-manager/nixos.nix b/modules2/home-manager/nixos.nix index 253c5d22..d54d8a77 100644 --- a/modules2/home-manager/nixos.nix +++ b/modules2/home-manager/nixos.nix @@ -1,4 +1,9 @@ -{ config, inputs, lib, ... }: +{ + config, + inputs, + lib, + ... +}: { flake.modules.nixos.pc = { diff --git a/modules2/nixos-configurations.nix b/modules2/nixos-configurations.nix index 70802d0a..0121160b 100644 --- a/modules2/nixos-configurations.nix +++ b/modules2/nixos-configurations.nix @@ -1,4 +1,9 @@ -{ config, inputs, self, ... }: +{ + config, + inputs, + self, + ... +}: { flake = @@ -15,7 +20,7 @@ mkNixosConfiguration = { hostname, - modules ? [], + modules ? [ ], stateVersion ? "22.11", system ? "x86_64-linux", }: diff --git a/secrets.nix b/secrets.nix index ad7e8bd6..26c9e448 100644 --- a/secrets.nix +++ b/secrets.nix @@ -13,22 +13,27 @@ in "secrets/cloudflare.age".publicKeys = [ hosts.nixedo hosts.t480 - ] ++ [ users.opdavies ]; + ] + ++ [ users.opdavies ]; "secrets/cloudflared-credentials.age".publicKeys = [ hosts.nixedo - ] ++ [ users.opdavies ]; + ] + ++ [ users.opdavies ]; "secrets/forgejo-runner-token.age".publicKeys = [ hosts.nixedo - ] ++ [ users.opdavies ]; + ] + ++ [ users.opdavies ]; "secrets/peertube-env.age".publicKeys = [ hosts.nixedo - ] ++ [ users.opdavies ]; + ] + ++ [ users.opdavies ]; "secrets/tubearchivist-env.age".publicKeys = [ hosts.nixedo hosts.t480 - ] ++ [ users.opdavies ]; + ] + ++ [ users.opdavies ]; } diff --git a/users/opdavies.nix b/users/opdavies.nix index 0c60e68f..b8aa85c9 100644 --- a/users/opdavies.nix +++ b/users/opdavies.nix @@ -13,13 +13,12 @@ with lib; initialPassword = "opdavies"; isNormalUser = true; - extraGroups = - [ - "networkmanager" - "wheel" - ] - ++ optional config.features.cli.docker.enable "docker" - ++ optional config.features.cli.podman.enable "podman"; + extraGroups = [ + "networkmanager" + "wheel" + ] + ++ optional config.features.cli.docker.enable "docker" + ++ optional config.features.cli.podman.enable "podman"; packages = with pkgs; [ magic-wormhole