12 files changed, 17 insertions, 4 deletions
diff --git a/flake.nix b/flake.nix
index b01ed4de..d8c94ad7 100644
--- a/flake.nix
+++ b/flake.nix
@@ -54,9 +54,9 @@
     ...
   } @ inputs: let
     pkgs = nixpkgs.legacyPackages.x86_64-linux;
+    sysLib = import ./lib {inherit pkgs shell-library;};
   in {
-    nixosConfigurations.Tiamat = let
-      sysLib = import ./lib {inherit pkgs shell-library;};
+    nixosConfigurations.tiamat = let
       system = "x86_64-linux";
     in
       nixpkgs.lib.nixosSystem {
@@ -65,7 +65,7 @@
           pkgs.lib.recursiveUpdate inputs
           sysLib;
         modules = [
-          ./hosts/desktop/configuration.nix
+          ./hosts/tiamat/configuration.nix
           agenix.nixosModules.default
 
           home-manager.nixosModules.home-manager
@@ -89,7 +89,9 @@
           }
         ];
       };
-    nixosConfigurations.Spawn = nixpkgs.lib.nixosSystem {
+
+    nixosConfigurations.mammun = self.outputs.nixosConfigurations.tiamat;
+    nixosConfigurations.spawn = nixpkgs.lib.nixosSystem {
       system = "x86_64-linux";
       specialArgs = inputs;
       modules = [./hosts/spawn/configuration.nix];
diff --git a/hosts/laptop/configuration.nix b/hosts/apzu/configuration.nix
index 8e78949b..8e78949b 100644
--- a/hosts/laptop/configuration.nix
+++ b/hosts/apzu/configuration.nix
diff --git a/hosts/laptop/hardware/cpu.nix b/hosts/apzu/hardware/cpu.nix
index 2d7232cd..2d7232cd 100644
--- a/hosts/laptop/hardware/cpu.nix
+++ b/hosts/apzu/hardware/cpu.nix
diff --git a/hosts/desktop/hardware/default.nix b/hosts/apzu/hardware/default.nix
index bd7241b3..bd7241b3 100644
--- a/hosts/desktop/hardware/default.nix
+++ b/hosts/apzu/hardware/default.nix
diff --git a/hosts/laptop/hardware/gpu.nix b/hosts/apzu/hardware/gpu.nix
index c3df51ae..c3df51ae 100644
--- a/hosts/laptop/hardware/gpu.nix
+++ b/hosts/apzu/hardware/gpu.nix
diff --git a/hosts/laptop/networking.nix b/hosts/apzu/networking.nix
index d50b3af1..d50b3af1 100644
--- a/hosts/laptop/networking.nix
+++ b/hosts/apzu/networking.nix
diff --git a/hosts/hostinfo.toml b/hosts/hostinfo.toml
new file mode 100644
index 00000000..dd8723b9
--- /dev/null
+++ b/hosts/hostinfo.toml
@@ -0,0 +1,11 @@
+[Tiamat]
+description = "This is my main desktop"
+
+[Apzu]
+description = "This is my light laptop, with modern hardware"
+
+[Mummu]
+description = "This is my older and heavier laptop"
+
+[Spawn]
+description = "This is a small compilation target, to get sshkeys for secret unlocking"
diff --git a/hosts/desktop/configuration.nix b/hosts/tiamat/configuration.nix
index 7f68621c..7f68621c 100644
--- a/hosts/desktop/configuration.nix
+++ b/hosts/tiamat/configuration.nix
diff --git a/hosts/desktop/hardware/cpu.nix b/hosts/tiamat/hardware/cpu.nix
index 6859f72a..6859f72a 100644
--- a/hosts/desktop/hardware/cpu.nix
+++ b/hosts/tiamat/hardware/cpu.nix
diff --git a/hosts/laptop/hardware/default.nix b/hosts/tiamat/hardware/default.nix
index bd7241b3..bd7241b3 100644
--- a/hosts/laptop/hardware/default.nix
+++ b/hosts/tiamat/hardware/default.nix
diff --git a/hosts/desktop/hardware/gpu.nix b/hosts/tiamat/hardware/gpu.nix
index 741e8882..741e8882 100644
--- a/hosts/desktop/hardware/gpu.nix
+++ b/hosts/tiamat/hardware/gpu.nix
diff --git a/hosts/desktop/networking.nix b/hosts/tiamat/networking.nix
index 17f7c356..17f7c356 100644
--- a/hosts/desktop/networking.nix
+++ b/hosts/tiamat/networking.nix