diff --git a/.gitea/workflows/analysis.yml b/.gitea/workflows/analysis.yml index 1fc71a5..9d1340d 100644 --- a/.gitea/workflows/analysis.yml +++ b/.gitea/workflows/analysis.yml @@ -13,7 +13,7 @@ jobs: - uses: http://github.com/cachix/install-nix-action@v31 with: install_url: https://releases.nixos.org/nix/nix-2.28.5/install - - uses: http://github.com/cachix/cachix-action@v12 + - uses: http://github.com/cachix/cachix-action@v15 with: name: statix - name: Check Nix flake inputs diff --git a/flake.lock b/flake.lock index d0629cb..ad6a845 100644 --- a/flake.lock +++ b/flake.lock @@ -340,36 +340,6 @@ } }, "nixpkgs_7": { - "locked": { - "lastModified": 1744440957, - "narHash": "sha256-FHlSkNqFmPxPJvy+6fNLaNeWnF1lZSgqVCl/eWaJRc4=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "26d499fc9f1d567283d5d56fcf367edd815dba1d", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_8": { - "locked": { - "lastModified": 1744463964, - "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=", - "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650", - "revCount": 782401, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.782401%2Brev-2631b0b7abcea6e640ce31cd78ea58910d31e650/01962c8a-63c4-7abd-a3df-63a17b548cc7/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/NixOS/nixpkgs/0.1.%2A.tar.gz" - } - }, - "nixpkgs_9": { "locked": { "lastModified": 1736549401, "narHash": "sha256-ibkQrMHxF/7TqAYcQE+tOnIsSEzXmMegzyBWza6uHKM=", @@ -385,56 +355,6 @@ "type": "github" } }, - "pyproject-build-systems": { - "inputs": { - "nixpkgs": [ - "striped-back", - "nixpkgs" - ], - "pyproject-nix": [ - "striped-back", - "pyproject-nix" - ], - "uv2nix": [ - "striped-back", - "uv2nix" - ] - }, - "locked": { - "lastModified": 1744599653, - "narHash": "sha256-nysSwVVjG4hKoOjhjvE6U5lIKA8sEr1d1QzEfZsannU=", - "owner": "pyproject-nix", - "repo": "build-system-pkgs", - "rev": "7dba6dbc73120e15b558754c26024f6c93015dd7", - "type": "github" - }, - "original": { - "owner": "pyproject-nix", - "repo": "build-system-pkgs", - "type": "github" - } - }, - "pyproject-nix": { - "inputs": { - "nixpkgs": [ - "striped-back", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1743438845, - "narHash": "sha256-1GSaoubGtvsLRwoYwHjeKYq40tLwvuFFVhGrG8J9Oek=", - "owner": "pyproject-nix", - "repo": "pyproject.nix", - "rev": "8063ec98edc459571d042a640b1c5e334ecfca1e", - "type": "github" - }, - "original": { - "owner": "pyproject-nix", - "repo": "pyproject.nix", - "type": "github" - } - }, "root": { "inputs": { "agenix": "agenix", @@ -444,8 +364,6 @@ "nix-minecraft": "nix-minecraft", "nixpkgs": "nixpkgs_5", "shoblog-front": "shoblog-front", - "striped-back": "striped-back", - "striped-front": "striped-front", "testing-grounds": "testing-grounds", "unstable": "unstable" } @@ -484,45 +402,6 @@ "type": "github" } }, - "striped-back": { - "inputs": { - "nixpkgs": "nixpkgs_7", - "pyproject-build-systems": "pyproject-build-systems", - "pyproject-nix": "pyproject-nix", - "uv2nix": "uv2nix" - }, - "locked": { - "lastModified": 1748719386, - "narHash": "sha256-nyXHemXPEKnqIVIYIorSbt64zRwMvijyGQGCW3zUUkc=", - "ref": "refs/heads/master", - "rev": "bdfd6f1f4aac6a00ae4509f14b3a63c84d169edf", - "revCount": 8, - "type": "git", - "url": "ssh://git@gitlab.com/striped1/striped-back" - }, - "original": { - "type": "git", - "url": "ssh://git@gitlab.com/striped1/striped-back" - } - }, - "striped-front": { - "inputs": { - "nixpkgs": "nixpkgs_8" - }, - "locked": { - "lastModified": 1748718798, - "narHash": "sha256-KUxbrUjRfuKjkJZLzKr11WEXLfPs38YrW/CMG6XbnbY=", - "ref": "refs/heads/master", - "rev": "a553f10147dad9e41829f67b247817a079f6f671", - "revCount": 11, - "type": "git", - "url": "ssh://git@gitlab.com/striped1/striped-front" - }, - "original": { - "type": "git", - "url": "ssh://git@gitlab.com/striped1/striped-front" - } - }, "systems": { "locked": { "lastModified": 1681028828, @@ -555,7 +434,7 @@ }, "testing-grounds": { "inputs": { - "nixpkgs": "nixpkgs_9" + "nixpkgs": "nixpkgs_7" }, "locked": { "lastModified": 1755527993, @@ -586,31 +465,6 @@ "repo": "nixpkgs", "type": "github" } - }, - "uv2nix": { - "inputs": { - "nixpkgs": [ - "striped-back", - "nixpkgs" - ], - "pyproject-nix": [ - "striped-back", - "pyproject-nix" - ] - }, - "locked": { - "lastModified": 1744797880, - "narHash": "sha256-gt9JBkYjZAEvGwCG7RMAAAr0j2RsaRmOMj/vV0briXk=", - "owner": "pyproject-nix", - "repo": "uv2nix", - "rev": "3583e037163491ecd833f1d5d3eedf3869543c5d", - "type": "github" - }, - "original": { - "owner": "pyproject-nix", - "repo": "uv2nix", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 2f312ad..41196dd 100644 --- a/flake.nix +++ b/flake.nix @@ -18,8 +18,8 @@ nix-minecraft.url = "github:Infinidoge/nix-minecraft"; testing-grounds.url = "gitlab:shobu13/testing-grounds"; shoblog-front.url = "gitlab:shobu13/shoblog"; - striped-front.url = "git+ssh://git@gitlab.com/striped1/striped-front"; - striped-back.url = "git+ssh://git@gitlab.com/striped1/striped-back"; + # striped-front.url = "git+ssh://git@gitlab.com/striped1/striped-front"; + # striped-back.url = "git+ssh://git@gitlab.com/striped1/striped-back"; copyparty.url = "github:9001/copyparty"; @@ -38,8 +38,8 @@ disko, shoblog-front, - striped-front, - striped-back, + # striped-front, + # striped-back, nix-minecraft, testing-grounds, copyparty, diff --git a/hosts/thea/nginx.nix b/hosts/thea/nginx.nix index 731bdc2..8c8016a 100644 --- a/hosts/thea/nginx.nix +++ b/hosts/thea/nginx.nix @@ -1,6 +1,6 @@ {inputs, ...}: let - striped-front = inputs.striped-front; + # striped-front = inputs.striped-front; sin-address = "192.168.1.14"; in { @@ -77,12 +77,12 @@ in { ''; }; }; - "striped.shobu.fr" = { - enableACME = true; - forceSSL = true; + # "striped.shobu.fr" = { + # enableACME = true; + # forceSSL = true; - root = "${striped-front.packages.x86_64-linux.default}/dist"; - }; + # root = "${striped-front.packages.x86_64-linux.default}/dist"; + # }; "dashboard.shobu.fr" = { enableACME = true; forceSSL = true;