summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorseth <[email protected]>2023-05-20 01:10:23 -0400
committerseth <[email protected]>2023-05-20 01:13:21 -0400
commit0392725a831df6f17518af35ea757831b2acd0f2 (patch)
tree70011129ef5be02c0521ee1c3f1d470ce6e7db9c
parentbc34e52da93833b4fc15d5e9049fb9a91969baeb (diff)
p-body: stop hosting my website
i switched to cloudflare pages
-rw-r--r--flake.lock53
-rw-r--r--flake.nix4
-rw-r--r--hosts/p-body/default.nix3
-rw-r--r--hosts/p-body/nginx.nix27
4 files changed, 8 insertions, 79 deletions
diff --git a/flake.lock b/flake.lock
index eae4a15..88ef2d1 100644
--- a/flake.lock
+++ b/flake.lock
@@ -219,27 +219,6 @@
"type": "github"
}
},
- "getchoo-website": {
- "inputs": {
- "nixpkgs": "nixpkgs",
- "pre-commit-hooks": [
- "pre-commit-hooks"
- ]
- },
- "locked": {
- "lastModified": 1684513717,
- "narHash": "sha256-MUUeAYSowdJOEA7Y7Z4opLv+ZRfUzTHWW1PLtLK9wwA=",
- "owner": "getchoo",
- "repo": "getchoo.github.io",
- "rev": "b316f63b98d5ba77f0a78f131d0e7de350a1ac80",
- "type": "github"
- },
- "original": {
- "owner": "getchoo",
- "repo": "getchoo.github.io",
- "type": "github"
- }
- },
"gitignore": {
"inputs": {
"nixpkgs": [
@@ -307,7 +286,7 @@
],
"haskell-flake": "haskell-flake",
"nix-darwin": "nix-darwin",
- "nixpkgs": "nixpkgs_2",
+ "nixpkgs": "nixpkgs",
"pre-commit-hooks-nix": [
"pre-commit-hooks"
]
@@ -491,17 +470,18 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1681920287,
- "narHash": "sha256-+/d6XQQfhhXVfqfLROJoqj3TuG38CAeoT6jO1g9r1k0=",
+ "lastModified": 1680213900,
+ "narHash": "sha256-cIDr5WZIj3EkKyCgj/6j3HBH4Jj1W296z7HTcWj1aMA=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "645bc49f34fa8eff95479f0345ff57e55b53437e",
+ "rev": "e3652e0735fbec227f342712f180f4f21f0594f2",
"type": "github"
},
"original": {
- "id": "nixpkgs",
+ "owner": "NixOS",
"ref": "nixos-unstable",
- "type": "indirect"
+ "repo": "nixpkgs",
+ "type": "github"
}
},
"nixpkgsUnstable": {
@@ -521,22 +501,6 @@
},
"nixpkgs_2": {
"locked": {
- "lastModified": 1680213900,
- "narHash": "sha256-cIDr5WZIj3EkKyCgj/6j3HBH4Jj1W296z7HTcWj1aMA=",
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "e3652e0735fbec227f342712f180f4f21f0594f2",
- "type": "github"
- },
- "original": {
- "owner": "NixOS",
- "ref": "nixos-unstable",
- "repo": "nixpkgs",
- "type": "github"
- }
- },
- "nixpkgs_3": {
- "locked": {
"lastModified": 1684398685,
"narHash": "sha256-TRE62m91iZ5ArVMgA+uj22Yda8JoQuuhc9uwZ+NoX+0=",
"owner": "NixOS",
@@ -645,7 +609,6 @@
"flake-parts": "flake-parts",
"flake-utils": "flake-utils",
"getchoo": "getchoo",
- "getchoo-website": "getchoo-website",
"guzzle_api": "guzzle_api",
"hercules-ci-agent": "hercules-ci-agent",
"hercules-ci-effects": "hercules-ci-effects",
@@ -654,7 +617,7 @@
"nixinate": "nixinate",
"nixos-hardware": "nixos-hardware",
"nixos-wsl": "nixos-wsl",
- "nixpkgs": "nixpkgs_3",
+ "nixpkgs": "nixpkgs_2",
"nixpkgsUnstable": "nixpkgsUnstable",
"nur": "nur",
"openwrt-imagebuilder": "openwrt-imagebuilder",
diff --git a/flake.nix b/flake.nix
index 7507367..d48b4df 100644
--- a/flake.nix
+++ b/flake.nix
@@ -34,10 +34,6 @@
inputs.nixpkgs.follows = "nixpkgs";
inputs.flake-compat.follows = "flake-compat";
};
- getchoo-website = {
- url = "github:getchoo/getchoo.github.io";
- inputs.pre-commit-hooks.follows = "pre-commit-hooks";
- };
guzzle_api = {
url = "github:getchoo/guzzle_api";
inputs.nixpkgs.follows = "nixpkgsUnstable";
diff --git a/hosts/p-body/default.nix b/hosts/p-body/default.nix
index 569480c..ad88a7c 100644
--- a/hosts/p-body/default.nix
+++ b/hosts/p-body/default.nix
@@ -1,6 +1,5 @@
{
config,
- getchoo-website,
guzzle_api,
modulesPath,
pkgs,
@@ -29,8 +28,6 @@
hostName = "p-body";
};
- nixpkgs.overlays = [getchoo-website.overlays.default];
-
services = {
guzzle-api = {
enable = true;
diff --git a/hosts/p-body/nginx.nix b/hosts/p-body/nginx.nix
index 3edd7b4..51d06ed 100644
--- a/hosts/p-body/nginx.nix
+++ b/hosts/p-body/nginx.nix
@@ -1,11 +1,9 @@
{
config,
- getchoo-website,
pkgs,
...
}: let
inherit (config.networking) domain;
- website = getchoo-website.packages.${pkgs.system}.default;
in {
networking.firewall.allowedTCPPorts = [80 443];
@@ -34,17 +32,6 @@ in {
};
};
in {
- "${domain}" = {
- default = true;
- enableACME = true;
- serverAliases = ["www.${domain}"];
-
- locations."/" = {
- root = "${website}/libexec/getchoo-website/deps/getchoo-website/dist/";
- index = "index.html";
- };
- };
-
"api.${domain}" = {
enableACME = true;
serverAliases = ["www.api.${domain}"];
@@ -59,20 +46,6 @@ in {
locations = mkProxy "/" "3000";
};
- "status.${domain}" = {
- enableACME = true;
- serverAliases = ["www.status.${domain}"];
- locations."/" = {
- root =
- pkgs.writeTextDir "notindex.html"
- ''
- lol
- '';
- index = "index.html";
- tryFiles = "$uri =404";
- };
- };
-
"grafana.${domain}" = {
enableACME = true;
serverAliases = ["www.grafana.${domain}"];