diff --git a/flake.nix b/flake.nix index 9e4d316..6f5eb75 100644 --- a/flake.nix +++ b/flake.nix @@ -108,32 +108,6 @@ ] ++ baseModules; }; - ######################### - # DO Nebula Lighthouse1 # - ######################### - WCE-Lighthouse1 = nixpkgs.lib.nixosSystem { - specialArgs = {inherit inputs;}; - modules = - [ - ./hosts/WCE-Lighthouse - "${nixpkgs}/nixos/modules/virtualisation/digital-ocean-image.nix" - { - networking.hostName = "WCE-Lighthouse1"; - sops.defaultSopsFile = inputs.nix-secrets.secrets.lighthouse1; - } - ] - ++ baseModules; - }; - }; - ############## - # Nix Darwin # - ############## - darwinConfigurations = { - tests-iMac-Pro = inputs.nix-darwin.lib.darwinSystem { - modules = [ - ./hosts/OSX-Darwin - ]; - }; }; ############ # Terranix # diff --git a/hosts/WCE-Lighthouse/default.nix b/hosts/WCE-Lighthouse/default.nix deleted file mode 100644 index b2c1eb6..0000000 --- a/hosts/WCE-Lighthouse/default.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ - lib, - config, - pkgs, - ... -}: { - imports = [ - ../../modules - ]; - - nixpkgs.hostPlatform = "x86_64-linux"; - ricing.basic.enable = false; - - user.lighthouse.enable = true; -} diff --git a/infra/wce.nix b/infra/wce.nix index a3932b7..392d0a2 100644 --- a/infra/wce.nix +++ b/infra/wce.nix @@ -43,19 +43,5 @@ days_from_hiding_to_deleting = 1; }; }; - - # "cloudflare_r2_bucket"."cache" = { - # account_id = "68c4b3ab47c1a97037ab5a938f772d69"; - # name = "wce-attic-cache"; - # storage_class = "Standard"; - # }; - - #"digitalocean_droplet"."do-wce-lighthouse1" = { - # image = "177939596"; # nixos-digitalocean - # name = "WCE-Lighthouse1"; - # region = "nyc3"; - # size = "s-1vcpu-1gb"; - # ssh_keys = ["45378200"]; - #}; }; } diff --git a/modules/options.nix b/modules/options.nix index a7da8db..457465a 100644 --- a/modules/options.nix +++ b/modules/options.nix @@ -42,9 +42,6 @@ live = { enable = lib.mkEnableOption "enable live disk user"; }; - lighthouse = { - enable = lib.mkEnableOption "enable nebula lighthouse server"; - }; }; desktop = { @@ -100,9 +97,6 @@ live = { enable = lib.mkDefault false; }; - lighthouse = { - enable = lib.mkDefault false; - }; }; # Desktop options are declared in their relevant modules in module/desktops diff --git a/modules/users/lighthouse/default.nix b/modules/users/lighthouse/default.nix deleted file mode 100644 index 0f69f56..0000000 --- a/modules/users/lighthouse/default.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ - lib, - config, - ... -}: { - imports = [ - ./user.nix - ./setup.nix - ]; -} diff --git a/modules/users/lighthouse/setup.nix b/modules/users/lighthouse/setup.nix deleted file mode 100644 index f9c9977..0000000 --- a/modules/users/lighthouse/setup.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ - lib, - inputs, - config, - ... -}: -lib.mkIf config.user.lighthouse.enable { - sops = { - age.keyFile = "/var/lib/sops-nix/key.txt"; - age.generateKey = true; - }; - - sops.secrets.cert = {}; - sops.secrets.key = {}; - - services.nebula.networks.WCE = { - inherit (inputs.nix-secrets.nebula) ca; - enable = true; - isLighthouse = true; - cert = config.sops.secrets.cert.path; - key = config.sops.secrets.key.path; - settings = { - listen = { - host = "0.0.0.0"; - port = 4242; - }; - }; - }; -} diff --git a/modules/users/lighthouse/user.nix b/modules/users/lighthouse/user.nix deleted file mode 100644 index 1c43060..0000000 --- a/modules/users/lighthouse/user.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ - inputs, - lib, - config, - ... -}: -lib.mkIf config.user.lighthouse.enable { - config.users.users.lighthouse = { - isNormalUser = true; - initialPassword = "changeme"; - extraGroups = ["wheel"]; - openssh.authorizedKeys.keyFiles = [ - inputs.nix-secrets.keys.default - ]; - }; -}