diff --git a/flake.lock b/flake.lock index 21971f6..9550776 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1648475189, - "narHash": "sha256-gAGAS6IagwoUr1B0ohE3iR6sZ8hP4LSqzYLC8Mq3WGU=", + "lastModified": 1652079807, + "narHash": "sha256-aCs1EwO9K2yJ1DcT4+4g7BMlJBWP7Xjs4k5i8ueR8PU=", "owner": "serokell", "repo": "deploy-rs", - "rev": "83e0c78291cd08cb827ba0d553ad9158ae5a95c3", + "rev": "690f698b18345d894784752b5fa93b9b8f3cc29f", "type": "github" }, "original": { @@ -198,11 +198,11 @@ "utils": "utils_2" }, "locked": { - "lastModified": 1651978388, - "narHash": "sha256-RIMWD6myYtmeP2ryPPNIMNZ5D6NpUD9chvrD8yy/1J0=", + "lastModified": 1652168810, + "narHash": "sha256-84F11nA1dixXi2wKXYNQxJuDjirXZxoz9LnWzh72Jw4=", "owner": "jyooru", "repo": "nix-minecraft-servers", - "rev": "8900142d65675c721b3a6cdbb98e4ea8d8118a71", + "rev": "346324ed142697c44cbb0f3fcfadf6e84be9281e", "type": "github" }, "original": { @@ -281,11 +281,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1652007072, - "narHash": "sha256-GXP/3f1/qYx++Ys7cnyOQuvPhIjov56QC/hGwHyL280=", + "lastModified": 1652302275, + "narHash": "sha256-OFhH+klAOesP+nhEM5icPOxfwv6MD4RB4hikewIS3yE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "52f31d531b68d92f901310ea3a48999ac182df73", + "rev": "2b6405afa8a67dc12eb0f6989e85b5d80c7d25e4", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 6614616..893eac1 100644 --- a/flake.nix +++ b/flake.nix @@ -111,8 +111,8 @@ nixfmt nixUnstable vault - (vault-push-approles self { }) - (vault-push-approle-envs self { }) + # (vault-push-approles self { }) + # (vault-push-approle-envs self { }) genTFVars ]; }; diff --git a/hosts.nix b/hosts.nix index 50ccd64..f88bd49 100644 --- a/hosts.nix +++ b/hosts.nix @@ -86,7 +86,6 @@ hostname = "plausible"; ip = "10.42.42.18"; mac = "82:34:70:FA:44:6F"; - nix = false; } { hostname = "victoriametrics"; diff --git a/nixos/hosts/plausible/configuration.nix b/nixos/hosts/plausible/configuration.nix index 999c2ef..15449c1 100644 --- a/nixos/hosts/plausible/configuration.nix +++ b/nixos/hosts/plausible/configuration.nix @@ -29,8 +29,10 @@ in vault-secrets.secrets.plausible = { }; services.plausible = { - enable = false; - releaseCookiePath = "${vs.plausible}/cookie"; + enable = true; + releaseCookiePath = "${pkgs.runCommand "cookie" { } '' + ${pkgs.openssl}/bin/openssl rand -base64 64 >"$out" + ''}"; server = { baseUrl = "https://analytics.0x76.dev"; secretKeybaseFile = "${vs.plausible}/secretkeybase"; diff --git a/nixos/pkgs/default.nix b/nixos/pkgs/default.nix index 0e944e3..67a0f13 100644 --- a/nixos/pkgs/default.nix +++ b/nixos/pkgs/default.nix @@ -1,5 +1,5 @@ final: prev: { - clickhouse = prev.callPackage ./clickhouse { }; + # clickhouse = prev.callPackage ./clickhouse { }; v = { unbound = prev.unbound.override {