From 9e4ff037def6c070cb9ee4ef5bc9b48a2f5445eb Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Wed, 15 Oct 2025 09:16:29 -0500 Subject: [PATCH] Clean up some build failures --- hosts/default.nix | 1 - hosts/vm-gitlab/default.nix | 1 - hosts/vm-gitlab/hardware-configuration.nix | 2 +- hosts/vm-jellyfin/hardware-configuration.nix | 2 +- hosts/vm-matrix/default.nix | 102 ------------------- hosts/vm-matrix/hardware-configuration.nix | 40 -------- vms/default.nix | 8 +- 7 files changed, 6 insertions(+), 150 deletions(-) delete mode 100644 hosts/vm-matrix/default.nix delete mode 100644 hosts/vm-matrix/hardware-configuration.nix diff --git a/hosts/default.nix b/hosts/default.nix index 1e132df..48c145e 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -53,7 +53,6 @@ in vm-gitlab = vm { name = "vm-gitlab"; }; vm-jellyfin = vm { name = "vm-jellyfin"; }; - vm-matrix = vm { name = "vm-matrix"; }; proxmoxtemplate = unstable { name = "proxmoxtemplate"; }; iso = unstable { name = "iso"; }; diff --git a/hosts/vm-gitlab/default.nix b/hosts/vm-gitlab/default.nix index ee7e9e5..3d3b997 100644 --- a/hosts/vm-gitlab/default.nix +++ b/hosts/vm-gitlab/default.nix @@ -57,7 +57,6 @@ in backup.jobs.nas-backup = { src = "/var/gitlab/state/backup/"; dest = "gitlab"; - id = "gitlab"; }; home = true; tailscale.enable = true; diff --git a/hosts/vm-gitlab/hardware-configuration.nix b/hosts/vm-gitlab/hardware-configuration.nix index ae1216c..0c8a91c 100644 --- a/hosts/vm-gitlab/hardware-configuration.nix +++ b/hosts/vm-gitlab/hardware-configuration.nix @@ -34,7 +34,7 @@ }; fileSystems."/" = { - device = "/dev/disk/by-uuid/1fdbe86e-ce6f-4af3-a876-aec35731adab"; + device = lib.mkDefault "/dev/disk/by-uuid/1fdbe86e-ce6f-4af3-a876-aec35731adab"; fsType = "ext4"; }; diff --git a/hosts/vm-jellyfin/hardware-configuration.nix b/hosts/vm-jellyfin/hardware-configuration.nix index 1ef3394..1571b71 100644 --- a/hosts/vm-jellyfin/hardware-configuration.nix +++ b/hosts/vm-jellyfin/hardware-configuration.nix @@ -26,7 +26,7 @@ boot.extraModulePackages = [ ]; fileSystems."/" = { - device = "/dev/disk/by-uuid/507251f1-efe7-448d-8de8-91ee582a9afb"; + device = lib.mkDefault "/dev/disk/by-uuid/507251f1-efe7-448d-8de8-91ee582a9afb"; fsType = "ext4"; }; diff --git a/hosts/vm-matrix/default.nix b/hosts/vm-matrix/default.nix deleted file mode 100644 index 6acfcb0..0000000 --- a/hosts/vm-matrix/default.nix +++ /dev/null @@ -1,102 +0,0 @@ -{ pkgs, config, ... }: -let - conn = "postgresql:///dendrite?sslmode=disable&host=/run/postgresql"; -in -{ - imports = [ ./hardware-configuration.nix ]; - - environment.systemPackages = with pkgs; [ upgrade-pg-cluster ]; - - boot.loader.grub.devices = [ "/dev/disk/by-label/ESP" ]; - - greg = { - tailscale.enable = true; - }; - networking = { - hostName = "vm-matrix"; - domain = "thehellings.lan"; - firewall.allowedTCPPorts = [ config.services.dendrite.httpPort ]; - }; - - # Environment secrets - age = { - secrets.dendrite = { - file = ../../secrets/dendrite.age; - owner = "dendrite"; - }; - secrets.dendrite_key = { - file = ../../secrets/dendrite_key.age; - owner = "dendrite"; - }; - }; - users.users = { - dendrite = { - isSystemUser = true; - group = "dendrite"; - }; - }; - users.groups.dendrite = { }; - - systemd.services.dendrite.serviceConfig = { - User = "dendrite"; - }; - - greg.databases.dendrite = { }; - - services.dendrite = { - enable = true; - environmentFile = config.age.secrets.dendrite.path; - httpPort = 8448; - # Identify ourselves as the root of our own domain - settings = ( - (builtins.listToAttrs ( - map - (x: { - name = x; - value = { - database.connection_string = conn; - }; - }) - [ - "app_service_api" - "federation_api" - "key_server" - "media_api" - "mscs" - "relay_api" - "room_server" - "sync_api" - ] - )) - // { - user_api.account_database.connection_string = conn; - user_api.device_database.connection_string = conn; - global = { - database = { - connection_string = conn; - max_open_conns = 25; - max_idle_conns = 5; - conn_max_lifetime = -1; - }; - server_name = "thehellings.com"; - trusted_third_party_id_servers = [ - "matrix.org" - "vector.im" - "jupiterbroadcasting.com" - ]; - # Generate this with {path-to-dendrite}/bin/generate-keys --private-key /etc/dendrite.pem - private_key = config.age.secrets.dendrite_key.path; - }; - client_api = { - registration_disabled = true; - registration_shared_secret = "\${REGISTRATION_SHARED_SECRET}"; - }; - } - ); - }; - - systemd.services.dendrite = { - after = [ "postgresql.service" ]; - requires = [ "postgresql.service" ]; - }; -} diff --git a/hosts/vm-matrix/hardware-configuration.nix b/hosts/vm-matrix/hardware-configuration.nix deleted file mode 100644 index 81490bf..0000000 --- a/hosts/vm-matrix/hardware-configuration.nix +++ /dev/null @@ -1,40 +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. -{ lib, modulesPath, ... }: - -{ - imports = [ (modulesPath + "/profiles/qemu-guest.nix") ]; - - boot.initrd.availableKernelModules = [ - "ahci" - "xhci_pci" - "virtio_pci" - "virtio_blk" - ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-amd" ]; - boot.extraModulePackages = [ ]; - - fileSystems."/" = { - device = "/dev/disk/by-label/nixos"; - fsType = "ext4"; - }; - - fileSystems."/boot" = { - device = "systemd-1"; - fsType = "autofs"; - }; - - swapDevices = [ ]; - - # Enables DHCP on each ethernet and wireless interface. In case of scripted networking - # (the default) this is the recommended approach. When using systemd-networkd it's - # still possible to use this option, but it's recommended to use it in conjunction - # with explicit per-interface declarations with `networking.interfaces..useDHCP`. - networking.useDHCP = lib.mkDefault true; - # networking.interfaces.enp1s0.useDHCP = lib.mkDefault true; - # networking.interfaces.tailscale0.useDHCP = lib.mkDefault true; - - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; -} diff --git a/vms/default.nix b/vms/default.nix index ed201a7..478a165 100644 --- a/vms/default.nix +++ b/vms/default.nix @@ -1,6 +1,6 @@ -{ top, ... }: -with top.self.nixosConfigurations; +{ ... }: +# with top.self.nixosConfigurations; { - #jellyfin = vm-jellyfin.config.formats.proxmox; - matrix = vm-matrix.config.formats.proxmox; + # gitlab = vm-gitlab.config.formats.proxmox; + # jellyfin = vm-jellyfin.config.formats.proxmox; }