diff --git a/flake.lock b/flake.lock
index e3e6b4d4..3ed0a295 100644
--- a/flake.lock
+++ b/flake.lock
@@ -198,7 +198,8 @@
"std": "std",
"std-fl": "std-fl",
"systemd2mqtt": "systemd2mqtt",
- "tree": "tree"
+ "tree": "tree",
+ "website": "website"
}
},
"rust": {
@@ -339,6 +340,29 @@
"repo": "tree",
"type": "github"
}
+ },
+ "website": {
+ "inputs": {
+ "flakelib": [
+ "flakelib"
+ ],
+ "nixpkgs": [
+ "nixpkgs"
+ ]
+ },
+ "locked": {
+ "lastModified": 1706423113,
+ "narHash": "sha256-1i8FO7L+MpDlgfx3wTW7NkojdHGFEE3qy/s1n+wjGlU=",
+ "owner": "gensokyo-zone",
+ "repo": "website",
+ "rev": "88d31fa2f9d622f0076481e5949ce7e07723043e",
+ "type": "github"
+ },
+ "original": {
+ "owner": "gensokyo-zone",
+ "repo": "website",
+ "type": "github"
+ }
}
},
"root": "root",
diff --git a/flake.nix b/flake.nix
index bd551fa0..31197035 100644
--- a/flake.nix
+++ b/flake.nix
@@ -51,6 +51,13 @@
flakelib.follows = "flakelib";
};
};
+ website = {
+ url = "github:gensokyo-zone/website";
+ inputs = {
+ nixpkgs.follows = "nixpkgs";
+ flakelib.follows = "flakelib";
+ };
+ };
};
nixConfig = {
extra-substituters = [
diff --git a/nixos/access/gensokyo.nix b/nixos/access/gensokyo.nix
index 36438663..14a07cc7 100644
--- a/nixos/access/gensokyo.nix
+++ b/nixos/access/gensokyo.nix
@@ -1,6 +1,7 @@
{
config,
lib,
+ inputs,
pkgs,
...
}: let
@@ -8,7 +9,7 @@
in {
services.nginx.virtualHosts.${config.networking.domain} = {
locations."/" = {
- root = pkgs.gensokyoZone;
+ root = inputs.website.packages.${pkgs.system}.gensokyoZone;
};
};
}
diff --git a/overlays/local/gensokyoZone/cute.png b/overlays/local/gensokyoZone/cute.png
deleted file mode 100644
index 7be526ae..00000000
Binary files a/overlays/local/gensokyoZone/cute.png and /dev/null differ
diff --git a/overlays/local/gensokyoZone/default.nix b/overlays/local/gensokyoZone/default.nix
deleted file mode 100644
index 8018479d..00000000
--- a/overlays/local/gensokyoZone/default.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ writeTextFile, linkFarm }:
-
-let
- mewp = writeTextFile {
- name = "index.html";
- text = ''
-
-
- Gensokyo
-
-
-
- Gensokyo
- 
-
-
-
- '';
- };
-in
-linkFarm "index" [
- { name = "index.html"; path = mewp; }
- { name = "main.css"; path = ./main.css; }
- { name = "cute.png"; path = ./cute.png; }
-]
diff --git a/overlays/local/gensokyoZone/kittywitch.nix b/overlays/local/gensokyoZone/kittywitch.nix
deleted file mode 100644
index 2e11b4d3..00000000
--- a/overlays/local/gensokyoZone/kittywitch.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ writeTextFile, linkFarm }:
-
-let
- mewp = writeTextFile {
- name = "index.html";
- text = ''
-
-
- Gensokyo
-
-
-
-
-
-
- '';
- };
-in
-linkFarm "index" [
- { name = "index.html"; path = mewp; }
- { name = "main.css"; path = ./main.css; }
- { name = "cute.png"; path = ./cute.png; }
-]
diff --git a/overlays/local/gensokyoZone/main.css b/overlays/local/gensokyoZone/main.css
deleted file mode 100644
index c9ee3d04..00000000
--- a/overlays/local/gensokyoZone/main.css
+++ /dev/null
@@ -1,40 +0,0 @@
-html {
- max-width: 70ch;
- padding: 3em 1em;
- margin: auto;
- line-height: 1.75;
- font-size: 1.25em;
- min-height: 100%;
- padding: 0;
-}
-h1,h2,h3,h4,h5,h6 {
- margin: 3em 0 1em;
-}
-
-p,ul,ol {
- margin-bottom: 2em;
- color: #1d1d1d;
- font-family: sans-serif;
-}
-img {
- max-height: 33vh;
- min-height: 500px;
- margin: 1em auto;
- display: block;
-}
-h1 {
- text-align: center;
-}
-nav ul {
- list-style-type: none;
- display: grid;
- grid-template-columns: 1fr 1fr 1fr;
- margin: 0;
- padding: 0;
-
-}
-nav ul li {
- text-align: center;
- margin: 0;
- padding: 0;
-}