From 7982b08810e80911f011d278639be2bb8ca14823 Mon Sep 17 00:00:00 2001 From: noe Date: Wed, 5 Jun 2024 19:29:02 -0400 Subject: [PATCH] update flake.lock --- .sops.yaml | 6 +- flake.lock | 60 +++++++------------ flake.nix | 2 +- .../{owncast => live-doll-repair}/.target | 0 .../{owncast => live-doll-repair}/default.nix | 8 +-- 5 files changed, 27 insertions(+), 49 deletions(-) rename nixos/hosts/{owncast => live-doll-repair}/.target (100%) rename nixos/hosts/{owncast => live-doll-repair}/default.nix (61%) diff --git a/.sops.yaml b/.sops.yaml index a59291e..216621c 100644 --- a/.sops.yaml +++ b/.sops.yaml @@ -17,7 +17,7 @@ keys: &all - &m_ts3 age12f24j7fcq46cjuqjftv5pyffpunyhqj98ypqf729z89xzunzryts5d8kl0 - &m_pihole age1jc4a52cukf6d94tt2meq8tnt084rhtdd93hwzjhzecc70rmvvapqtdng8v - &m_static-sites age1s4hzwj982zk04kr7c5u0vlemkzalv72wtkttkgzt64xv8a4r25zqxra6u0 - - &m_owncast age15sqq6667xle2fk0vh0yy6qu0extnwxy9tl0pal5wrrcwsqeztf4qa47wtf + - &m_live-doll-repair age15sqq6667xle2fk0vh0yy6qu0extnwxy9tl0pal5wrrcwsqeztf4qa47wtf creation_rules: - path_regex: secrets/[^/]+\.(yaml|json|env|ini)$ @@ -128,10 +128,10 @@ creation_rules: - *op_noe_2 - *op_noe_3 - *m_static-sites - - path_regex: secrets/owncast/[^/]+\.(yaml|json|env|ini)$ + - path_regex: secrets/live-doll-repair/[^/]+\.(yaml|json|env|ini)$ key_groups: - age: - *op_noe - *op_noe_2 - *op_noe_3 - - *m_owncast + - *m_live-doll-repair diff --git a/flake.lock b/flake.lock index 63d42a8..5c5c87f 100644 --- a/flake.lock +++ b/flake.lock @@ -223,21 +223,6 @@ "type": "github" } }, - "flake-root": { - "locked": { - "lastModified": 1713493429, - "narHash": "sha256-ztz8JQkI08tjKnsTpfLqzWoKFQF4JGu2LRz8bkdnYUk=", - "owner": "srid", - "repo": "flake-root", - "rev": "bc748b93b86ee76e2032eecda33440ceb2532fcd", - "type": "github" - }, - "original": { - "owner": "srid", - "repo": "flake-root", - "type": "github" - } - }, "flake-utils": { "inputs": { "systems": "systems" @@ -330,11 +315,11 @@ ] }, "locked": { - "lastModified": 1717316182, - "narHash": "sha256-Xi0EpZcu39N0eW7apLjFfUOR9y80toyjYizez7J1wMI=", + "lastModified": 1717525419, + "narHash": "sha256-5z2422pzWnPXHgq2ms8lcCfttM0dz+hg+x1pCcNkAws=", "owner": "nix-community", "repo": "home-manager", - "rev": "9b53a10f4c91892f5af87cf55d08fba59ca086af", + "rev": "a7117efb3725e6197dd95424136f79147aa35e5b", "type": "github" }, "original": { @@ -557,11 +542,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1717159533, - "narHash": "sha256-oamiKNfr2MS6yH64rUn99mIZjc45nGJlj9eGth/3Xuw=", + "lastModified": 1717530100, + "narHash": "sha256-b4Dn+PnrZoVZ/BoR9JN2fTxXxplJrAsdSUIePf4Cacs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446", + "rev": "a2e1d0414259a144ebdc048408a807e69e0565af", "type": "github" }, "original": { @@ -589,11 +574,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1716948383, - "narHash": "sha256-SzDKxseEcHR5KzPXLwsemyTR/kaM9whxeiJohbL04rs=", + "lastModified": 1717196966, + "narHash": "sha256-yZKhxVIKd2lsbOqYd5iDoUIwsRZFqE87smE2Vzf6Ck0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ad57eef4ef0659193044870c731987a6df5cf56b", + "rev": "57610d2f8f0937f39dbd72251e9614b1561942d8", "type": "github" }, "original": { @@ -637,11 +622,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1716948383, - "narHash": "sha256-SzDKxseEcHR5KzPXLwsemyTR/kaM9whxeiJohbL04rs=", + "lastModified": 1717196966, + "narHash": "sha256-yZKhxVIKd2lsbOqYd5iDoUIwsRZFqE87smE2Vzf6Ck0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ad57eef4ef0659193044870c731987a6df5cf56b", + "rev": "57610d2f8f0937f39dbd72251e9614b1561942d8", "type": "github" }, "original": { @@ -672,7 +657,6 @@ "devshell": "devshell", "flake-compat": "flake-compat_2", "flake-parts": "flake-parts_2", - "flake-root": "flake-root", "git-hooks": "git-hooks", "home-manager": "home-manager_2", "nix-darwin": "nix-darwin", @@ -682,11 +666,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1717365043, - "narHash": "sha256-YsNm5XSo/HAZvd+H2Qjd+dgBfxbtQ4gADkjGvD+cLqs=", + "lastModified": 1717607611, + "narHash": "sha256-lpyXoLb/DhbPNl59wc64NWX4ZySfqDFiXtYaRgPb5ho=", "owner": "nix-community", "repo": "nixvim", - "rev": "513b3c76e23e730eb30ec533666551c13477bd70", + "rev": "f530700ccd2955ceb620cd12fc1f5b04d2c752f4", "type": "github" }, "original": { @@ -703,11 +687,11 @@ ] }, "locked": { - "lastModified": 1717359886, - "narHash": "sha256-gBnTh7Is9Rl86V7S6IBPzbeDSKbQseFkL16fJEtTEuw=", + "lastModified": 1717630088, + "narHash": "sha256-+Wy9SavuXcQBqVYSQgsxHS3ZM1tUgQlL4TJOadcxmbM=", "ref": "refs/heads/main", - "rev": "8c54e7b8377b842a954f54b978c096643172ba2d", - "revCount": 55, + "rev": "39752345820f81d543c3c8cd143149156c05dfb1", + "revCount": 56, "type": "git", "url": "https://git.sapphic.engineer/noe/noe.sh" }, @@ -787,11 +771,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1717297459, - "narHash": "sha256-cZC2f68w5UrJ1f+2NWGV9Gx0dEYmxwomWN2B0lx0QRA=", + "lastModified": 1717455931, + "narHash": "sha256-8Q6mKSsto8gaGczXd4G0lvawdAYLa5Dlh3/g4hl5CaM=", "owner": "Mic92", "repo": "sops-nix", - "rev": "ab2a43b0d21d1d37d4d5726a892f714eaeb4b075", + "rev": "d4555e80d80d2fa77f0a44201ca299f9602492a0", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index f5f8fc7..3acebd3 100644 --- a/flake.nix +++ b/flake.nix @@ -175,7 +175,7 @@ ts3 = mkNixos [ ./nixos/hosts/ts3 ]; # Teamspeak-san pihole = mkNixos [ ./nixos/hosts/pihole ]; # PiHole! static-sites = mkNixos [ ./nixos/hosts/static-sites ]; # nginx specifically for static sites - owncast = mkNixos [ ./nixos/hosts/owncast ]; # owncast! + live-doll-repair = mkNixos [ ./nixos/hosts/live-doll-repair ]; # nginx RTMP! }; darwinConfigurations = { diff --git a/nixos/hosts/owncast/.target b/nixos/hosts/live-doll-repair/.target similarity index 100% rename from nixos/hosts/owncast/.target rename to nixos/hosts/live-doll-repair/.target diff --git a/nixos/hosts/owncast/default.nix b/nixos/hosts/live-doll-repair/default.nix similarity index 61% rename from nixos/hosts/owncast/default.nix rename to nixos/hosts/live-doll-repair/default.nix index b895104..d2b7cae 100644 --- a/nixos/hosts/owncast/default.nix +++ b/nixos/hosts/live-doll-repair/default.nix @@ -4,13 +4,7 @@ ../../server.nix ]; - networking.hostName = "owncast"; + networking.hostName = "live-doll-repair"; system.stateVersion = "24.05"; nixpkgs.hostPlatform = "x86_64-linux"; - - services.owncast = { - enable = true; - port = 6060; - rtmp-port = 6969; - }; }