nix fmt

hosts/nixedo/modules/nginx/sites.nix

@@ -10,27 +10,27 @@ let
     in
     { inherit port root url; } // overrides;
 
-  sites =
+  sites = [
-    [
+    {
-      {
+      root = "/var/www/vhosts/website-sculpin";
-        root = "/var/www/vhosts/website-sculpin";
+      port = ports.nginx-website-2025;
-        port = ports.nginx-website-2025;
+      url = "2025.oliverdavies.uk";
-        url = "2025.oliverdavies.uk";
 
-        extraConfig = ''
+      extraConfig = ''
-          add_header X-Robots-Tag "noindex, nofollow";
+        add_header X-Robots-Tag "noindex, nofollow";
-        '';
+      '';
-      }
+    }
 
-      (mkSite "eric" {
+    (mkSite "eric" {
-        rootSuffix = "/public";
+      rootSuffix = "/public";
 
-        extraConfig = ''
+      extraConfig = ''
-          add_header X-Robots-Tag "noindex, nofollow";
+        add_header X-Robots-Tag "noindex, nofollow";
-        '';
+      '';
-      })
+    })
-    ]
+  ]
-    ++ map
+  ++
+    map
       (
         domain:
         mkSite domain {

modules2/home-manager/nixos.nix

@@ -1,4 +1,9 @@
-{ config, inputs, lib, ... }:
+{
+  config,
+  inputs,
+  lib,
+  ...
+}:
 
 {
   flake.modules.nixos.pc = {

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",
         }:

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 ];
 }

users/opdavies.nix

@@ -13,13 +13,12 @@ with lib;
     initialPassword = "opdavies";
     isNormalUser = true;
 
-    extraGroups =
+    extraGroups = [
-      [
+      "networkmanager"
-        "networkmanager"
+      "wheel"
-        "wheel"
+    ]
-      ]
+    ++ optional config.features.cli.docker.enable "docker"
-      ++ optional config.features.cli.docker.enable "docker"
+    ++ optional config.features.cli.podman.enable "podman";
-      ++ optional config.features.cli.podman.enable "podman";
 
     packages = with pkgs; [
       magic-wormhole