diff --git a/flake.lock b/flake.lock index 466332d..fcdebab 100644 --- a/flake.lock +++ b/flake.lock @@ -1251,11 +1251,11 @@ "rust-overlay": "rust-overlay_4" }, "locked": { - "lastModified": 1728889741, - "narHash": "sha256-EbgfN3lQc8nkg2SrVL/HkuNZjXlJ5HSsCejvBNFIisI=", + "lastModified": 1728895723, + "narHash": "sha256-4fnIovUKtPdzb0FxTTxPa2XY/OyHmh2O30LaoWpm7OQ=", "ref": "refs/heads/master", - "rev": "613a70c6f514c463f456cf7a4d750f9895bb0dee", - "revCount": 34, + "rev": "14cc763f75a3cd3af2a5efbf4cf98ba8a407cd8f", + "revCount": 39, "type": "git", "url": "ssh://git.joshuabell.xyz:3032/stormd" }, diff --git a/hosts/lio/configuration.nix b/hosts/lio/configuration.nix index 6711557..e3dd2a4 100644 --- a/hosts/lio/configuration.nix +++ b/hosts/lio/configuration.nix @@ -20,9 +20,9 @@ tty_caps_esc.enable = true; docker.enable = true; fonts.enable = true; - # nebula.enable = true; ssh.enable = true; - stormd.enable = true; # TODO figure out why this is failing + stormd.enable = true; + nebula.enable = true; }; # machine specific configuration diff --git a/modules/nebula.nix b/modules/nebula.nix index ff59673..1e78696 100644 --- a/modules/nebula.nix +++ b/modules/nebula.nix @@ -13,6 +13,13 @@ in options = { mods.${name} = { enable = mkEnableOption (lib.mdDoc "Enable ${name}"); + preflight = mkOption { + type = types.bool; + default = false; + description = '' + Does not enable the service since we're in preflight mode. + ''; + }; }; }; @@ -24,7 +31,7 @@ in networking.firewall.allowedUDPPorts = [ 4242 ]; - systemd.services."nebula" = { + systemd.services."nebula" = mkIf (!cfg.preflight) { description = "Nebula VPN service"; wants = [ "basic.target" ]; after = [ diff --git a/modules/stormd.nix b/modules/stormd.nix index e52662e..315504d 100644 --- a/modules/stormd.nix +++ b/modules/stormd.nix @@ -1,6 +1,7 @@ { config, lib, + pkgs, ringofstorms-stormd, settings, ... @@ -20,7 +21,10 @@ in imports = [ ringofstorms-stormd.nixosModules.${settings.system.system} ]; config = mkIf cfg.enable { - users.users.root.packages = [ ringofstorms-stormd.packages.${settings.system.system}.stormd ]; - services.stormd.enable = true; + services.stormd = { + enable = true; + nebulaPackage = pkgs.nebula; + extraOptions = [ "-v" ]; + }; }; }