From 1713c9e01e00b6f4b5814d68e47642a012eb7ae4 Mon Sep 17 00:00:00 2001 From: Ananth Venkatesh Date: Sun, 16 Feb 2025 02:14:38 -0500 Subject: [PATCH 1/2] docs(readme): add build instructions --- .pre-commit-config.yaml | 2 +- README.md | 15 +++++++++++++++ flake.nix | 1 - 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 8194def..8b50766 120000 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1 +1 @@ -/nix/store/i4wcn83p1273vgv0nggpdbjqppq33aj7-pre-commit-config.json \ No newline at end of file +/nix/store/4wj49hvsmkannf285i53qczyjggvly5w-pre-commit-config.json \ No newline at end of file diff --git a/README.md b/README.md index 7f349ce..8cf032a 100644 --- a/README.md +++ b/README.md @@ -2,4 +2,19 @@ The all-new (very experimental) MacGregor House website +## Building + +To build, run + +`nix build .` + +For live preview, run + +`bash watch.sh` and +`nix run nixpkgs#live-server` + +then navigate to the `src` directory. + +## Models + ![A 3D model of MacGregor House](./assets/img/macg.png) diff --git a/flake.nix b/flake.nix index 67eeeb4..2200896 100644 --- a/flake.nix +++ b/flake.nix @@ -70,7 +70,6 @@ nil.enable = true; statix.enable = true; markdownlint.enable = true; - mdsh.enable = true; typos.enable = true; check-merge-conflicts.enable = true; commitizen.enable = true; From 21b946568d1acdfdc9e2b8556cf12de4793b7d87 Mon Sep 17 00:00:00 2001 From: Ananth Venkatesh Date: Sun, 16 Feb 2025 02:14:56 -0500 Subject: [PATCH 2/2] build(lock): update --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 6ad6258..74d8689 100644 --- a/flake.lock +++ b/flake.lock @@ -88,11 +88,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1739064336, - "narHash": "sha256-LTZznyurm9WWchG3uPH+8Sf5hkzZyHoa9FvDW0cLk0M=", + "lastModified": 1739669300, + "narHash": "sha256-+FBpxx535UFK2vDW6yJkGA/7pgwVW7wsG7dnUejmGGA=", "owner": "jeslie0", "repo": "mkElmDerivation", - "rev": "2d5f1acc6da7e6d5deeff5c9f47729a671ab8f9a", + "rev": "009e5994ec2978c2876229cefadc20d2765f2e50", "type": "github" }, "original": {