From afcdff1b475b132430fdfb4c1b1c08c70a762128 Mon Sep 17 00:00:00 2001 From: Magic_RB Date: Mon, 10 Jul 2023 21:31:17 +0200 Subject: [PATCH] Add back website input Signed-off-by: Magic_RB --- flake.lock | 167 ++++++++++++++++++++++++++- flake.nix | 1 + nixng/containers/website/default.nix | 2 +- 3 files changed, 168 insertions(+), 2 deletions(-) diff --git a/flake.lock b/flake.lock index ec5688f..25b8c88 100644 --- a/flake.lock +++ b/flake.lock @@ -98,6 +98,22 @@ "type": "sourcehut" } }, + "emacs-htmlize": { + "flake": false, + "locked": { + "lastModified": 1597563983, + "narHash": "sha256-wiRnlWKYQSvQijrymSkEbsW3581LOeuTItkxvTgHXDE=", + "owner": "hniksic", + "repo": "emacs-htmlize", + "rev": "49205105898ba8993b5253beec55d8bddd820a70", + "type": "github" + }, + "original": { + "owner": "hniksic", + "repo": "emacs-htmlize", + "type": "github" + } + }, "flake-compat": { "flake": false, "locked": { @@ -321,6 +337,22 @@ "type": "github" } }, + "hcl-mode": { + "flake": false, + "locked": { + "lastModified": 1594425120, + "narHash": "sha256-Ai3OpQPmEQg96Q4JRJJM7vUY8G23l0FUGb1lQsU7SRY=", + "owner": "purcell", + "repo": "emacs-hcl-mode", + "rev": "e12b1df2ca28d2b06c471cd709c038a2dc0bcdbd", + "type": "github" + }, + "original": { + "owner": "purcell", + "repo": "emacs-hcl-mode", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": "nixpkgs_3" @@ -388,6 +420,22 @@ "type": "github" } }, + "modus-themes": { + "flake": false, + "locked": { + "lastModified": 1621753731, + "narHash": "sha256-HFYsSPJWAY2/lYk8u1UxHMoe2l8taI6BvDZDfIO0pnE=", + "owner": "protesilaos", + "repo": "modus-themes", + "rev": "11006063c2f294adad827d42ab04ee239e85eb64", + "type": "github" + }, + "original": { + "owner": "protesilaos", + "repo": "modus-themes", + "type": "github" + } + }, "nil": { "inputs": { "flake-utils": "flake-utils", @@ -481,6 +529,23 @@ "type": "github" } }, + "nixng_2": { + "inputs": { + "nixpkgs": "nixpkgs_13" + }, + "locked": { + "lastModified": 1619975252, + "narHash": "sha256-Amx08/6MpMPLkqAukuIDjjxXdoAaZ/ruD88b3oC+Zbw=", + "path": "/nix/store/qq21z50yf6aqbccrz3qxp3alqka5ddbw-source", + "rev": "f3929584d72e2b741e243d4439a2874011b6d994", + "revCount": 61, + "type": "path" + }, + "original": { + "id": "nixng", + "type": "indirect" + } + }, "nixos-2305": { "locked": { "lastModified": 1686478675, @@ -687,6 +752,32 @@ "type": "indirect" } }, + "nixpkgs_13": { + "locked": { + "lastModified": 1617271991, + "narHash": "sha256-VdzjIQaT1FtycNid0iPSVr44Jrstoox6QRLrwCY1uG0=", + "path": "/nix/store/p86a44r69akjvyg0nid33kh9mg15h9lq-source", + "rev": "da7f4c4842520167f65c20ad75ecdbd14e27ae91", + "type": "path" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "nixpkgs_14": { + "locked": { + "lastModified": 1614447571, + "narHash": "sha256-kHshBYBAAL0sx7DwwrPyfvtUwidQ9aWXy0XrL5RQFhY=", + "path": "/nix/store/fsfirablmv207i01zz3zsd20nkd0cbcq-source", + "rev": "d303eee16ce8dee5c0b5b8e5f6323f561c189ec5", + "type": "path" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, "nixpkgs_2": { "locked": { "lastModified": 1653988320, @@ -815,6 +906,22 @@ "type": "github" } }, + "org-thtml": { + "flake": false, + "locked": { + "lastModified": 1609698765, + "narHash": "sha256-+WfRXEhwEV24MSH5Vg0hz0joJkvkQ4Qeqt4BRY0cZSA=", + "owner": "juanjosegarciaripoll", + "repo": "org-thtml", + "rev": "0c84e993a7e9ae9fc1fd5e34f7713d6526f03cd0", + "type": "github" + }, + "original": { + "owner": "juanjosegarciaripoll", + "repo": "org-thtml", + "type": "github" + } + }, "pre-commit-hooks": { "inputs": { "flake-compat": "flake-compat_4", @@ -860,7 +967,8 @@ "tuxedo-rs": "tuxedo-rs", "udp-over-tcp": "udp-over-tcp", "uterranix": "uterranix", - "vtermModule": "vtermModule" + "vtermModule": "vtermModule", + "website": "website" } }, "rust-overlay": { @@ -1101,6 +1209,63 @@ "repo": "emacs-libvterm", "type": "github" } + }, + "web-mode": { + "flake": false, + "locked": { + "lastModified": 1612115905, + "narHash": "sha256-wZ+Sneh+vulcSs+n9fXHG321k9BauBiQvVJ6zw+cWrM=", + "owner": "fxbois", + "repo": "web-mode", + "rev": "8ef47935d638902ba35a557cae5edd6ab6ab1346", + "type": "github" + }, + "original": { + "owner": "fxbois", + "repo": "web-mode", + "type": "github" + } + }, + "website": { + "inputs": { + "emacs-htmlize": "emacs-htmlize", + "hcl-mode": "hcl-mode", + "modus-themes": "modus-themes", + "nixng": "nixng_2", + "nixpkgs": "nixpkgs_14", + "org-thtml": "org-thtml", + "web-mode": "web-mode", + "yaml-mode": "yaml-mode" + }, + "locked": { + "lastModified": 1641601042, + "narHash": "sha256-Nqz5fYUaCdrj7GmpONqsMxKP3GM/11btYEPtbm0p66w=", + "owner": "~magic_rb", + "repo": "website", + "rev": "9a678533ce1d3a550ccba39fc6cc86b1d3e3de3d", + "type": "sourcehut" + }, + "original": { + "owner": "~magic_rb", + "repo": "website", + "type": "sourcehut" + } + }, + "yaml-mode": { + "flake": false, + "locked": { + "lastModified": 1641308620, + "narHash": "sha256-/0Gt2jqJljN5glxG7H0L3rZVRc34d9jCkoYALHDRt7w=", + "owner": "yoshiki", + "repo": "yaml-mode", + "rev": "a79d2a7b9281f8c56f461d717b1ba40fc58e22fd", + "type": "github" + }, + "original": { + "owner": "yoshiki", + "repo": "yaml-mode", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index d0a167c..51170cf 100644 --- a/flake.nix +++ b/flake.nix @@ -13,6 +13,7 @@ uterranix.url = "sourcehut:~magic_rb/uterranix"; dwarffs.url = "github:edolstra/dwarffs"; serokell-nix.url = "github:serokell/serokell.nix?ref=magicrb-allow-wildcards-with-no-main"; + website.url = "sourcehut:~magic_rb/website"; disko.url = "github:nix-community/disko"; nixos-anywhere.url = "github:numtide/nixos-anywhere"; diff --git a/nixng/containers/website/default.nix b/nixng/containers/website/default.nix index 6dd7f74..fa8e1c0 100644 --- a/nixng/containers/website/default.nix +++ b/nixng/containers/website/default.nix @@ -17,7 +17,7 @@ }; init.services.apache2 = { ensureSomething.link."documentRoot" = { - src = "${inputs.website."x86_64-linux"}/redalder"; + src = "${inputs.website.website."x86_64-linux".default}/redalder"; dst = "/var/www"; }; shutdownOnExit = true;