diff --git a/flake.nix b/flake.nix index b4fd928..7a9de58 100644 --- a/flake.nix +++ b/flake.nix @@ -47,34 +47,10 @@ in { nixosModules = aspect.modules; nixosConfigurations = lib.genAttrs [ - "styx" - "meet" - "git" "VEGAS" ] mkNixOS; deploy.nodes = with deploy-rs-lib; { - styx = { - hostname = "styx.services.privatevoid.net"; - profiles.system = { - user = "root"; - path = activate.nixos self.nixosConfigurations.styx; - }; - }; - meet = { - hostname = "meet.services.privatevoid.net"; - profiles.system = { - user = "root"; - path = activate.nixos self.nixosConfigurations.meet; - }; - }; - git = { - hostname = "git.services.privatevoid.net"; - profiles.system = { - user = "root"; - path = activate.nixos self.nixosConfigurations.git; - }; - }; VEGAS = { hostname = "vegas.backbone.privatevoid.net"; profiles.system = { diff --git a/hosts/default.nix b/hosts/default.nix index d46cc5c..67bc32d 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -3,9 +3,6 @@ let in with tools.dns; { # NixOS machines - styx = import ./styx tools; - meet = import ./meet tools; - git = import ./git tools; VEGAS = import ./VEGAS tools; # Non-NixOS machine metadata diff --git a/hosts/git/default.nix b/hosts/git/default.nix deleted file mode 100644 index e2a9847..0000000 --- a/hosts/git/default.nix +++ /dev/null @@ -1,7 +0,0 @@ -tools: { - ssh.id = with tools.dns; { - publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC0rChVEO9Qt7hr7vyiyOP7N45CjaxssFCZNOPCszEQi"; - hostNames = subResolve "git" "services"; - }; - nixos = import ./system.nix; -} diff --git a/hosts/git/system.nix b/hosts/git/system.nix deleted file mode 100644 index 4b0e866..0000000 --- a/hosts/git/system.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ config, pkgs, lib, modulesPath, aspect, inputs, ... }: -{ - imports = [ - (modulesPath + "/virtualisation/lxc-container.nix") - inputs.agenix.nixosModules.age - ] - ++ (import ../../users "server").groups.admin - ++ aspect.sets.server - ++ (with aspect.modules; [ ]); - - age.secrets = { - giteaDBPassword = { - file = ../../secrets/gitea-db-credentials.age; - owner = "git"; - group = "gitea"; - mode = "0400"; - }; - }; - - networking.hostName = "git"; - networking.firewall.enable = false; - - nix.trustedUsers = [ "root" "@wheel" ]; - - security.sudo.wheelNeedsPassword = false; - - services.gitea = { - enable = true; - appName = "Private Void Gitea"; - domain = "git"; - rootUrl = "https://git.privatevoid.net"; - disableRegistration = true; - ssh.enable = true; - user = "git"; - log.level = "Warn"; - - database = { - createDatabase = false; - type = "postgres"; - host = "10.1.0.1"; - port = 5432; - name = "gitea"; - user = "gitea"; - passwordFile = config.age.secrets.giteaDBPassword.path; - }; - }; - - users.users.git = { - description = "Git Service"; - home = config.services.gitea.stateDir; - useDefaultShell = true; - group = "gitea"; - isSystemUser = true; - }; -} diff --git a/hosts/meet/default.nix b/hosts/meet/default.nix deleted file mode 100644 index a5b14a8..0000000 --- a/hosts/meet/default.nix +++ /dev/null @@ -1,7 +0,0 @@ -tools: { - ssh.id = with tools.dns; { - publicKey = "ssh-invalid"; - hostNames = subResolve "meet" "services"; - }; - nixos = import ./system.nix; -} diff --git a/hosts/meet/system.nix b/hosts/meet/system.nix deleted file mode 100644 index f15ca8d..0000000 --- a/hosts/meet/system.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ config, pkgs, modulesPath, aspect, inputs, ... }: -{ - imports = [ - (modulesPath + "/virtualisation/lxc-container.nix") - inputs.agenix.nixosModules.age - ] - ++ (import ../../users "server").groups.admin - ++ aspect.sets.server - ++ (with aspect.modules; [ ]); - - networking.hostName = "meet"; - networking.firewall.enable = false; - - nix.trustedUsers = [ "root" "@wheel" ]; - - security.sudo.wheelNeedsPassword = false; - - services.jitsi-meet = { - enable = true; - hostName = "meet.privatevoid.net"; - nginx.enable = true; - jicofo.enable = true; - videobridge.enable = true; - prosody.enable = true; - config.p2p.enabled = false; - }; - services.jitsi-videobridge = { - nat.publicAddress = "95.216.8.12"; - nat.localAddress = "10.10.1.204"; - }; - services.nginx.virtualHosts."meet.privatevoid.net" = { - enableACME = false; - forceSSL = false; - locations."=/images/watermark.svg" = { - return = "200"; - }; - }; - environment.noXlibs = false; -} diff --git a/hosts/styx/default.nix b/hosts/styx/default.nix deleted file mode 100644 index d2db883..0000000 --- a/hosts/styx/default.nix +++ /dev/null @@ -1,7 +0,0 @@ -tools: { - ssh.id = with tools.dns; { - publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOYLrmiuPK77cw71QNzG2zaWs6gsxmYuLyqsUrWMYLnk"; - hostNames = subResolve "styx" "services"; - }; - nixos = import ./system.nix; -} diff --git a/hosts/styx/system.nix b/hosts/styx/system.nix deleted file mode 100644 index 4955733..0000000 --- a/hosts/styx/system.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ config, pkgs, modulesPath, aspect, inputs, ... }: -{ - imports = [ - (modulesPath + "/virtualisation/lxc-container.nix") - inputs.agenix.nixosModules.age - ] - ++ (import ../../users "server").groups.admin - ++ aspect.sets.server - ++ (with aspect.modules; [ hydra ]); - - networking.hostName = "styx"; - networking.firewall.enable = false; - - nix.trustedUsers = [ "root" "@wheel" ]; - - security.sudo.wheelNeedsPassword = false; -}