diff --git a/common/network/hosts.nix b/common/network/hosts.nix index 80d439e..2c7300a 100644 --- a/common/network/hosts.nix +++ b/common/network/hosts.nix @@ -36,14 +36,6 @@ in { keepalive-ping.hosts = attrNames zerotierHosts; programs.ssh.knownHosts = { - liza = { - hostNames = [ "liza" "mail.neet.dev" ]; - publicKey = system.liza; - }; - liza-unlock = { - hostNames = [ unlock-onion-hosts.liza ]; - publicKey = system.liza-unlock; - }; ponyo = { hostNames = [ "ponyo" "ponyo.neet.dev" "ponyo.zt.neet.dev" "git.neet.dev" ]; publicKey = system.ponyo; diff --git a/common/ssh.nix b/common/ssh.nix index 7ea9420..8ace660 100644 --- a/common/ssh.nix +++ b/common/ssh.nix @@ -6,8 +6,6 @@ rec { "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFeTK1iARlNIKP/DS8/ObBm9yUM/3L1Ub4XI5A2r9OzP" # ray ] ++ higherTrustUserKeys; system = { - liza = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDY/pNyWedEfU7Tq9ikGbriRuF1ZWkHhegGS17L0Vcdl"; - liza-unlock = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJ6eMKW7jBNUKm2r9zEoape4s3KVrmLTLC0nkW9t/8JK"; ponyo = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMBBlTAIp38RhErU1wNNV5MBeb+WGH0mhF/dxh5RsAXN"; ponyo-unlock = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC9LQuuImgWlkjDhEEIbM1wOd+HqRv1RxvYZuLXPSdRi"; ray = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDQM8hwKRgl8cZj7UVYATSLYu4LhG7I0WFJ9m2iWowiB"; @@ -23,7 +21,6 @@ rec { # groups systems = with system; [ - liza ponyo ray router @@ -33,7 +30,6 @@ rec { ray ]; servers = with system; [ - liza ponyo router s0 diff --git a/flake.nix b/flake.nix index 58b65f8..4173534 100644 --- a/flake.nix +++ b/flake.nix @@ -89,7 +89,6 @@ { "ray" = mkSystem "x86_64-linux" nixpkgs ./machines/ray/configuration.nix; # "nat" = mkSystem "aarch64-linux" nixpkgs ./machines/nat/configuration.nix; - "liza" = mkSystem "x86_64-linux" nixpkgs ./machines/liza/configuration.nix; "ponyo" = mkSystem "x86_64-linux" nixpkgs ./machines/ponyo/configuration.nix; "router" = mkSystem "x86_64-linux" nixpkgs ./machines/router/configuration.nix; "s0" = mkSystem "x86_64-linux" nixpkgs ./machines/storage/s0/configuration.nix; diff --git a/machines/liza/configuration.nix b/machines/liza/configuration.nix deleted file mode 100644 index 5f6294e..0000000 --- a/machines/liza/configuration.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ config, pkgs, lib, ... }: - -{ - imports =[ - ./hardware-configuration.nix - ]; - - system.autoUpgrade.enable = true; - - networking.hostName = "liza"; - - networking.interfaces.enp1s0.useDHCP = true; -} diff --git a/machines/liza/hardware-configuration.nix b/machines/liza/hardware-configuration.nix deleted file mode 100644 index 85c0eda..0000000 --- a/machines/liza/hardware-configuration.nix +++ /dev/null @@ -1,46 +0,0 @@ -# Do not modify this file! It was generated by ‘nixos-generate-config’ -# and may be overwritten by future invocations. Please make changes -# to /etc/nixos/configuration.nix instead. -{ config, lib, pkgs, modulesPath, ... }: - -{ - imports = - [ (modulesPath + "/profiles/qemu-guest.nix") - ]; - - boot.initrd.availableKernelModules = [ "ata_piix" "virtio_pci" "floppy" "sr_mod" "virtio_blk" ]; - boot.initrd.kernelModules = [ "dm-snapshot" ]; - boot.kernelModules = [ ]; - boot.extraModulePackages = [ ]; - - firmware.x86_64.enable = true; - - bios = { - enable = true; - device = "/dev/sda"; - }; - - remoteLuksUnlock.enable = true; - boot.initrd.luks.devices."enc-pv".device = "/dev/disk/by-uuid/2f736fba-8a0c-4fb5-8041-c849fb5e1297"; - - fileSystems."/" = - { device = "/dev/disk/by-uuid/b90eaf3c-2f91-499a-a066-861e0f4478df"; - fsType = "btrfs"; - }; - - fileSystems."/home" = - { device = "/dev/disk/by-uuid/b90eaf3c-2f91-499a-a066-861e0f4478df"; - fsType = "btrfs"; - options = [ "subvol=home" ]; - }; - - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/2b8f6f6d-9358-4d30-8341-7426574e0819"; - fsType = "ext3"; - }; - - swapDevices = - [ { device = "/dev/disk/by-uuid/ef7a83db-4b33-41d1-85fc-cff69e480352"; } - ]; - -} \ No newline at end of file