diff --git a/flake.lock b/flake.lock index 442ffc7..afa954f 100644 --- a/flake.lock +++ b/flake.lock @@ -45,6 +45,22 @@ "type": "github" } }, + "advisory-db": { + "flake": false, + "locked": { + "lastModified": 1761112158, + "narHash": "sha256-RIXu/7eyKpQHjsPuAUODO81I4ni8f+WYSb7K4mTG6+0=", + "owner": "rustsec", + "repo": "advisory-db", + "rev": "58f3aaec0e1776f4a900737be8cd7cb00972210d", + "type": "github" + }, + "original": { + "owner": "rustsec", + "repo": "advisory-db", + "type": "github" + } + }, "agenix": { "inputs": { "darwin": "darwin", @@ -326,9 +342,36 @@ "type": "github" } }, + "continuwuity": { + "inputs": { + "advisory-db": "advisory-db", + "crane": "crane", + "fenix": "fenix", + "flake-compat": "flake-compat_2", + "flake-parts": "flake-parts", + "nixpkgs": [ + "nixpkgs" + ], + "treefmt-nix": "treefmt-nix" + }, + "locked": { + "lastModified": 1766363000, + "narHash": "sha256-k+B7OjOoVd/vcy/jKBEXAXOolnWt4RoPhJucMwYxyEk=", + "ref": "refs/heads/main", + "rev": "f4ccb819137d13996de23392d5607bb5ade0a246", + "revCount": 5825, + "type": "git", + "url": "https://forgejo.ellis.link/continuwuation/continuwuity/" + }, + "original": { + "rev": "f4ccb819137d13996de23392d5607bb5ade0a246", + "type": "git", + "url": "https://forgejo.ellis.link/continuwuation/continuwuity/" + } + }, "cozybot": { "inputs": { - "flake-parts": "flake-parts", + "flake-parts": "flake-parts_2", "nixpkgs": [ "nixpkgs" ] @@ -348,6 +391,21 @@ } }, "crane": { + "locked": { + "lastModified": 1760924934, + "narHash": "sha256-tuuqY5aU7cUkR71sO2TraVKK2boYrdW3gCSXUkF4i44=", + "owner": "ipetkov", + "repo": "crane", + "rev": "c6b4d5308293d0d04fcfeee92705017537cad02f", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, + "crane_2": { "locked": { "lastModified": 1751562746, "narHash": "sha256-smpugNIkmDeicNz301Ll1bD7nFOty97T79m4GUMUczA=", @@ -567,11 +625,33 @@ "fenix": { "inputs": { "nixpkgs": [ - "sdm845", + "continuwuity", "nixpkgs" ], "rust-analyzer-src": "rust-analyzer-src" }, + "locked": { + "lastModified": 1761115517, + "narHash": "sha256-Fev/ag/c3Fp3JBwHfup3lpA5FlNXfkoshnQ7dssBgJ0=", + "owner": "nix-community", + "repo": "fenix", + "rev": "320433651636186ea32b387cff05d6bbfa30cea7", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "fenix", + "type": "github" + } + }, + "fenix_2": { + "inputs": { + "nixpkgs": [ + "sdm845", + "nixpkgs" + ], + "rust-analyzer-src": "rust-analyzer-src_2" + }, "locked": { "lastModified": 1752302273, "narHash": "sha256-xXZ0JkrpcpSgeuhezJZV2T+7gHcYCo39ogc55c4FyRw=", @@ -634,6 +714,23 @@ } }, "flake-compat_2": { + "flake": false, + "locked": { + "lastModified": 1747046372, + "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", + "type": "github" + }, + "original": { + "owner": "edolstra", + "ref": "master", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_3": { "flake": false, "locked": { "lastModified": 1641205782, @@ -649,7 +746,7 @@ "type": "github" } }, - "flake-compat_3": { + "flake-compat_4": { "flake": false, "locked": { "lastModified": 1747046372, @@ -670,11 +767,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1762440070, - "narHash": "sha256-xxdepIcb39UJ94+YydGP221rjnpkDZUlykKuF54PsqI=", + "lastModified": 1760948891, + "narHash": "sha256-TmWcdiUUaWk8J4lpjzu4gCGxWY6/Ok7mOK4fIFfBuU4=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "26d05891e14c88eb4a5d5bee659c0db5afb609d8", + "rev": "864599284fc7c0ba6357ed89ed5e2cd5040f0c04", "type": "github" }, "original": { @@ -688,11 +785,11 @@ "nixpkgs-lib": "nixpkgs-lib_2" }, "locked": { - "lastModified": 1765835352, - "narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=", + "lastModified": 1762440070, + "narHash": "sha256-xxdepIcb39UJ94+YydGP221rjnpkDZUlykKuF54PsqI=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "a34fae9c08a15ad73f295041fec82323541400a9", + "rev": "26d05891e14c88eb4a5d5bee659c0db5afb609d8", "type": "github" }, "original": { @@ -706,11 +803,11 @@ "nixpkgs-lib": "nixpkgs-lib_3" }, "locked": { - "lastModified": 1749398372, - "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=", + "lastModified": 1765835352, + "narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569", + "rev": "a34fae9c08a15ad73f295041fec82323541400a9", "type": "github" }, "original": { @@ -756,6 +853,24 @@ } }, "flake-parts_6": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib_6" + }, + "locked": { + "lastModified": 1749398372, + "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_7": { "inputs": { "nixpkgs-lib": [ "sdm845", @@ -776,7 +891,7 @@ "type": "github" } }, - "flake-parts_7": { + "flake-parts_8": { "inputs": { "nixpkgs-lib": [ "stylix", @@ -1261,7 +1376,7 @@ }, "lasuite-docs-proxy": { "inputs": { - "flake-parts": "flake-parts_3", + "flake-parts": "flake-parts_4", "nixpkgs": [ "nixpkgs" ] @@ -1331,7 +1446,7 @@ }, "matrixoidc": { "inputs": { - "flake-parts": "flake-parts_4", + "flake-parts": "flake-parts_5", "nixpkgs": [ "nixpkgs" ] @@ -1526,7 +1641,7 @@ }, "nexusbot": { "inputs": { - "flake-parts": "flake-parts_5", + "flake-parts": "flake-parts_6", "nixpkgs": [ "nixpkgs" ] @@ -1767,7 +1882,7 @@ "nix-matrix-appservices": { "inputs": { "devshell": "devshell", - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat_3", "nixlib": "nixlib", "nixpkgs": [ "nixpkgs" @@ -2057,6 +2172,21 @@ } }, "nixpkgs-lib": { + "locked": { + "lastModified": 1754788789, + "narHash": "sha256-x2rJ+Ovzq0sCMpgfgGaaqgBSwY+LST+WbZ6TytnT9Rk=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "a73b9c743612e4244d865a2fdee11865283c04e6", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" + } + }, + "nixpkgs-lib_2": { "locked": { "lastModified": 1761765539, "narHash": "sha256-b0yj6kfvO8ApcSE+QmA6mUfu8IYG6/uU28OFn4PaC8M=", @@ -2071,7 +2201,7 @@ "type": "github" } }, - "nixpkgs-lib_2": { + "nixpkgs-lib_3": { "locked": { "lastModified": 1765674936, "narHash": "sha256-k00uTP4JNfmejrCLJOwdObYC9jHRrr/5M/a/8L2EIdo=", @@ -2086,21 +2216,6 @@ "type": "github" } }, - "nixpkgs-lib_3": { - "locked": { - "lastModified": 1748740939, - "narHash": "sha256-rQaysilft1aVMwF14xIdGS3sj1yHlI6oKQNBRTF40cc=", - "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "656a64127e9d791a334452c6b6606d17539476e2", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixpkgs.lib", - "type": "github" - } - }, "nixpkgs-lib_4": { "locked": { "lastModified": 1748740939, @@ -2131,6 +2246,21 @@ "type": "github" } }, + "nixpkgs-lib_6": { + "locked": { + "lastModified": 1748740939, + "narHash": "sha256-rQaysilft1aVMwF14xIdGS3sj1yHlI6oKQNBRTF40cc=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "656a64127e9d791a334452c6b6606d17539476e2", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" + } + }, "nixpkgs-riscv": { "locked": { "lastModified": 1752147015, @@ -2402,10 +2532,11 @@ "inputs": { "agenix": "agenix", "agenix-cli": "agenix-cli", + "continuwuity": "continuwuity", "cozybot": "cozybot", "disko": "disko", "firefox-gnome-theme": "firefox-gnome-theme", - "flake-parts": "flake-parts_2", + "flake-parts": "flake-parts_3", "gnome-mobile": "gnome-mobile", "home-manager": "home-manager_2", "lasuite-docs-proxy": "lasuite-docs-proxy", @@ -2428,7 +2559,7 @@ "nixpkgs" ], "rust-overlay": "rust-overlay", - "treefmt-nix": "treefmt-nix" + "treefmt-nix": "treefmt-nix_2" }, "locked": { "lastModified": 1765128380, @@ -2445,6 +2576,23 @@ } }, "rust-analyzer-src": { + "flake": false, + "locked": { + "lastModified": 1761077270, + "narHash": "sha256-O1uTuvI/rUlubJ8AXKyzh1WSWV3qCZX0huTFUvWLN4E=", + "owner": "rust-lang", + "repo": "rust-analyzer", + "rev": "39990a923c8bca38f5bd29dc4c96e20ee7808d5d", + "type": "github" + }, + "original": { + "owner": "rust-lang", + "ref": "nightly", + "repo": "rust-analyzer", + "type": "github" + } + }, + "rust-analyzer-src_2": { "flake": false, "locked": { "lastModified": 1752262373, @@ -2511,15 +2659,15 @@ "cachix": "cachix", "commit-notifier": "commit-notifier", "conf2nix": "conf2nix", - "crane": "crane", + "crane": "crane_2", "crate2nix": "crate2nix", "deploy-rs": "deploy-rs", "devshell": "devshell_2", "disko": "disko_2", "emacs-overlay": "emacs-overlay", - "fenix": "fenix", - "flake-compat": "flake-compat_3", - "flake-parts": "flake-parts_6", + "fenix": "fenix_2", + "flake-compat": "flake-compat_4", + "flake-parts": "flake-parts_7", "flake-schemas": "flake-schemas", "flake-utils": "flake-utils_3", "flake-utils-plus": "flake-utils-plus", @@ -2569,7 +2717,7 @@ "rust-overlay": "rust-overlay_2", "sops-nix": "sops-nix", "systems": "systems_4", - "treefmt-nix": "treefmt-nix_2", + "treefmt-nix": "treefmt-nix_3", "weird-deployer": "weird-deployer" }, "locked": { @@ -2614,7 +2762,7 @@ "base16-helix": "base16-helix", "base16-vim": "base16-vim", "firefox-gnome-theme": "firefox-gnome-theme_2", - "flake-parts": "flake-parts_7", + "flake-parts": "flake-parts_8", "gnome-shell": "gnome-shell", "nixpkgs": [ "nixpkgs" @@ -2798,6 +2946,27 @@ } }, "treefmt-nix": { + "inputs": { + "nixpkgs": [ + "continuwuity", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1760945191, + "narHash": "sha256-ZRVs8UqikBa4Ki3X4KCnMBtBW0ux1DaT35tgsnB1jM4=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "f56b1934f5f8fcab8deb5d38d42fd692632b47c2", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, + "treefmt-nix_2": { "inputs": { "nixpkgs": [ "run0-sudo-shim", @@ -2818,7 +2987,7 @@ "type": "github" } }, - "treefmt-nix_2": { + "treefmt-nix_3": { "inputs": { "nixpkgs": [ "sdm845", diff --git a/flake.nix b/flake.nix index a83181b..5a3162f 100755 --- a/flake.nix +++ b/flake.nix @@ -5,6 +5,10 @@ wrapper-manager.url = "github:viperML/wrapper-manager"; flake-parts.url = "github:hercules-ci/flake-parts"; nix-maid.url = "github:viperML/nix-maid"; + continuwuity = { + url = "git+https://forgejo.ellis.link/continuwuation/continuwuity/?rev=f4ccb819137d13996de23392d5607bb5ade0a246"; + inputs.nixpkgs.follows = "nixpkgs"; + }; disko = { url = "github:nix-community/disko"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/modules/server/continuwuity.nix b/modules/server/continuwuity.nix index e4b4c9c..c79422c 100644 --- a/modules/server/continuwuity.nix +++ b/modules/server/continuwuity.nix @@ -1,4 +1,5 @@ { + inputs, config, pkgs, lib, @@ -31,6 +32,7 @@ { matrix-continuwuity = { enable = config.quad.matrix.enable; + package = inputs.continuwuity.packages.${pkgs.stdenv.hostPlatform.system}.default; group = "caddy"; settings.global = config.quad.matrix.settings // { server_name = config.quad.matrix.domain;