about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ops/machines/all-systems.nix1
-rw-r--r--users/wpcarro/keys.nix5
-rw-r--r--users/wpcarro/nixos/default.nix4
-rw-r--r--users/wpcarro/nixos/diogenes/default.nix (renamed from users/wpcarro/nixos/diogenes/configuration.nix)8
4 files changed, 12 insertions, 6 deletions
diff --git a/ops/machines/all-systems.nix b/ops/machines/all-systems.nix
index cbcfaf864f5d..99cabefba6c7 100644
--- a/ops/machines/all-systems.nix
+++ b/ops/machines/all-systems.nix
@@ -15,5 +15,6 @@
 ]) ++
 
 (with depot.users.wpcarro.nixos; [
+  diogenes
   marcus
 ])
diff --git a/users/wpcarro/keys.nix b/users/wpcarro/keys.nix
index 4ac55d530839..30b9b7e5c935 100644
--- a/users/wpcarro/keys.nix
+++ b/users/wpcarro/keys.nix
@@ -2,8 +2,9 @@
 { ... }:
 
 rec {
+  diogenes = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILFDRfpNXDxQuTJAqVg8+Mm/hOfE5VAJP+Lpw9kA5cDG";
   marcus = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJkNQJBXekuSzZJ8+gxT+V1+eXTm3hYsfigllr/ARXkf";
-  seneca = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDSVqb0ehIxp33j8wJgPoCcd45NPnZ3CisDlcO1f5isTvOTSLVf5WAdqgDk9fuTTcOMdaiPQcun7psZYEZ7EnoiDYiNM/iYoqN5ga0MdQVCU0pvkJuExuK8MqdwAnjwrLx1bqw8ivXxbmrKMyN/fUsG8I7IzC+D61ycbMwxM5qSz2mgQjzHIhpS1HgCPJXchD3jo1kw9FgSVMAJJMGpWU6BcJsQ2cNTb3W8Kg3kdeahcIssysC6TbD2MFCI6ucPOdBvP/nMHQ/zwK3CgR75M57lyzqDPqu29OpiFacefN8Jxjgwlg4h/TP3tCkb+fSV/5vkBl8aagoPb+nepC5AWF9ADsagJ6y7HYRqkXnI6FaYRbHg+NjcEu1ljYQqAIl8lRLcVqFEHfqll1V12f1UeciNoSrOBXpb0pQrUs4YlaZU1rbq0t9dQob5x+mm5BrhNhKagEvx5nV+X5bxPywCLpdrotjKpW1oS+EssRq75cv9Aw2vqdNmk2pLhgKkOJu5RrOuitHL9Ts7ax6Co5S086BT57g3BCjaiCZDoWUSRTPc6K+rDPriCGXJqfGncdUJh20QsZPYIrWQSSJuRDW59WxnNbKvIH5aFvHM2S+HyjhZC+d5pjm9mhfHuluL9+Hwis7kxlqNoX3i/i5ufGEODaLeRu5xWp0hc5fYype8BL+NNw== wpcarro@gmail.com";
+  seneca = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDSVqb0ehIxp33j8wJgPoCcd45NPnZ3CisDlcO1f5isTvOTSLVf5WAdqgDk9fuTTcOMdaiPQcun7psZYEZ7EnoiDYiNM/iYoqN5ga0MdQVCU0pvkJuExuK8MqdwAnjwrLx1bqw8ivXxbmrKMyN/fUsG8I7IzC+D61ycbMwxM5qSz2mgQjzHIhpS1HgCPJXchD3jo1kw9FgSVMAJJMGpWU6BcJsQ2cNTb3W8Kg3kdeahcIssysC6TbD2MFCI6ucPOdBvP/nMHQ/zwK3CgR75M57lyzqDPqu29OpiFacefN8Jxjgwlg4h/TP3tCkb+fSV/5vkBl8aagoPb+nepC5AWF9ADsagJ6y7HYRqkXnI6FaYRbHg+NjcEu1ljYQqAIl8lRLcVqFEHfqll1V12f1UeciNoSrOBXpb0pQrUs4YlaZU1rbq0t9dQob5x+mm5BrhNhKagEvx5nV+X5bxPywCLpdrotjKpW1oS+EssRq75cv9Aw2vqdNmk2pLhgKkOJu5RrOuitHL9Ts7ax6Co5S086BT57g3BCjaiCZDoWUSRTPc6K+rDPriCGXJqfGncdUJh20QsZPYIrWQSSJuRDW59WxnNbKvIH5aFvHM2S+HyjhZC+d5pjm9mhfHuluL9+Hwis7kxlqNoX3i/i5ufGEODaLeRu5xWp0hc5fYype8BL+NNw==";
 
-  all = [ marcus seneca ];
+  all = [ diogenes marcus seneca ];
 }
diff --git a/users/wpcarro/nixos/default.nix b/users/wpcarro/nixos/default.nix
index 693cbd9ac154..15de8c0e113c 100644
--- a/users/wpcarro/nixos/default.nix
+++ b/users/wpcarro/nixos/default.nix
@@ -2,6 +2,8 @@
 
 let systemFor = sys: (depot.ops.nixos.nixosFor sys).system;
 in {
+  diogenesSystem = systemFor depot.users.wpcarro.nixos.diogenes;
   marcusSystem = systemFor depot.users.wpcarro.nixos.marcus;
-  meta.targets = [ "marcusSystem" ];
+
+  meta.targets = [ "diogenesSystem" "marcusSystem" ];
 }
diff --git a/users/wpcarro/nixos/diogenes/configuration.nix b/users/wpcarro/nixos/diogenes/default.nix
index afdefce58855..076261eb5026 100644
--- a/users/wpcarro/nixos/diogenes/configuration.nix
+++ b/users/wpcarro/nixos/diogenes/default.nix
@@ -1,19 +1,21 @@
 { depot, pkgs, ... }:
+{ ... }:
 
 let
   inherit (depot.users.wpcarro) keys;
 in {
   imports = [
-    "${depot.path}/ops/modules/tvl.nix"
-    "${pkgs.path}/nixos/modules/virtualisation/google-compute-image.nix"
+    (pkgs.path + "/nixos/modules/virtualisation/google-compute-image.nix")
   ];
 
+  networking.hostName = "diogenes";
+
   # Use the TVL binary cache
   tvl.cache.enable = true;
 
   # Use 100G volume for /nix
   fileSystems."/nix" = {
-    device = "/dev/disk/by-uuid/5a65f6c2-7d55-414d-b693-1928480c9b96";
+    device = "/dev/disk/by-uuid/62396bde-9002-4025-83eb-2a6c731b7adc";
     fsType = "ext4";
   };