From b842acbf5362e0f9bfc28a6b3d6233b1bcd702fe Mon Sep 17 00:00:00 2001 From: Henry-Hiles Date: Wed, 4 Mar 2026 22:40:01 -0500 Subject: [PATCH] remove nova --- clients/nova/ava.nix | 16 -------- clients/nova/hardware-configuration.nix | 38 ------------------ clients/nova/matrix/continuwuity.nix | 10 ----- clients/nova/matrix/zulip.nix | 51 ------------------------- clients/nova/unlock-ssh-initrd.nix | 20 ---------- flake.nix | 4 -- modules/common/nh.nix | 1 - modules/graphical/ssh.nix | 2 - 8 files changed, 142 deletions(-) delete mode 100644 clients/nova/ava.nix delete mode 100644 clients/nova/hardware-configuration.nix delete mode 100644 clients/nova/matrix/continuwuity.nix delete mode 100644 clients/nova/matrix/zulip.nix delete mode 100644 clients/nova/unlock-ssh-initrd.nix diff --git a/clients/nova/ava.nix b/clients/nova/ava.nix deleted file mode 100644 index bfbc569..0000000 --- a/clients/nova/ava.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ config, lib, ... }: -{ - users = { - mutableUsers = lib.mkForce true; - users.ava = { - isNormalUser = true; - openssh.authorizedKeys.keys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIcXzWUeVwJN7iPxMT/1lhJySY4t6Z2/fH/GHVuzQFr6 cardno:32_241_564" - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINBnstd9HyyIjfXWfGymWDcRlK9nZuqgTIcueiqPUDaQ star@starforge" - ]; - hashedPasswordFile = config.age.secrets."initialFloriPassword.age".path; - description = "Flori Ava Star"; - extraGroups = [ "wheel" ]; - }; - }; -} diff --git a/clients/nova/hardware-configuration.nix b/clients/nova/hardware-configuration.nix deleted file mode 100644 index 4064169..0000000 --- a/clients/nova/hardware-configuration.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ modulesPath, ... }: -{ - imports = [ (modulesPath + "/profiles/qemu-guest.nix") ]; - - boot = { - initrd.luks.devices."luks-ef228969-52cc-4238-b90f-9d97d625bba6".device = - "/dev/disk/by-uuid/ef228969-52cc-4238-b90f-9d97d625bba6"; - kernelParams = [ "ip=dhcp" ]; - initrd.availableKernelModules = [ - "sr_mod" - "ata_piix" - "uhci_hcd" - "virtio_pci" - "virtio_net" - "virtio_blk" - ]; - }; - - fileSystems = { - "/" = { - device = "/dev/disk/by-uuid/3c343e41-ca80-413f-a48c-af513bb28f5c"; - fsType = "btrfs"; - options = [ "subvol=@" ]; - }; - "/boot" = { - device = "/dev/disk/by-uuid/9300-4D1C"; - fsType = "vfat"; - options = [ - "fmask=0077" - "dmask=0077" - ]; - }; - }; - - swapDevices = [ - { device = "/dev/disk/by-uuid/c0c9de6f-9990-4346-b774-5f315b5ea115"; } - ]; -} diff --git a/clients/nova/matrix/continuwuity.nix b/clients/nova/matrix/continuwuity.nix deleted file mode 100644 index 20bc9bc..0000000 --- a/clients/nova/matrix/continuwuity.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ - quad.matrix = { - enable = true; - domain = "polyphony.chat"; - settings.well_known = { - support_email = "info@polyphony.chat"; - support_mxid = null; - }; - }; -} diff --git a/clients/nova/matrix/zulip.nix b/clients/nova/matrix/zulip.nix deleted file mode 100644 index 042e7e1..0000000 --- a/clients/nova/matrix/zulip.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ - lib, - pkgs, - config, - ... -}: -{ - systemd.services.matrix-zulip-bridge = { - description = "matrix-zulip-bridge server"; - wantedBy = [ "multi-user.target" ]; - wants = [ "network-online.target" ]; - after = [ "network-online.target" ]; - - serviceConfig = - let - secretName = "matrix-zulip-bridge-secrets"; - in - { - LoadCredential = [ - "${secretName}:${config.age.secrets."zulipRegistration.age".path}" - ]; - ExecStart = "${lib.getExe pkgs.matrix-zulip-bridge} --config /run/credentials/matrix-zulip-bridge.service/${secretName} --owner @quadradical:${config.quad.matrix.domain} ${config.services.matrix-continuwuity.settings.global.well_known.client}"; - DynamicUser = true; - LockPersonality = true; - MemoryDenyWriteExecute = true; - ProtectClock = true; - ProtectControlGroups = true; - ProtectHostname = true; - ProtectKernelLogs = true; - ProtectKernelModules = true; - ProtectKernelTunables = true; - PrivateDevices = true; - PrivateMounts = true; - RestrictAddressFamilies = [ - "AF_INET" - "AF_INET6" - ]; - RestrictNamespaces = true; - RestrictRealtime = true; - ProtectHome = true; - SystemCallArchitectures = "native"; - SystemCallFilter = [ - "@system-service" - "~@privileged" - "~@resources" - ]; - Restart = "always"; - RestartSec = 5; - }; - }; -} diff --git a/clients/nova/unlock-ssh-initrd.nix b/clients/nova/unlock-ssh-initrd.nix deleted file mode 100644 index 716edad..0000000 --- a/clients/nova/unlock-ssh-initrd.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ config, ... }: -{ - fileSystems."/".options = [ "x-systemd.device-timeout=0" ]; - networking.firewall.allowedTCPPorts = [ 222 ]; - boot = { - loader.grub.enable = false; - initrd = { - systemd = { - enable = true; - users.root.shell = "/bin/systemd-tty-ask-password-agent"; - }; - network.ssh = { - enable = true; - port = 222; - hostKeys = [ "/etc/ssh/ssh_host_ed25519_key_initrd" ]; - authorizedKeys = config.users.users.ava.openssh.authorizedKeys.keys; - }; - }; - }; -} diff --git a/flake.nix b/flake.nix index 1458f30..4f4e24e 100755 --- a/flake.nix +++ b/flake.nix @@ -160,10 +160,6 @@ type = "server"; graphical = false; }; - "nova" = { - type = "server"; - graphical = false; - }; "quadphone" = { type = "mobile"; system = "aarch64-linux"; diff --git a/modules/common/nh.nix b/modules/common/nh.nix index 0806a3c..19f4014 100644 --- a/modules/common/nh.nix +++ b/modules/common/nh.nix @@ -15,6 +15,5 @@ upgrade = "nh os switch --update"; rebuild = "nh os switch"; rebuild-server = build + "quadraticserver --target-host server"; - rebuild-nova = build + "nova --target-host nova"; }; } diff --git a/modules/graphical/ssh.nix b/modules/graphical/ssh.nix index 9f72574..d9c6b69 100644 --- a/modules/graphical/ssh.nix +++ b/modules/graphical/ssh.nix @@ -3,8 +3,6 @@ Host server HostName ssh.federated.nexus Port 2222 - Host nova - HostName nova.bitfl0wer.de Host phone HostName 172.16.42.1 '';