update server hostnames

11 files changed, 91 insertions, 76 deletions

diff --git a/README.md b/README.md
index 057ba18..3d28b7b 100644
--- a/README.md
+++ b/README.md
@@ -1,12 +1,11 @@
 # Flake Layout
 - `hosts/`
-  - `eden/` - my media server and makeshift NAS. Media is stored in a RAID-Z2
+  - `odin/` - my media server and makeshift NAS. Media is stored in a RAID-Z2
   ZFS pool for redundancy, with a caching drive for increased read performance.
-  - `hive/` - my "social" server, responsible for hosting my fediverse server
+  - `thor/` - my "social" server, responsible for hosting my fediverse server
   and a few websites.
-  - `oasis/` - my git and SFTP server.
-  - `raindog/` - my DNS server and SearXNG host. The name is inspired by one of
-  my beautiful dogs, Rainey.
+  - `frigg/` - my git and SFTP server.
+  - `heimdall/` - my DNS server and SearXNG host.
   - `sparrow/` - my laptop.
   - `woodpecker/` - my desktop.
 - `modules/`
diff --git a/flake.nix b/flake.nix
index 9040957..bcef212 100644
--- a/flake.nix
+++ b/flake.nix
@@ -12,67 +12,83 @@
     };
   };
 
-  outputs = { ... }@inputs:
-    let
-      helpers = import ./modules { inherit inputs; };
-      inherit (helpers) mergeSets mkSystem;
-    in
-    {
-      nixosConfigurations = mergeSets [
-        (mkSystem "woodpecker" inputs.nixpkgs [
-          {
-            type = "profiles";
-            modules = [ "common" "fstrim" "libvirtd" "nvidia" "pipewire" "security" "steam" "wireshark" "x11" ];
-          }
-        ])
-        (mkSystem "sparrow" inputs.nixpkgs [
-          {
-            type = "profiles";
-            modules = [ "common" "pipewire" "security" "vpn" "x11" ];
-          }
-        ])
-        (mkSystem "raindog" inputs.nixpkgs [
-          {
-            type = "profiles";
-            modules = [ "common" "security" "upgrade" ];
-          }
-          { type = "scripts"; modules = [ "motd" "pushover" ]; }
-          { type = "services"; modules = [ "blocky" "searx" "ssh" ]; }
-        ])
-        (mkSystem "oasis" inputs.nixpkgs [
-          {
-            type = "profiles";
-            modules = [ "common" "podman" "security" "upgrade" "wireguard" "zfs" ];
-          }
-          { type = "scripts"; modules = [ "motd" "pushover" "zquota" ]; }
-          {
-            type = "services";
-            modules = [ "cgit" "proxy" "sftpgo" "ssh" ];
-          }
-        ])
-        (mkSystem "hive" inputs.nixpkgs [
-          {
-            type = "profiles";
-            modules = [ "common" "security" "upgrade" "wireguard" ];
-          }
-          { type = "scripts"; modules = [ "motd" "pushover" ]; }
-          {
-            type = "services";
-            modules = [ "fediverse" "proxy" "ssh" "web" ];
-          }
-        ])
-        (mkSystem "eden" inputs.nixpkgs [
-          {
-            type = "containers";
-            modules = [ "freshrss" "jellyfin" "lubelogger" "pinchflat" "vaultwarden" "watchtower" ];
-          }
-          {
-            type = "profiles";
-            modules = [ "common" "podman" "security" "share" "upgrade" "wireguard" "zfs" ];
-          }
-          { type = "scripts"; modules = [ "motd" "pushover" "zquota" ]; }
-          { type = "services"; modules = [ "immich" "proxy" "ssh" ]; }
-        ])
-      ];
-    };
+  outputs = { ... } @ inputs: let
+    helpers = import ./modules { inherit inputs; };
+    inherit (helpers) mergeSets mkSystem;
+  in {
+    nixosConfigurations = mergeSets [
+      (mkSystem "woodpecker" inputs.nixpkgs [
+        {
+          type = "profiles";
+          modules = [ "common" "fstrim" "libvirtd" "nvidia" "pipewire" "security" "steam" "wireshark" "x11" ];
+        }
+      ])
+      (mkSystem "sparrow" inputs.nixpkgs [
+        {
+          type = "profiles";
+          modules = [ "common" "pipewire" "security" "vpn" "x11" ];
+        }
+      ])
+      (mkSystem "frigg" inputs.nixpkgs [
+        {
+          type = "profiles";
+          modules = [ "common" "podman" "security" "upgrade" "wireguard" "zfs" ];
+        }
+        {
+          type = "scripts";
+          modules = [ "motd" "pushover" "zquota" ];
+        }
+        {
+          type = "services";
+          modules = [ "cgit" "proxy" "sftpgo" "ssh" ];
+        }
+      ])
+      (mkSystem "heimdall" inputs.nixpkgs [
+        {
+          type = "profiles";
+          modules = [ "common" "security" "upgrade" ];
+        }
+        {
+          type = "scripts";
+          modules = [ "motd" "pushover" ];
+        }
+        {
+          type = "services";
+          modules = [ "blocky" "searx" "ssh" ];
+        }
+      ])
+      (mkSystem "odin" inputs.nixpkgs [
+        {
+          type = "containers";
+          modules = [ "freshrss" "jellyfin" "lubelogger" "pinchflat" "vaultwarden" "watchtower" ];
+        }
+        {
+          type = "profiles";
+          modules = [ "common" "podman" "security" "share" "upgrade" "wireguard" "zfs" ];
+        }
+        {
+          type = "scripts";
+          modules = [ "motd" "pushover" "zquota" ];
+        }
+        {
+          type = "services";
+          modules = [ "immich" "proxy" "ssh" ];
+        }
+      ])
+      (mkSystem "thor" inputs.nixpkgs [
+        {
+          type = "profiles";
+          modules = [ "common" "security" "upgrade" "wireguard" ];
+        }
+        {
+          type = "scripts";
+          modules = [ "motd" "pushover"];
+        }
+        {
+          type = "services";
+          modules = [ "fediverse" "proxy" "ssh" "web" ];
+        }
+      ])
+    ];
+  };
 }
diff --git a/hosts/oasis/default.nix b/hosts/frigg/default.nix
index 5b8ebb3..4803133 100644
--- a/hosts/oasis/default.nix
+++ b/hosts/frigg/default.nix
@@ -15,7 +15,7 @@
   };
 
   networking = {
-    hostName = "oasis";
+    hostName = "frigg";
     hostId = "7a7d723a"; # Required for ZFS support.
     nameservers = [ "10.44.0.1" ];
     defaultGateway.address = "10.44.0.1";
diff --git a/hosts/oasis/hardware.nix b/hosts/frigg/hardware.nix
index 3870379..3870379 100644
--- a/hosts/oasis/hardware.nix
+++ b/hosts/frigg/hardware.nix
diff --git a/hosts/raindog/default.nix b/hosts/heimdall/default.nix
index ac66068..50bbbaf 100644
--- a/hosts/raindog/default.nix
+++ b/hosts/heimdall/default.nix
@@ -15,7 +15,7 @@
   };
 
   networking = {
-    hostName = "raindog";
+    hostName = "heimdall";
     nameservers = [ "10.44.0.1" ];
     defaultGateway.address = "10.44.0.1";
     interfaces.eno1 = {
diff --git a/hosts/raindog/hardware.nix b/hosts/heimdall/hardware.nix
index b2a5571..b2a5571 100644
--- a/hosts/raindog/hardware.nix
+++ b/hosts/heimdall/hardware.nix
diff --git a/hosts/eden/default.nix b/hosts/odin/default.nix
index bb39dbe..47515e8 100644
--- a/hosts/eden/default.nix
+++ b/hosts/odin/default.nix
@@ -15,7 +15,7 @@
   };
 
   networking = {
-    hostName = "eden";
+    hostName = "odin";
     hostId = "bd03847d"; # Required for ZFS support.
     nameservers = [ "10.44.0.1" ];
     defaultGateway.address = "10.44.0.1";
diff --git a/hosts/eden/hardware.nix b/hosts/odin/hardware.nix
index 00210c4..00210c4 100644
--- a/hosts/eden/hardware.nix
+++ b/hosts/odin/hardware.nix
diff --git a/hosts/hive/default.nix b/hosts/thor/default.nix
index 61b8193..0ec2fa9 100644
--- a/hosts/hive/default.nix
+++ b/hosts/thor/default.nix
@@ -15,7 +15,7 @@
   };
 
   networking = {
-    hostName = "hive";
+    hostName = "thor";
     nameservers = [ "10.44.0.1" ];
     defaultGateway.address = "10.44.0.1";
     interfaces.eno1 = {
diff --git a/hosts/hive/hardware.nix b/hosts/thor/hardware.nix
index 9e7a2f0..9e7a2f0 100644
--- a/hosts/hive/hardware.nix
+++ b/hosts/thor/hardware.nix
diff --git a/secrets/secrets.nix b/secrets/secrets.nix
index f007165..e1f4cbe 100644
--- a/secrets/secrets.nix
+++ b/secrets/secrets.nix
@@ -1,9 +1,9 @@
 let
   systems = {
-    eden = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIByi8x1IgXBC6iw6MJoO7xIkkU4bdIaQ3Mi6zEtm+IJh";
-    hive = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGEn+C6ktSqvvwNVf1zUeNKKtZJ1QgLVhQjU83+0RvSY";
-    oasis = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICCvgPNEJrWjeCUmF/izLhIzaAwSNYHW9o5meYmGHGzj";
-    raindog = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINq0rMkFlizGPijlHKMYS9CGWJ2T1ZJHqaLozWdoySz2";
+    odin = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIByi8x1IgXBC6iw6MJoO7xIkkU4bdIaQ3Mi6zEtm+IJh";
+    thor = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGEn+C6ktSqvvwNVf1zUeNKKtZJ1QgLVhQjU83+0RvSY";
+    frigg = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICCvgPNEJrWjeCUmF/izLhIzaAwSNYHW9o5meYmGHGzj";
+    heimdall = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINq0rMkFlizGPijlHKMYS9CGWJ2T1ZJHqaLozWdoySz2";
   };
 
   users = {