chore: add amy to dns

common/generic.nix

@@ -56,4 +56,9 @@
   nixpkgs.config.permittedInsecurePackages = [
     "electron-25.9.0"
   ];
+
+  services.prometheus.exporters = {
+    systemd.enable = true;
+    node.enable = true;
+  };
 }

common/tailscale.nix

@@ -1,3 +1,4 @@
 { ... }: {
   services.tailscale.enable = true;
+  networking.firewall.trustedInterfaces = ["tailsacle0"];
 }

hosts/amy/configuration.nix

@@ -2,11 +2,31 @@
   imports = [
     ./hardware-configuration.nix
     ../../common/generic.nix
+    ../../common/server.nix
+    ../../common/tailscale.nix
   ];
 
   zramSwap.enable = true;
   networking.hostName = "amy";
   networking.domain = "serv.ashhhleyyy.dev";
+
+  time.timeZone = "Europe/London";
+
+  i18n.defaultLocale = "en_GB.UTF-8";
+
+  services.xserver = {
+    layout = "gb";
+    xkbVariant = "";
+  };
+
+  console.keyMap = "uk";
+
+  nix.settings.trusted-users = [ "@wheel" ];
+
+  nixpkgs.config.allowUnfree = true;
+
   services.openssh.enable = true;
+  networking.firewall.allowedTCPPorts = [ 22 ];
+
   system.stateVersion = "23.11";
 }

hosts/lea/configuration.nix

@@ -4,7 +4,6 @@
   imports =
     [
       ./hardware-configuration.nix
-      ../../common/cachix.nix
       ../../common/generic.nix
       ../../common/server.nix
       ../../common/tailscale.nix
@@ -38,7 +37,6 @@
   nixpkgs.config.allowUnfree = true;
 
   environment.systemPackages = with pkgs; [
-    helix
     smartmontools
   ];
 

roles/coredns/ash.ley

@@ -43,6 +43,9 @@ amity	IN	A	100.72.219.75
 ; New DB server
 lea	IN	A	100.122.202.61
 
+; New shorks.gay server
+amy	IN	A	100.93.214.57
+
 ;; --- PERSONAL DEVICES ---
 ; PC
 mary	IN	A	100.111.252.38

roles/postgres.nix

@@ -23,7 +23,7 @@
     };
     ensureDatabases = [ "shorks-gay" ];
     enableTCPIP = true;
-    dataDir = "/data/postgresql/${config.services.postgresql.package.psqlSchema}";
+    dataDir = pkgs.lib.mkIf (config.networking.hostName == "lea") "/data/postgresql/${config.services.postgresql.package.psqlSchema}";
     authentication = pkgs.lib.mkOverride 10 ''
       #type database DBuser  auth-method
       local all      all     peer
@@ -35,4 +35,9 @@
       host all       all     ::1/128        scram-sha-256
     '';
   };
+
+  services.prometheus.exporters.postgres = {
+    enable = true;
+    runAsLocalSuperUser = true;
+  };
 }