diff --git a/.gitignore b/.gitignore index eccad86..48084e2 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,6 @@ test.* # Nix result /result + +# Mkdocs +/site diff --git a/.md.toml b/.md.toml deleted file mode 100644 index 5db7994..0000000 --- a/.md.toml +++ /dev/null @@ -1,23 +0,0 @@ -html_void = ["area", "base", "br", "col", "command", "embed", "hr", "img", "input", "keygen", "link", "meta", "param", "source", "track", "wbr"] -dont_copy_paths = [ - # "./src/templates" -] - -src = "./src" -dest = "./build" -[template] -enable = true -order = [ - { type = "Powerpoint", path = "./src/templates/powerpoint.html" }, - { type = "Adjacent" }, - { type = "AdjacentFolder" }, - { type = "RootFolder", path = "./src/templates/folder.html" }, - # path to the templates' folder, - { type = "Root", path = "./src/templates" }, - { type = "General", path = "./src/templates/general.html" }, - { type = "Default" }, -] - -[indexing] -roots = ["wiki"] -render_drafts = false \ No newline at end of file diff --git a/flake.lock b/flake.lock index 957502d..128e4d5 100644 --- a/flake.lock +++ b/flake.lock @@ -1,72 +1,6 @@ { "nodes": { - "bfom": { - "inputs": { - "naersk": "naersk", - "nixpkgs": "nixpkgs_2", - "utils": "utils" - }, - "locked": { - "lastModified": 1723500950, - "narHash": "sha256-t1eApFGI+JzLIW2YToLlDV20n+Nevk1q4fZBYU1m93I=", - "owner": "silver_rust", - "repo": "bfom", - "rev": "7f339f28442758ecc3f1697e3f70d441973664b9", - "type": "gitlab" - }, - "original": { - "owner": "silver_rust", - "repo": "bfom", - "type": "gitlab" - } - }, - "naersk": { - "inputs": { - "nixpkgs": "nixpkgs" - }, - "locked": { - "lastModified": 1713520724, - "narHash": "sha256-CO8MmVDmqZX2FovL75pu5BvwhW+Vugc7Q6ze7Hj8heI=", - "owner": "nix-community", - "repo": "naersk", - "rev": "c5037590290c6c7dae2e42e7da1e247e54ed2d49", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "naersk", - "type": "github" - } - }, "nixpkgs": { - "locked": { - "lastModified": 1714091391, - "narHash": "sha256-68n3GBvlm1MIeJXadPzQ3v8Y9sIW3zmv8gI5w5sliC8=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "4c86138ce486d601d956a165e2f7a0fc029a03c1", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nixpkgs_2": { - "locked": { - "lastModified": 1714091391, - "narHash": "sha256-68n3GBvlm1MIeJXadPzQ3v8Y9sIW3zmv8gI5w5sliC8=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "4c86138ce486d601d956a165e2f7a0fc029a03c1", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1695837737, "narHash": "sha256-KcqmJ5hNacLuE7fkz5586kp/vt4NLo6+Prq3DMgrxpQ=", @@ -82,9 +16,8 @@ }, "root": { "inputs": { - "bfom": "bfom", - "nixpkgs": "nixpkgs_3", - "utils": "utils_2" + "nixpkgs": "nixpkgs", + "utils": "utils" } }, "systems": { @@ -102,43 +35,10 @@ "type": "github" } }, - "systems_2": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "utils": { "inputs": { "systems": "systems" }, - "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" - } - }, - "utils_2": { - "inputs": { - "systems": "systems_2" - }, "locked": { "lastModified": 1694529238, "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", diff --git a/flake.nix b/flake.nix index 5f29d6f..586c0a0 100644 --- a/flake.nix +++ b/flake.nix @@ -3,27 +3,30 @@ inputs = { utils.url = "github:numtide/flake-utils"; - bfom.url = "gitlab:silver_rust/bfom"; }; - outputs = { self, nixpkgs, utils, bfom }: utils.lib.eachDefaultSystem (system: + outputs = { self, nixpkgs, utils, }: utils.lib.eachDefaultSystem (system: let pkgs = nixpkgs.legacyPackages."${system}"; - in rec { - # `nix build` + in { defaultPackage = pkgs.stdenv.mkDerivation { - name = "skynet-website-renew"; + name = "skynet-wiki"; src = self; - buildPhase = "${bfom.defaultPackage."${system}"}/bin/cargo-bfom"; - installPhase = "mkdir -p $out; cp -R build/* $out"; + buildInputs = [ + pkgs.python3Packages.mkdocs + pkgs.python3Packages.mkdocs-material + ]; + buildPhase = "mkdocs build"; + installPhase = "mkdir -p $out; cp -R site/* $out;"; }; devShells.default = pkgs.mkShell { name = "Skynet Wiki env"; packages = [ - bfom.defaultPackage."${system}" + pkgs.python3Packages.mkdocs + pkgs.python3Packages.mkdocs-material ]; }; } ); -} \ No newline at end of file +} diff --git a/mkdocs.yml b/mkdocs.yml new file mode 100644 index 0000000..a585107 --- /dev/null +++ b/mkdocs.yml @@ -0,0 +1,5 @@ +site_name: Skynet Wiki +site_url: https://wiki.skynet.ie +docs_dir: ./src/ +theme: + name: material diff --git a/src/wiki/assets/backgroundsharkycoin.png b/src/assets/backgroundsharkycoin.png similarity index 100% rename from src/wiki/assets/backgroundsharkycoin.png rename to src/assets/backgroundsharkycoin.png diff --git a/src/wiki/assets/favicon/favicon-16x16.png b/src/assets/favicon/favicon-16x16.png similarity index 100% rename from src/wiki/assets/favicon/favicon-16x16.png rename to src/assets/favicon/favicon-16x16.png diff --git a/src/wiki/assets/highlight.min.js b/src/assets/highlight.min.js similarity index 100% rename from src/wiki/assets/highlight.min.js rename to src/assets/highlight.min.js diff --git a/src/wiki/assets/hybrid.min.css b/src/assets/hybrid.min.css similarity index 100% rename from src/wiki/assets/hybrid.min.css rename to src/assets/hybrid.min.css diff --git a/src/wiki/assets/index.css b/src/assets/index.css similarity index 100% rename from src/wiki/assets/index.css rename to src/assets/index.css diff --git a/src/wiki/assets/sharky.svg b/src/assets/sharky.svg similarity index 100% rename from src/wiki/assets/sharky.svg rename to src/assets/sharky.svg diff --git a/src/index.md b/src/index.md new file mode 100644 index 0000000..a53641c --- /dev/null +++ b/src/index.md @@ -0,0 +1 @@ +# Skynet Wiki diff --git a/src/wiki/migration.md b/src/migration.md similarity index 100% rename from src/wiki/migration.md rename to src/migration.md diff --git a/src/wiki/migration/img.png b/src/migration/img.png similarity index 100% rename from src/wiki/migration/img.png rename to src/migration/img.png diff --git a/src/wiki/migration/img_1.png b/src/migration/img_1.png similarity index 100% rename from src/wiki/migration/img_1.png rename to src/migration/img_1.png diff --git a/src/wiki/migration/img_2.png b/src/migration/img_2.png similarity index 100% rename from src/wiki/migration/img_2.png rename to src/migration/img_2.png diff --git a/src/wiki/recovery.md b/src/recovery.md similarity index 100% rename from src/wiki/recovery.md rename to src/recovery.md diff --git a/src/wiki/renew.md b/src/renew.md similarity index 100% rename from src/wiki/renew.md rename to src/renew.md diff --git a/src/wiki/renewal/renew1.jpg b/src/renewal/renew1.jpg similarity index 100% rename from src/wiki/renewal/renew1.jpg rename to src/renewal/renew1.jpg diff --git a/src/wiki/renewal/renew2.png b/src/renewal/renew2.png similarity index 100% rename from src/wiki/renewal/renew2.png rename to src/renewal/renew2.png diff --git a/src/wiki/renewal/renew3.png b/src/renewal/renew3.png similarity index 100% rename from src/wiki/renewal/renew3.png rename to src/renewal/renew3.png diff --git a/src/wiki/renewal/renew4.png b/src/renewal/renew4.png similarity index 100% rename from src/wiki/renewal/renew4.png rename to src/renewal/renew4.png diff --git a/src/wiki/renewal/renew5.jpg b/src/renewal/renew5.jpg similarity index 100% rename from src/wiki/renewal/renew5.jpg rename to src/renewal/renew5.jpg diff --git a/src/wiki/renewal/renew6.jpg b/src/renewal/renew6.jpg similarity index 100% rename from src/wiki/renewal/renew6.jpg rename to src/renewal/renew6.jpg diff --git a/src/wiki/renewal/renew7.png b/src/renewal/renew7.png similarity index 100% rename from src/wiki/renewal/renew7.png rename to src/renewal/renew7.png diff --git a/src/templates/general.html b/src/templates/general.html deleted file mode 100644 index 9f5a47b..0000000 --- a/src/templates/general.html +++ /dev/null @@ -1,27 +0,0 @@ - - - - {title} - - - - - - - - - -
- -
-{body} -
- -
- - \ No newline at end of file diff --git a/src/templates/powerpoint.html b/src/templates/powerpoint.html deleted file mode 100644 index 4b1e07b..0000000 --- a/src/templates/powerpoint.html +++ /dev/null @@ -1,83 +0,0 @@ - - - - {title} - - - - - - - - -{body} - - - - \ No newline at end of file diff --git a/src/templates/wiki.html b/src/templates/wiki.html deleted file mode 100644 index 1e46577..0000000 --- a/src/templates/wiki.html +++ /dev/null @@ -1,40 +0,0 @@ - - - - {title} - - - - - - - - - -
- - -
-

{title}

-

{date}

- -{body} -
- -
- - \ No newline at end of file diff --git a/src/templates/wiki_index.html b/src/templates/wiki_index.html deleted file mode 100644 index dcbb28a..0000000 --- a/src/templates/wiki_index.html +++ /dev/null @@ -1,38 +0,0 @@ - - - - {title} - - - - - - - - - -
- - -
- -{body} -
- -
- - \ No newline at end of file