diff --git a/flake.lock b/flake.lock index 4a4f4db4..1531b36f 100644 --- a/flake.lock +++ b/flake.lock @@ -1,21 +1,5 @@ { "nodes": { - "advisory-db": { - "flake": false, - "locked": { - "lastModified": 1718457093, - "narHash": "sha256-UpZdIss5nqm2Gl3swnmRTPqIpxVpMq/IP7RpMnSEPE0=", - "owner": "rustsec", - "repo": "advisory-db", - "rev": "463e8405f85bb74eef17149f7e704b07723ce46e", - "type": "github" - }, - "original": { - "owner": "rustsec", - "repo": "advisory-db", - "type": "github" - } - }, "agenix": { "inputs": { "agenix": "agenix_2", @@ -122,27 +106,6 @@ "type": "github" } }, - "crane_2": { - "inputs": { - "nixpkgs": [ - "lakewatch-api", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1718474113, - "narHash": "sha256-UKrfy/46YF2TRnxTtKCYzqf2f5ZPRRWwKCCJb7O5X8U=", - "owner": "ipetkov", - "repo": "crane", - "rev": "0095fd8ea00ae0a9e6014f39c375e40c2fbd3386", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "repo": "crane", - "type": "github" - } - }, "darwin": { "inputs": { "nixpkgs": [ @@ -230,30 +193,6 @@ "type": "github" } }, - "fenix": { - "inputs": { - "nixpkgs": [ - "lakewatch-api", - "nixpkgs" - ], - "rust-analyzer-src": [ - "lakewatch-api" - ] - }, - "locked": { - "lastModified": 1723012113, - "narHash": "sha256-AJGsmwDnheWMjZWUqgiGtBjbxMmvLvMp5WJhmTRhJ4w=", - "owner": "nix-community", - "repo": "fenix", - "rev": "3dab4ada5b0c5a22d56dbfd7e140c16f3df2e69a", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "fenix", - "type": "github" - } - }, "flake-compat": { "flake": false, "locked": { @@ -395,60 +334,6 @@ "type": "github" } }, - "flake-utils_5": { - "inputs": { - "systems": "systems_7" - }, - "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_6": { - "inputs": { - "systems": "systems_8" - }, - "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_7": { - "inputs": { - "systems": "systems_10" - }, - "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "freetype2": { "flake": false, "locked": { @@ -571,56 +456,6 @@ "type": "github" } }, - "lakewatch-api": { - "inputs": { - "advisory-db": "advisory-db", - "crane": "crane_2", - "fenix": "fenix", - "flake-utils": "flake-utils_4", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "dir": "LakeWatchAPI", - "lastModified": 1723087663, - "narHash": "sha256-OtCMOxn6phae8DmeyjjGqkV5gkVt3iSUs/oa0bb3E7s=", - "ref": "refs/heads/main", - "rev": "d3831a6ef6d9492d11202da71c2df208cf77b3e2", - "revCount": 132, - "type": "git", - "url": "ssh://git@github.com/UTSA-CS-3443/LakeWatch?dir=LakeWatchAPI" - }, - "original": { - "dir": "LakeWatchAPI", - "type": "git", - "url": "ssh://git@github.com/UTSA-CS-3443/LakeWatch?dir=LakeWatchAPI" - } - }, - "lakewatch-scraper": { - "inputs": { - "flake-utils": "flake-utils_5", - "nixpkgs": [ - "nixpkgs" - ], - "poetry2nix": "poetry2nix" - }, - "locked": { - "dir": "LakeWatchScraper", - "lastModified": 1723087663, - "narHash": "sha256-OtCMOxn6phae8DmeyjjGqkV5gkVt3iSUs/oa0bb3E7s=", - "ref": "refs/heads/main", - "rev": "d3831a6ef6d9492d11202da71c2df208cf77b3e2", - "revCount": 132, - "type": "git", - "url": "ssh://git@github.com/UTSA-CS-3443/LakeWatch?dir=LakeWatchScraper" - }, - "original": { - "dir": "LakeWatchScraper", - "type": "git", - "url": "ssh://git@github.com/UTSA-CS-3443/LakeWatch?dir=LakeWatchScraper" - } - }, "libgit2": { "flake": false, "locked": { @@ -679,28 +514,6 @@ "type": "github" } }, - "nix-github-actions": { - "inputs": { - "nixpkgs": [ - "lakewatch-scraper", - "poetry2nix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1703863825, - "narHash": "sha256-rXwqjtwiGKJheXB43ybM8NwWB8rO2dSRrEqes0S7F5Y=", - "owner": "nix-community", - "repo": "nix-github-actions", - "rev": "5163432afc817cf8bd1f031418d1869e4c9d5547", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nix-github-actions", - "type": "github" - } - }, "nixpkgs": { "locked": { "lastModified": 1702272962, @@ -797,31 +610,6 @@ "type": "github" } }, - "poetry2nix": { - "inputs": { - "flake-utils": "flake-utils_6", - "nix-github-actions": "nix-github-actions", - "nixpkgs": [ - "lakewatch-scraper", - "nixpkgs" - ], - "systems": "systems_9", - "treefmt-nix": "treefmt-nix" - }, - "locked": { - "lastModified": 1723017738, - "narHash": "sha256-Ihz23eqyiCX4CABf9r84BLKDw3T9Yv1UCgV3+aJ7mjg=", - "owner": "nix-community", - "repo": "poetry2nix", - "rev": "cc0af1948e0887cd280496bd891fd40e52b40ff4", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "poetry2nix", - "type": "github" - } - }, "root": { "inputs": { "agenix": "agenix", @@ -833,8 +621,6 @@ "flake-utils": "flake-utils_3", "home-manager": "home-manager_2", "impermanence": "impermanence", - "lakewatch-api": "lakewatch-api", - "lakewatch-scraper": "lakewatch-scraper", "nix": "nix", "nixpkgs": "nixpkgs_3", "waybar": "waybar", @@ -902,21 +688,6 @@ "type": "github" } }, - "systems_10": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "systems_2": { "locked": { "lastModified": 1681028828, @@ -992,72 +763,6 @@ "type": "github" } }, - "systems_7": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_8": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_9": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "id": "systems", - "type": "indirect" - } - }, - "treefmt-nix": { - "inputs": { - "nixpkgs": [ - "lakewatch-scraper", - "poetry2nix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1719749022, - "narHash": "sha256-ddPKHcqaKCIFSFc/cvxS14goUhCOAwsM1PbMr0ZtHMg=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "8df5ff62195d4e67e2264df0b7f5e8c9995fd0bd", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } - }, "utils": { "inputs": { "systems": "systems_4" @@ -1099,7 +804,7 @@ }, "wezterm": { "inputs": { - "flake-utils": "flake-utils_7", + "flake-utils": "flake-utils_4", "freetype2": "freetype2", "harfbuzz": "harfbuzz", "libpng": "libpng", diff --git a/flake.nix b/flake.nix index 999452f5..7b21f635 100644 --- a/flake.nix +++ b/flake.nix @@ -6,14 +6,6 @@ deploy-rs.url = "github:serokell/deploy-rs"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; flake-utils.url = "github:numtide/flake-utils"; - lakewatch-api = { - url = "git+ssh://git@github.com/UTSA-CS-3443/LakeWatch?dir=LakeWatchAPI"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - lakewatch-scraper = { - url = "git+ssh://git@github.com/UTSA-CS-3443/LakeWatch?dir=LakeWatchScraper"; - inputs.nixpkgs.follows = "nixpkgs"; - }; bob = { flake = false; url = "github:MordechaiHadad/bob"; @@ -237,8 +229,6 @@ inputs.impermanence.nixosModules.impermanence inputs.agenix.nixosModules.default inputs.disko.nixosModules.disko - inputs.lakewatch-api.nixosModules.default - inputs.lakewatch-scraper.nixosModules.default { config = (import "${self}/secrets" { diff --git a/hosts/luna/modules/services/lakewatch.nix b/hosts/luna/modules/services/lakewatch.nix deleted file mode 100644 index 831f0db3..00000000 --- a/hosts/luna/modules/services/lakewatch.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ config, ... }: -{ - services.lakewatch-api = { - enable = true; - db = { - createService = true; - passwordFile = config.age.secrets.lakewatch-db-pass.path; - }; - }; - - services.lakewatch-scraper = { - enable = true; - db = { - passwordFile = config.age.secrets.lakewatch-db-pass.path; - }; - }; - services.nginx.virtualHosts."lakewatch.orion-technologies.io" = { - forceSSL = true; - enableACME = true; - locations."/".proxyPass = "http://${config.services.lakewatch-api.host}:${builtins.toString config.services.lakewatch-api.port}"; - }; -} diff --git a/secrets/default.nix b/secrets/default.nix index 3e840044..7dd50fc7 100644 --- a/secrets/default.nix +++ b/secrets/default.nix @@ -15,7 +15,6 @@ let { users-root-pw = "${secrets}/users-root-pw.age"; users-price-pw = "${secrets}/users-price-pw.age"; - lakewatch-db-pass = "${secrets}/lakewatch-db-pass.age"; gitea-db-pass = "${secrets}/gitea-db-pass.age"; gitea-runner-token = "${secrets}/gitea-runner-token.age"; gh-ts-autotag-runner-token = "${secrets}/gh-ts-autotag-runner-token.age"; diff --git a/secrets/hosts/luna/lakewatch-db-pass.age b/secrets/hosts/luna/lakewatch-db-pass.age deleted file mode 100644 index a40e3cd2..00000000 --- a/secrets/hosts/luna/lakewatch-db-pass.age +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN AGE ENCRYPTED FILE----- -YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IFdvUU04QSBpb1lE -Q1lXcmV1empEZ1JsOTZBb2JMaEJocGVqMXFJZllKTHRsMm4xUVhZClRqeG5uS29Y -OTlzNVBHYjVQdDRramVMNE5qSmMzdFpUUE01bFpkMjBEMXMKLT4gWDI1NTE5IHBY -SmtIYlhxMzRudThIOUZ3VXhmOWpLcEdMMVhsSVlJQTRYV0YrT3lxQ0UKbnZQcW9I -amFnSEY5T2JPdnI1QWZKUU5vbTNhSFVWZWw4WEJ3SlgzTkFmWQotPiBwaXYtcDI1 -NiBySnMxSEEgQTVqNXo3ZCtCTSt1Y1hEVjBGQTVuQUVpOEFzamNZaFBIT0Q4Nm4z -Zy82aGQKeWFxdXo3VXJOTU84QTZlS2VaeVJ5a1A0WlMyVVpXV3F0N24rdHBwZE5j -RQotPiA8JGpWSEVBLWdyZWFzZQo4aVV6Wm13TEpwdndFQTZFZXdKaEhuSnBYR3Y2 -ZWZzCi0tLSBQdmpWNDhKa0had3BsZXVEWWU2Nno5MmVwYXcwdlEyVU85RWZDNkFB -a1k0CoRywK/qQXplmc5WMBipGK9vE4ZLonfP1PaUIf1a+njha/zlLlFf6cV+1FLj -X3E6eTVgImXyABhT1VNaPZEHLEsVErhHeQuuVltXiXiINHKL8wuJNXNEROlsNm0A -sCxw/vQB2ZgYe2WCMR75xj4PYe36fxR3T9++jizGzRDzBKa6poyO1IrENvmXZBNt -A9rsQFza14QJAcYlvPGYVQBk9PB/ooM4yQ3F4ISSKMJcbuoeYIcDqAhjh6ytd+Ro -Uf5ouMnKeFhnghV2bLWw1jk= ------END AGE ENCRYPTED FILE-----