diff --git a/home/ssh/authorized_keys b/home/ssh/authorized_keys index fe893a6..ba611ba 100644 --- a/home/ssh/authorized_keys +++ b/home/ssh/authorized_keys @@ -2,7 +2,7 @@ ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINAX6pNx5mbwIa8X+GzktyNijfYmJUpgROFpRxSW9js0 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFWPSFQT0AH77wrwRhiskcBS0w4ZakBRdJywYYBsnm3S greg@genesis ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMYzms+KIe5/bYF3uCyFjA5e1AgMPLIA3c4k417coqBe gregory.hellings@ls23003 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINnRc/kBhxcjpUtiRQY+BXnSObdp0jFL1395wAQxJip7 greg@jude -ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAl6DJVrPSujvJSAEA5Q8tRrzfJs/c6DMwqwQEUFffIR greg@myself +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAl6DJVrPSujvJSAEA5Q8tRrzfJs/c6DMwqwQEUFffIR greg@isaiah ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGrqJQvDspLi1vXQRJ/Z5kN/F8jCBHvaXjo+5zLuIYjR greg@hosea ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIYIiecdyM9c7tXgR96983K3wqiJeQRMbrzGIF8Wy6uO greg@jeremiah ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC189EnvWjNUp3xSzPMAtw85oQEsvP1tQR1TK640nLx6 greg@exodus diff --git a/hosts/default.nix b/hosts/default.nix index 334be65..74358e0 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -60,7 +60,7 @@ in linode = machine { name = "linode"; }; hosea = unstable { name = "hosea"; }; jeremiah = unstable { name = "jeremiah"; }; - myself = unstable { name = "myself"; }; + isaiah = unstable { name = "isaiah"; }; iso = machine { name = "iso"; }; iso-beta = unstable { name = "iso"; }; # nix build '.#nixosConfigurations.wsl.config.system.build.installer' diff --git a/hosts/myself/ceph.nix b/hosts/isaiah/ceph.nix similarity index 100% rename from hosts/myself/ceph.nix rename to hosts/isaiah/ceph.nix diff --git a/hosts/myself/container-git.nix b/hosts/isaiah/container-git.nix similarity index 100% rename from hosts/myself/container-git.nix rename to hosts/isaiah/container-git.nix diff --git a/hosts/myself/container-runner.nix b/hosts/isaiah/container-runner.nix similarity index 100% rename from hosts/myself/container-runner.nix rename to hosts/isaiah/container-runner.nix diff --git a/hosts/myself/default.nix b/hosts/isaiah/default.nix similarity index 85% rename from hosts/myself/default.nix rename to hosts/isaiah/default.nix index 1564af3..3075300 100644 --- a/hosts/myself/default.nix +++ b/hosts/isaiah/default.nix @@ -13,11 +13,20 @@ remote-builder.enable = true; }; + virtualisation.libvirtd = { + enable = true; + onBoot = "ignore"; # only restart VMs labeled 'autostart' + qemu.ovmf.enable = true; + }; + services = { - openssh.enable = true; + openssh = { + enable = true; + settings.PermitRootLogin = "yes"; + }; }; networking = { - hostName = "myself"; + hostName = "isaiah"; useDHCP = false; defaultGateway = { address = " 10.42.1.1"; @@ -58,6 +67,7 @@ greg = { extraGroups = [ "kvm" + "libvirtd" "sudo" "wheel" ]; diff --git a/hosts/myself/git.nix b/hosts/isaiah/git.nix similarity index 95% rename from hosts/myself/git.nix rename to hosts/isaiah/git.nix index c5b2c7e..a8a36b4 100644 --- a/hosts/myself/git.nix +++ b/hosts/isaiah/git.nix @@ -42,9 +42,9 @@ in ##################################################################################### #################### Local Podman/Docker Runner ##################################### ##################################################################################### - age.secrets.runner-reg.file = ../../secrets/gitlab/myself-podman-runner-reg.age; + age.secrets.runner-reg.file = ../../secrets/gitlab/isaiah-podman-runner-reg.age; age.secrets.docker-auth.file = ../../secrets/gitlab/docker-auth.age; - age.secrets.runner-qemu.file = ../../secrets/gitlab/myself-qemu-runner-reg.age; + age.secrets.runner-qemu.file = ../../secrets/gitlab/isaiah-qemu-runner-reg.age; systemd.services.gitlab-runner = { after = [ "network-online.target" ]; requires = [ "network-online.target" ]; diff --git a/hosts/myself/hardware-configuration.nix b/hosts/isaiah/hardware-configuration.nix similarity index 100% rename from hosts/myself/hardware-configuration.nix rename to hosts/isaiah/hardware-configuration.nix diff --git a/hosts/myself/matrix.nix b/hosts/isaiah/matrix.nix similarity index 100% rename from hosts/myself/matrix.nix rename to hosts/isaiah/matrix.nix diff --git a/hosts/myself/minio.nix b/hosts/isaiah/minio.nix similarity index 100% rename from hosts/myself/minio.nix rename to hosts/isaiah/minio.nix diff --git a/hosts/jude/virt.nix b/hosts/jude/virt.nix index 57b4880..a9625d8 100644 --- a/hosts/jude/virt.nix +++ b/hosts/jude/virt.nix @@ -21,7 +21,7 @@ }; }; - age.secrets.runner-reg.file = ../../secrets/gitlab/myself-vbox-runner-reg.age; + age.secrets.runner-reg.file = ../../secrets/gitlab/isaiah-vbox-runner-reg.age; services.gitlab-runner = { enable = true; diff --git a/modules/baseline.nix b/modules/baseline.nix index 766e4c1..bbfaefa 100644 --- a/modules/baseline.nix +++ b/modules/baseline.nix @@ -115,12 +115,8 @@ in isaiah = { extraHostNames = [ "isaiah.home" - "myself" "isaiah.thehellings.lan" - "myself.home" - "myself.thehellings.lan" - "isaiah.builder" - "myself-builder" + "isaiah-builder" ]; publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHleYKtfV4W1Z63Ysu9w5Rbglqlz4F92YcZoMkucoTNf"; }; diff --git a/modules/nixos/remote-builder.nix b/modules/nixos/remote-builder.nix index 772aa8b..67ef6e5 100644 --- a/modules/nixos/remote-builder.nix +++ b/modules/nixos/remote-builder.nix @@ -18,7 +18,7 @@ with lib; "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMMOdWSq6NtcP6sfe2uke4wSfgE16hfa970t+8ADdLwk root@nixos" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINwbFyuS9zcwZ7hGSpAWtx9NJq/elSLN8jYpr+/1nXd8 root@linode" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFXza2Pj05pdzGbiPDc/RF13nHhIZZ63u/WV/BS7bOjf root@genesis" - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDTNTcHmNFB931L5vDAsdOkTc9wFyGpuTMdhc0VYLXME root@myself" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDTNTcHmNFB931L5vDAsdOkTc9wFyGpuTMdhc0VYLXME root@isaiah" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJc/EIBk7lRKBsJQ5Lindz0WIRNUE1z9xeUqhsRN9Pus root@jeremiah" ]; homeMode = "500"; diff --git a/secrets/gitlab/myself-podman-runner-reg.age b/secrets/gitlab/isaiah-podman-runner-reg.age similarity index 100% rename from secrets/gitlab/myself-podman-runner-reg.age rename to secrets/gitlab/isaiah-podman-runner-reg.age diff --git a/secrets/gitlab/myself-qemu-runner-reg.age b/secrets/gitlab/isaiah-qemu-runner-reg.age similarity index 100% rename from secrets/gitlab/myself-qemu-runner-reg.age rename to secrets/gitlab/isaiah-qemu-runner-reg.age diff --git a/secrets/gitlab/myself-shell-runner-reg.age b/secrets/gitlab/isaiah-shell-runner-reg.age similarity index 100% rename from secrets/gitlab/myself-shell-runner-reg.age rename to secrets/gitlab/isaiah-shell-runner-reg.age diff --git a/secrets/gitlab/myself-vbox-runner-reg.age b/secrets/gitlab/isaiah-vbox-runner-reg.age similarity index 100% rename from secrets/gitlab/myself-vbox-runner-reg.age rename to secrets/gitlab/isaiah-vbox-runner-reg.age diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 017ad48..704f312 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -1,7 +1,7 @@ let linode = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMv9Zud3kZOl86gtmkn+uj3D4kiXWDPtyUL02VVLNR4Q"; jude = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOos0zQePsa+T6Z2dsKbPOvEdrBQ8a6mx3s7pN6ysCI0 root@jude"; - myself = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHleYKtfV4W1Z63Ysu9w5Rbglqlz4F92YcZoMkucoTNf"; + isaiah = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHleYKtfV4W1Z63Ysu9w5Rbglqlz4F92YcZoMkucoTNf"; genesis = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEI9jbTPmEWQ0F2bLYmnIOLmBnag1fkKxHRjz3X8lB/k root@genesis"; hosea = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKLIwkTTXA56sUlUjEulXXZRvZy5H4a5ZwgKWLlpkQDz"; jeremiah = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOjQjXq9WYU2Ki27BR9WwJ4ZruS/lJXbjC1b0Q42Adi0"; @@ -9,7 +9,7 @@ let genesis linode jude - myself + isaiah hosea jeremiah ]; @@ -18,7 +18,7 @@ let user_ivr = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMYzms+KIe5/bYF3uCyFjA5e1AgMPLIA3c4k417coqBe gregory.hellings@ls23003"; user_jude = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINnRc/kBhxcjpUtiRQY+BXnSObdp0jFL1395wAQxJip7 greg@jude"; user_linode = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINAX6pNx5mbwIa8X+GzktyNijfYmJUpgROFpRxSW9js0 greg@linode"; - user_myself = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAl6DJVrPSujvJSAEA5Q8tRrzfJs/c6DMwqwQEUFffIR greg@myself"; + user_isaiah = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAl6DJVrPSujvJSAEA5Q8tRrzfJs/c6DMwqwQEUFffIR greg@isaiah"; user_hosea = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGrqJQvDspLi1vXQRJ/Z5kN/F8jCBHvaXjo+5zLuIYjR greg@hosea"; user_jeremiah = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIYIiecdyM9c7tXgR96983K3wqiJeQRMbrzGIF8Wy6uO greg@jeremiah"; @@ -27,7 +27,7 @@ let user_ivr user_jude user_linode - user_myself + user_isaiah user_hosea user_jeremiah ]; @@ -62,10 +62,10 @@ in "gitlab/key.age".publicKeys = everyone; "gitlab/cert.age".publicKeys = everyone; "gitlab/jeremiah-runner-reg.age".publicKeys = everyone; - "gitlab/myself-qemu-runner-reg.age".publicKeys = everyone; - "gitlab/myself-vbox-runner-reg.age".publicKeys = everyone; - "gitlab/myself-podman-runner-reg.age".publicKeys = everyone; - "gitlab/myself-shell-runner-reg.age".publicKeys = everyone; + "gitlab/isaiah-qemu-runner-reg.age".publicKeys = everyone; + "gitlab/isaiah-vbox-runner-reg.age".publicKeys = everyone; + "gitlab/isaiah-podman-runner-reg.age".publicKeys = everyone; + "gitlab/isaiah-shell-runner-reg.age".publicKeys = everyone; "gitlab/linode-deployer-runner-reg.age".publicKeys = everyone; "gitlab/docker-auth.age".publicKeys = everyone;