From c6d50aebc5e8b6f26e100571e9479a46f3bbc042 Mon Sep 17 00:00:00 2001 From: "RingOfStorms (Joshua Bell)" Date: Tue, 26 Nov 2024 19:52:29 -0600 Subject: [PATCH] pull from remote for stormd --- flake.lock | 20 ++++++++++---------- flake.nix | 2 ++ modules/stormd.nix | 11 ++++++----- 3 files changed, 18 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 5de4143..9263df6 100644 --- a/flake.lock +++ b/flake.lock @@ -368,11 +368,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1724819573, - "narHash": "sha256-GnR7/ibgIH1vhoy8cYdmXE6iyZqKqFxQSVkFgosBh6w=", + "lastModified": 1728888510, + "narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "71e91c409d1e654808b2621f28a327acfdad8dc2", + "rev": "a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c", "type": "github" }, "original": { @@ -1438,11 +1438,11 @@ "rust-overlay": "rust-overlay_4" }, "locked": { - "lastModified": 1728895723, - "narHash": "sha256-4fnIovUKtPdzb0FxTTxPa2XY/OyHmh2O30LaoWpm7OQ=", + "lastModified": 1732672287, + "narHash": "sha256-JdcYW3Mx0zWU7xMazQOq2jjChHbLt67k3Sx7Izujrzo=", "ref": "refs/heads/master", - "rev": "14cc763f75a3cd3af2a5efbf4cf98ba8a407cd8f", - "revCount": 39, + "rev": "7ffe560c5e2aa79eda3b714fd0d82a51c8cd4f95", + "revCount": 43, "type": "git", "url": "ssh://git.joshuabell.xyz:3032/stormd" }, @@ -1540,11 +1540,11 @@ ] }, "locked": { - "lastModified": 1718849885, - "narHash": "sha256-Qfc5HKpQvGhWXox0WJVzLqrAcFm3uy6xtWRvVmrkLYc=", + "lastModified": 1729218602, + "narHash": "sha256-KDmYxpkFWa0Go0WnOpkgQOypVaQxbwgpEutET5ey1VQ=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "bc1a236757cd5f6622f73838e551fb2035afa44a", + "rev": "9051466c82b9b3a6ba9e06be99621ad25423ec94", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 8e88138..8eeab5e 100644 --- a/flake.nix +++ b/flake.nix @@ -44,6 +44,8 @@ }; ringofstorms-stormd = { url = "git+ssh://git.joshuabell.xyz:3032/stormd"; + # Local path usage for testing changes locally + # url = "path:/home/josh/projects/stormd"; }; cosmic = { diff --git a/modules/stormd.nix b/modules/stormd.nix index 1962db0..9dc6803 100644 --- a/modules/stormd.nix +++ b/modules/stormd.nix @@ -15,20 +15,21 @@ in options = { mods.${name} = { enable = mkEnableOption (lib.mdDoc "Enable ${name}"); + debug = mkOption { + type = types.bool; + default = false; + description = lib.mdDoc "Whether to enable debug logging for stormd daemon."; + }; }; }; imports = [ ringofstorms-stormd.nixosModules.${settings.system.system} ]; config = mkIf cfg.enable { - environment.systemPackages = [ - ringofstorms-stormd.packages.${settings.system.system}.stormd - ]; - services.stormd = { enable = true; nebulaPackage = pkgs.nebula; - # extraOptions = [ "-v" ]; + extraOptions = mkIf cfg.debug [ "-v" ]; }; }; }