From d8e4f469219d1397981d6218b5d67fba613d756f Mon Sep 17 00:00:00 2001 From: "hermitcollective.net" Date: Wed, 6 Mar 2024 10:36:35 +0100 Subject: [PATCH] Update --- flake.lock | 308 ++---------------- sites/hertog.hermitcollective.net/default.nix | 15 +- 2 files changed, 27 insertions(+), 296 deletions(-) diff --git a/flake.lock b/flake.lock index 2f5cc99..0d17303 100644 --- a/flake.lock +++ b/flake.lock @@ -1,223 +1,43 @@ { "nodes": { - "base16-schemes": { - "flake": false, - "locked": { - "lastModified": 1696158499, - "narHash": "sha256-5yIHgDTPjoX/3oDEfLSQ0eJZdFL1SaCfb9d6M0RmOTM=", - "owner": "tinted-theming", - "repo": "base16-schemes", - "rev": "a9112eaae86d9dd8ee6bb9445b664fba2f94037a", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "base16-schemes", - "type": "github" - } - }, - "flake-compat": { - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "revCount": 57, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" - } - }, - "flake-compat_2": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-parts": { - "inputs": { - "nixpkgs-lib": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1706830856, - "narHash": "sha256-a0NYyp+h9hlb7ddVz4LUn1vT/PLwqfrWYcHMvFB1xYg=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "b253292d9c0a5ead9bc98c4e9a26c6312e27d69f", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-utils": { - "inputs": { - "systems": "systems" - }, - "locked": { - "lastModified": 1701680307, - "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "gitignore": { - "inputs": { - "nixpkgs": [ - "nixvim", - "pre-commit-hooks", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1703887061, - "narHash": "sha256-gGPa9qWNc6eCXT/+Z5/zMkyYOuRZqeFZBDbopNZQkuY=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "43e1aa1308018f37118e34d3a9cb4f5e75dc11d5", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, - "home-manager": { + "comin": { "inputs": { "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1708031129, - "narHash": "sha256-EH20hJfNnc1/ODdDVat9B7aKm0B95L3YtkIRwKLvQG8=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "3d6791b3897b526c82920a2ab5f61d71985b3cf8", + "lastModified": 1708160520, + "narHash": "sha256-2PdzJHLBYQ+Vy4pF7/e76YVfxIOjQJ3+JcBL6xRmSK4=", + "owner": "nlewo", + "repo": "comin", + "rev": "529a27caaffd30b9ac3e8d48250a2566b5e36f4e", "type": "github" }, "original": { - "owner": "nix-community", - "ref": "master", - "repo": "home-manager", + "owner": "nlewo", + "repo": "comin", "type": "github" } }, - "home-manager_2": { + "iceshrimp": { "inputs": { "nixpkgs": [ - "nixvim", "nixpkgs" ] }, "locked": { - "lastModified": 1707919853, - "narHash": "sha256-qxmBGDzutuJ/tsX4gp+Mr7fjxOZBbeT9ixhS5o4iFOw=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "043ba285c6dc20f36441d48525402bcb9743c498", - "type": "github" + "lastModified": 1709197042, + "narHash": "sha256-EXTZ6H6+Pm/1wqdeijVkasXJFgvFN5fiCW6+S5pqNWA=", + "ref": "refs/heads/dev", + "rev": "04f8a479f1d80ae436246dfda3ebb1fcd4ded1e6", + "revCount": 42, + "type": "git", + "url": "https://iceshrimp.dev/iceshrimp/packaging" }, "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, - "nix-colors": { - "inputs": { - "base16-schemes": "base16-schemes", - "nixpkgs-lib": "nixpkgs-lib" - }, - "locked": { - "lastModified": 1707825078, - "narHash": "sha256-hTfge2J2W+42SZ7VHXkf4kjU+qzFqPeC9k66jAUBMHk=", - "owner": "misterio77", - "repo": "nix-colors", - "rev": "b01f024090d2c4fc3152cd0cf12027a7b8453ba1", - "type": "github" - }, - "original": { - "owner": "misterio77", - "repo": "nix-colors", - "type": "github" - } - }, - "nix-darwin": { - "inputs": { - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1707707289, - "narHash": "sha256-YuDt/eSTXMEHv8jS8BEZJgqCcG8Tr3cyqaZjJFXZHsw=", - "owner": "lnl7", - "repo": "nix-darwin", - "rev": "44f50a5ecaab72a61d5fd8e5c5717bc4bf9c25dd", - "type": "github" - }, - "original": { - "owner": "lnl7", - "repo": "nix-darwin", - "type": "github" - } - }, - "nix-flatpak": { - "locked": { - "lastModified": 1708160610, - "narHash": "sha256-vbtzx0c9R52p3SBjvkz4Iw5Jz1VUm751UDwY1XMCqQ0=", - "owner": "gmodena", - "repo": "nix-flatpak", - "rev": "e23d1d1f3c42e76f1d2f904838aaf4d49578be9e", - "type": "github" - }, - "original": { - "owner": "gmodena", - "repo": "nix-flatpak", - "type": "github" - } - }, - "nixos-hardware": { - "locked": { - "lastModified": 1708091350, - "narHash": "sha256-o28BJYi68qqvHipT7V2jkWxDiMS1LF9nxUsou+eFUPQ=", - "owner": "NixOS", - "repo": "nixos-hardware", - "rev": "106d3fec43bcea19cb2e061ca02531d54b542ce3", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "master", - "repo": "nixos-hardware", - "type": "github" + "type": "git", + "url": "https://iceshrimp.dev/iceshrimp/packaging" } }, "nixpkgs": { @@ -235,97 +55,11 @@ "type": "indirect" } }, - "nixpkgs-lib": { - "locked": { - "lastModified": 1697935651, - "narHash": "sha256-qOfWjQ2JQSQL15KLh6D7xQhx0qgZlYZTYlcEiRuAMMw=", - "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "e1e11fdbb01113d85c7f41cada9d2847660e3902", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixpkgs.lib", - "type": "github" - } - }, - "nixvim": { - "inputs": { - "flake-compat": "flake-compat", - "flake-parts": "flake-parts", - "home-manager": "home-manager_2", - "nix-darwin": "nix-darwin", - "nixpkgs": [ - "nixpkgs" - ], - "pre-commit-hooks": "pre-commit-hooks" - }, - "locked": { - "lastModified": 1708168372, - "narHash": "sha256-kjhmh4uDIWUnfYiQCmonhiRrs+ymJdQHKG/2bSaWb4w=", - "owner": "nix-community", - "repo": "nixvim", - "rev": "361e2ec74b69ac22002febe61af9b4b14a75dcc6", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixvim", - "type": "github" - } - }, - "pre-commit-hooks": { - "inputs": { - "flake-compat": "flake-compat_2", - "flake-utils": "flake-utils", - "gitignore": "gitignore", - "nixpkgs": [ - "nixvim", - "nixpkgs" - ], - "nixpkgs-stable": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1707297608, - "narHash": "sha256-ADjo/5VySGlvtCW3qR+vdFF4xM9kJFlRDqcC9ZGI8EA=", - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "rev": "0db2e67ee49910adfa13010e7f012149660af7f0", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "type": "github" - } - }, "root": { "inputs": { - "home-manager": "home-manager", - "nix-colors": "nix-colors", - "nix-flatpak": "nix-flatpak", - "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs", - "nixvim": "nixvim" - } - }, - "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" + "comin": "comin", + "iceshrimp": "iceshrimp", + "nixpkgs": "nixpkgs" } } }, diff --git a/sites/hertog.hermitcollective.net/default.nix b/sites/hertog.hermitcollective.net/default.nix index cb8ad7e..24faf3d 100644 --- a/sites/hertog.hermitcollective.net/default.nix +++ b/sites/hertog.hermitcollective.net/default.nix @@ -1,10 +1,7 @@ -{ pkgs ? import { } }: - -with pkgs; stdenv.mkDerivation { - name = "website"; - src = ./.; - installPhase = '' - mkdir -p $out - cp -r . $out - ''; +{ + services.nginx.virtualHosts."hertog.hermitcollective.net" = { + forceSSL = true; + enableACME = true; + root = "./"; + }; }