From b501221ebcf4b49d8f38b2b1f8f04de0715f61cd Mon Sep 17 00:00:00 2001 From: iFargle Date: Mon, 1 Jan 2024 13:44:45 +0900 Subject: [PATCH] Remove nixos-vm-01 --- flake.nix | 3 -- keys/hosts/nixos-vm-01.asc | 28 --------------- keys/ssh/keys.txt | 3 -- nixos/hosts/nixos-vm-01/default.nix | 54 ----------------------------- 4 files changed, 88 deletions(-) delete mode 100644 keys/hosts/nixos-vm-01.asc delete mode 100644 nixos/hosts/nixos-vm-01/default.nix diff --git a/flake.nix b/flake.nix index f0f480b5..d344eef9 100644 --- a/flake.nix +++ b/flake.nix @@ -45,7 +45,6 @@ in { nixosConfigurations = { osaka-linode-01 = libx.mkHost { hostname = "osaka-linode-01"; type = "small"; }; - nixos-vm-01 = libx.mkHost { hostname = "nixos-vm-01"; }; framework-server = libx.mkHost { hostname = "framework-server"; }; nuc-server = libx.mkHost { hostname = "nuc-server"; }; nixos-desktop = libx.mkHost { hostname = "nixos-desktop"; desktop = "plasma6"; gpu = "nvidia"; }; @@ -56,7 +55,6 @@ }; homeConfigurations = { "albert@osaka-linode-01" = libx.mkHome { hostname = "osaka-linode-01"; }; - "albert@nixos-vm-01" = libx.mkHome { hostname = "nixos-vm-01"; }; "albert@framework-server" = libx.mkHome { hostname = "framework-server"; }; "albert@nuc-server" = libx.mkHome { hostname = "nuc-server"; }; "albert@nixos-desktop" = libx.mkHome { hostname = "nixos-desktop"; desktop = "plasma6"; }; @@ -67,7 +65,6 @@ }; deploy.nodes = { osaka-linode-01 = libx.deploy { hostname = "osaka-linode-01"; }; - nixos-vm-01 = libx.deploy { hostname = "nixos-vm-01"; }; framework-server = libx.deploy { hostname = "framework-server"; }; # nuc-server = libx.deploy { hostname = "nuc-server"; }; # nixos-desktop = libx.deploy { hostname = "nixos-desktop"; }; diff --git a/keys/hosts/nixos-vm-01.asc b/keys/hosts/nixos-vm-01.asc deleted file mode 100644 index 1197c78c..00000000 --- a/keys/hosts/nixos-vm-01.asc +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- - -xsFNBAAAAAABEACuslxESmvGiNr+sVlbGiyy6MnF5yW9q03A4cpkA9OdiplYVsEl -GlG5llecd7KX2+VjFyAnTWH2mV5bh2VczyDIVlkT9cDHghOI/rJinIfFcsGRX4sv -qcD54YZc4jsByWG5xfF0Z7DwOnzoQEg/AjhcP1OvHL4HRvRO2+nalJPQr3PdKw20 -m+XURlFOX6COYpWc8IoVN/nl9uYGNNY+SVX0wv/i76AkvPaqzvCUkEfBEPyX6h9g -d3QGhqSbk+5NXYUG2wQ9B4KyIYxu91WUT0ubEgTAUCsxqois04MMIRNqWyAUk/EA -fvhYiH/XT3m8wUNr25gDVrW8E7200K6z3p8OBJDYAtyezCE/Hnvz+hpTbeD5W1rI -N/5R7HA4R2x73vQabh7mNtzfCzZcrOr2pbYcvaL6I1kxfI4/lohGexaRd1pbi7i1 -zZcWc236NBnSmFh7Irnn5bOOZuEe5TVn2dO1x48bFTZCgxWBNZ1Sx0RXWzfYBd6Z -mQljDuXh+R7kQYgyWjs8whXrjoSjbHZSz9rp5mPpapR87f9zqn5SUkjVhobLRu9A -8BmXFuAivtLTT5rAwTBLCn+elsWcP8dBlaMqw2l9syGB3m3ZvDh3zexiAGSOE+oT -FefoT77Mfb3IxWVqNGwUH3nN7DNCeBoBo+NSQhzG6MDBljQiUkz18MRo0QARAQAB -zS5yb290IChHZW5lcmF0ZWQgMjAyMy4xMC4xMCkgPHJvb3RAbml4b3Mtdm0tMDE+ -wsFiBBMBCAAWBQIAAAAACRA3QxWuqKRG8QIbDwIZAQAAyQwQAByqKMLPsf/w7Fxs -eQpZPnbT80fjVNip4fZ1h6h3P2ZQpWkcJKtELmoj1DTdnkTXU5Xsbf3UQYemAk1O -YMCHRKSGvXgc8nksl0OSxYdHoCBfngq44dsoDpU3h6NtkVUGzYV/fTa18pF5iDPF -TWj4dzkxhSddNKY4Vk8yhtjqUpuZ1PzzJfCRTP1KTfVUAg2TKkakTkd2FAkzwmQ2 -CHFQkQPDULU98M4nrR2tdbPxWFpaybYGHWNNVoEIpDEPArl4frfeLgau+CI78p8z -89kLX63BpzhIj7WQck1XNj3kAsYfk2dO5sZjdvaYXQ8Zbr+L1jMn5lGkLzCHBn2X -n2BWIGp65cy/PieGToYEkoxH+QcakGHQ8Gl39qnkcEcamWkaFT7yrCdUzBcZxUgz -I4qUnRTsSIJyThSf2L3aluQrZEvYWAGKgwOsgTJpRmxMC+q9bKeAYejapFtLjauL -fVLdVh9KsiVxMvQUloWvoOTRskXnpp3RZdKcyivq8k4HmYiy4eEEgm3qNqepuaVO -9dpiz0DloKtrfi6TAMmb8rq0Vxdtjg5/ZwoaAm1rJhesIBWTN3RHZfDqWvpWIjFr -JVXVsCxdj3JVkgvW0JZrWfTXVLaYh7uNBxP+oX7Juo7YYH7yvqts2ACeypkdVRXb -Co7tk50WxbH9by60xRHaWoxEfPW2 -=cTXm ------END PGP PUBLIC KEY BLOCK----- \ No newline at end of file diff --git a/keys/ssh/keys.txt b/keys/ssh/keys.txt index 9c8f9b3c..bd39ae4b 100644 --- a/keys/ssh/keys.txt +++ b/keys/ssh/keys.txt @@ -11,9 +11,6 @@ ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAEAQDI7fJtiVPMYN2xJVdr84r1Vrquvo0abJQKtt1NO/F0 # (Thu Dec 28 19:55:09 AM UTC 2023) root@nuc-docker01 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHjYe++b4XbN1XOZU+Cm9iNby3Goq66EA48D7gh9AnDE root@nuc-docker01 -# (Thu Dec 28 19:55:09 AM UTC 2023) albert@nixos-vm-01 -ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFnjCBEWaHzD1OVwT0rtwh91Hb4iAdgkYnE4MKKANgE0 albert@nixos-vm-01 - # (Thu Dec 28 19:30:06 AM UTC 2023) albert@framework-server ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAODamRCvyVOGmMSMXWdUzjcM2GsApizCvXEWKHiKhGk albert@framework-server diff --git a/nixos/hosts/nixos-vm-01/default.nix b/nixos/hosts/nixos-vm-01/default.nix deleted file mode 100644 index 90a4258f..00000000 --- a/nixos/hosts/nixos-vm-01/default.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ config, lib, pkgs, modulesPath, desktop, username, ... }: { - imports = [ ]; - nixpkgs.config.allowUnfree = false; - - boot.initrd.availableKernelModules = [ "ata_piix" "ohci_pci" "ehci_pci" "ahci" "sd_mod" "sr_mod" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ ]; - boot.extraModulePackages = [ ]; - - # Testing remote builldings - users.users.${username}.openssh.authorizedKeys.keyFiles = [ ../../../keys/ssh/builder-keys.txt ]; - - # For cross-architecture builds - boot.binfmt.emulatedSystems = [ - "aarch64-linux" - "armv7l-linux" - ]; - - environment.systemPackages = with pkgs; [ - # Currently used for building the Linode image - qemu_kvm - binutils.bintools - ]; - - fileSystems."/" = { - device = "/dev/disk/by-label/ROOT"; - fsType = "ext4"; - }; - - networking.useDHCP = lib.mkDefault true; - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - virtualisation.virtualbox.guest.enable = true; - time.timeZone = "Asia/Tokyo"; - networking.hostName = "nixos-vm-01"; - - boot.loader.grub = { - enable = true; - device = "/dev/sda"; - useOSProber = true; - }; - - # Generic Tailscale configs are in /nixos/common/services/tailscale.nix - # Set up the secrets file: - sops.secrets."tailscale_keys/nixos-vm-01" = { - owner = "root"; - sopsFile = ../../../secrets/tailscale.yaml; - restartUnits = [ - "tailscaled.service" - "tailscaled-autoconnect.service" - ]; - }; - services.tailscale.authKeyFile = "/run/secrets/tailscale_keys/nixos-vm-01"; - # networking.firewall.allowedTCPPorts = [ 22 ]; -}