diff --git a/common/ssh.nix b/common/ssh.nix index e88dd74..7ce38a6 100644 --- a/common/ssh.nix +++ b/common/ssh.nix @@ -8,7 +8,6 @@ rec { ]; system = { liza = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDY/pNyWedEfU7Tq9ikGbriRuF1ZWkHhegGS17L0Vcdl"; - mitty = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJE2oSon3hKFqdDbfWXjc72trCWsdi16eEppeXkKRTEn"; ray = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKboRF1Nz/bTPs4VB2QcTAIvWER0nlp6E/iG6/B1IzwF"; }; systems = [ system.liza system.mitty system.ray ]; diff --git a/flake.nix b/flake.nix index 7562c29..1f7d7aa 100644 --- a/flake.nix +++ b/flake.nix @@ -48,7 +48,6 @@ "reg" = mkSystem "x86_64-linux" nixpkgs ./machines/reg/configuration.nix; "ray" = mkSystem "x86_64-linux" nixpkgs ./machines/ray/configuration.nix; "nat" = mkSystem "aarch64-linux" nixpkgs ./machines/nat/configuration.nix; - "mitty" = mkSystem "x86_64-linux" nixpkgs ./machines/mitty/configuration.nix; "neetdev" = mkSystem "x86_64-linux" nixpkgs ./machines/neet.dev/configuration.nix; "liza" = mkSystem "x86_64-linux" nixpkgs-peertube ./machines/liza/configuration.nix; "s0" = mkSystem "aarch64-linux" nixpkgs ./machines/storage/s0/configuration.nix; diff --git a/machines/mitty/configuration.nix b/machines/mitty/configuration.nix deleted file mode 100644 index bade029..0000000 --- a/machines/mitty/configuration.nix +++ /dev/null @@ -1,130 +0,0 @@ -{ config, pkgs, lib, ... }: - -{ - imports =[ - ./hardware-configuration.nix - ]; - - # cuxhh3ei2djpgf2zdkboceuhaxavgr3ipu3d7a2swx4giy2wosfxspyd.onion - - nix.flakes.enable = true; - - firmware.x86_64.enable = true; - bios = { - enable = true; - device = "/dev/vda"; - }; - - luks = { - enable = true; - device.path = "/dev/disk/by-uuid/6dcf23ea-cb5e-4329-a88b-832209918c40"; - }; - - networking.hostName = "mitty"; - - networking.interfaces.ens3.useDHCP = true; - - services.nginx.enable = true; - - containers.jellyfin = { - ephemeral = true; - autoStart = true; - bindMounts = { - "/var/lib" = { - hostPath = "/var/lib/"; - isReadOnly = false; - }; - }; - bindMounts = { - "/run/secrets" = { - hostPath = "/run/secrets"; - isReadOnly = true; - }; - }; - enableTun = true; - privateNetwork = true; - hostAddress = "172.16.100.1"; - localAddress = "172.16.100.2"; - config = { - imports = [ - ../../common/common.nix - config.inputs.agenix.nixosModules.age - ]; - - # because nixos specialArgs doesn't work for containers... need to pass in inputs a different way - options.inputs = lib.mkOption { default = config.inputs; }; - options.currentSystem = lib.mkOption { default = config.currentSystem; }; - - config = { - pia.enable = true; - nixpkgs.pkgs = pkgs; - - services.radarr.enable = true; - services.radarr.openFirewall = true; - services.bazarr.enable = true; - services.bazarr.openFirewall = true; - services.sonarr.enable = true; - services.sonarr.openFirewall = true; - services.jackett.enable = true; - services.jackett.openFirewall = true; - services.jellyfin.enable = true; - services.jellyfin.openFirewall = true; - services.deluge.enable = true; - services.deluge.web.enable = true; - services.deluge.web.openFirewall = true; - }; - }; - }; - - services.nginx.virtualHosts."radarr.neet.cloud" = { - enableACME = true; - forceSSL = true; - locations."/" = { - proxyPass = "http://172.16.100.2:7878"; - }; - }; - services.nginx.virtualHosts."sonarr.neet.cloud" = { - enableACME = true; - forceSSL = true; - locations."/" = { - proxyPass = "http://172.16.100.2:8989"; - }; - }; - services.nginx.virtualHosts."bazarr.neet.cloud" = { - enableACME = true; - forceSSL = true; - locations."/" = { - proxyPass = "http://172.16.100.2:6767"; - }; - }; - services.nginx.virtualHosts."jellyfin.neet.cloud" = { - enableACME = true; - forceSSL = true; - locations."/" = { - proxyPass = "http://172.16.100.2:8096"; - }; - }; - services.nginx.virtualHosts."deluge.neet.cloud" = { - enableACME = true; - forceSSL = true; - locations."/" = { - proxyPass = "http://172.16.100.2:8112"; - }; - }; - services.nginx.virtualHosts."jackett.neet.cloud" = { - enableACME = true; - forceSSL = true; - locations."/" = { - proxyPass = "http://172.16.100.2:9117"; - }; - }; - # load the secret on behalf of the container - age.secrets."pia-login.conf".file = ../../secrets/pia-login.conf; - - networking.nat.enable = true; - networking.nat.internalInterfaces = [ "ve-jellyfin" ]; - networking.nat.externalInterface = "ens3"; - - security.acme.acceptTerms = true; - security.acme.email = "letsencrypt+5@tar.ninja"; -} diff --git a/machines/mitty/hardware-configuration.nix b/machines/mitty/hardware-configuration.nix deleted file mode 100644 index be190e9..0000000 --- a/machines/mitty/hardware-configuration.nix +++ /dev/null @@ -1,37 +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" "uhci_hcd" "virtio_pci" "sr_mod" "virtio_blk" ]; - boot.initrd.kernelModules = [ "dm-snapshot" ]; - boot.kernelModules = [ ]; - boot.extraModulePackages = [ ]; - - fileSystems."/" = - { device = "/dev/mapper/vg-root"; - fsType = "btrfs"; - options = [ "subvol=root" ]; - }; - - fileSystems."/home" = - { device = "/dev/mapper/vg-root"; - fsType = "btrfs"; - options = [ "subvol=home" ]; - }; - - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/78f9b9a3-40f6-4c6c-a599-5d5067ffa214"; - fsType = "ext3"; - }; - - swapDevices = - [ { device = "/dev/disk/by-uuid/26252a81-8a98-45d0-8507-494ecb3901e7"; } - ]; - -} \ No newline at end of file