remove calendar-anonymiser role
4 files changed, 12 insertions(+), 196 deletions(-)
changed files
M flake.lock → flake.lock
@@ -137,24 +137,6 @@ "inputs": { "systems": "systems_2" }, "locked": { - "lastModified": 1791914995, - "narHash": "sha256-Zf/xfQEAasnwnmEfHqW/4hjDE/s44yn2hD4RuVIZRjA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "b7a79d3fea1e214f6d668d521cecec0c01e26544", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_3": { - "inputs": { - "systems": "systems_3" - }, - "locked": { "lastModified": 1731533236, "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide",@@ -168,9 +150,9 @@ "repo": "flake-utils", "type": "github" } }, - "flake-utils_4": { + "flake-utils_3": { "inputs": { - "systems": "systems_5" + "systems": "systems_4" }, "locked": { "lastModified": 1731533236,@@ -232,7 +214,7 @@ } }, "gomod2nix_2": { "inputs": { - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_3", "nixpkgs": [ "searchix", "nixpkgs"@@ -309,32 +291,9 @@ "repo": "minimal-emacs.d", "type": "github" } }, - "mycal": { + "nanopi": { "inputs": { "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_2", - "pyproject-build-systems": "pyproject-build-systems", - "pyproject-nix": "pyproject-nix", - "uv2nix": "uv2nix" - }, - "locked": { - "lastModified": 1792246320, - "narHash": "sha256-vuNjcFUe9nOz7uRsK3GPmNnY4aQrw++fG+y5Ux52agM=", - "ref": "refs/heads/main", - "rev": "9d0a263d9608a4e65e401ac31c34c7b100ddd5a5", - "shallow": true, - "type": "git", - "url": "https://git.alin.ovh/mycal" - }, - "original": { - "shallow": true, - "type": "git", - "url": "https://git.alin.ovh/mycal" - } - }, - "nanopi": { - "inputs": { - "flake-utils": "flake-utils_3", "nixpkgs": [ "nixpkgs" ]@@ -355,7 +314,7 @@ } }, "nixos-hardware": { "inputs": { - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_2" }, "locked": { "lastModified": 1792697326,@@ -398,19 +357,6 @@ "url": "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.zst" } }, "nixpkgs_2": { - "locked": { - "lastModified": 1792116957, - "narHash": "sha256-MTJCMrhDFb+GRbLxBPTp8kB4dDlO+egmQ5qsJgYuaWw=", - "rev": "f20cd90e28fe0403873f473b29e42662cd86e8c4", - "type": "tarball", - "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.11pre1093421.f20cd90e28fe/nixexprs.tar.zst" - }, - "original": { - "type": "tarball", - "url": "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.zst" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1789546076, "narHash": "sha256-vWkSk5bbfTqdtMoSgD9FshACO8JCvXTFi+3cqEp0mH0=",@@ -423,7 +369,7 @@ "type": "tarball", "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { "lastModified": 1792615934, "narHash": "sha256-q1ku4ygV7tdmv5Q9QYwhVDsNMZRJcRYjVczoX5+XWBo=",@@ -436,7 +382,7 @@ "type": "tarball", "url": "https://channels.nixos.org/nixos-26.05/nixexprs.tar.zst" } }, - "nixpkgs_5": { + "nixpkgs_4": { "locked": { "lastModified": 1789749394, "narHash": "sha256-cFTsMQz8Hzn8MT49oaeLSHg62tE86NykugCWkeM2ypk=",@@ -452,7 +398,7 @@ "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_5": { "locked": { "lastModified": 1789632929, "narHash": "sha256-j08lBbqaYwjsW0xy6Dh4MNZpQ/oSvLU1MLAo38OXphM=",@@ -468,8 +414,8 @@ }, "nixvim": { "inputs": { "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs_5", - "systems": "systems_4" + "nixpkgs": "nixpkgs_4", + "systems": "systems_3" }, "locked": { "lastModified": 1789959143,@@ -509,56 +455,6 @@ "repo": "pre-commit-hooks.nix", "type": "github" } }, - "pyproject-build-systems": { - "inputs": { - "nixpkgs": [ - "mycal", - "nixpkgs" - ], - "pyproject-nix": [ - "mycal", - "pyproject-nix" - ], - "uv2nix": [ - "mycal", - "uv2nix" - ] - }, - "locked": { - "lastModified": 1791170410, - "narHash": "sha256-pyru9MpuXRiyq0Bd4q0nHpL4T6HCuZT4B+alcgAYE4A=", - "owner": "pyproject-nix", - "repo": "build-system-pkgs", - "rev": "953d35d03a51dbecaf3feb3fb679eb63e90ebeb4", - "type": "github" - }, - "original": { - "owner": "pyproject-nix", - "repo": "build-system-pkgs", - "type": "github" - } - }, - "pyproject-nix": { - "inputs": { - "nixpkgs": [ - "mycal", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1791657700, - "narHash": "sha256-vcCAvhtA7hG+/gOge29hYHy7I/dLkIsr5nLx4sFEQic=", - "owner": "pyproject-nix", - "repo": "pyproject.nix", - "rev": "ddc400a6883b042646d0940e65971bb7f7e96107", - "type": "github" - }, - "original": { - "owner": "pyproject-nix", - "repo": "pyproject.nix", - "type": "github" - } - }, "root": { "inputs": { "agenix": "agenix",@@ -568,10 +464,9 @@ "flake-compatish": "flake-compatish", "home-manager": "home-manager", "iqan": "iqan", "minimal-emacs": "minimal-emacs", - "mycal": "mycal", "nanopi": "nanopi", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_3", "nixpkgs-unstable": "nixpkgs-unstable", "nixvim": "nixvim", "scriptura": "scriptura",@@ -603,7 +498,7 @@ }, "searchix": { "inputs": { "gomod2nix": "gomod2nix_2", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_5", "pre-commit-hooks": "pre-commit-hooks", "simple-css": "simple-css", "treefmt-nix": "treefmt-nix"@@ -719,21 +614,6 @@ "repo": "default", "type": "github" } }, - "systems_5": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "treefmt-nix": { "inputs": { "nixpkgs": [@@ -752,31 +632,6 @@ }, "original": { "owner": "numtide", "repo": "treefmt-nix", - "type": "github" - } - }, - "uv2nix": { - "inputs": { - "nixpkgs": [ - "mycal", - "nixpkgs" - ], - "pyproject-nix": [ - "mycal", - "pyproject-nix" - ] - }, - "locked": { - "lastModified": 1792151315, - "narHash": "sha256-PMtgvHuGijoIAtPtrBm7kJOI6fxzX4LYPAIK+QVGY+Y=", - "owner": "pyproject-nix", - "repo": "uv2nix", - "rev": "7aba73a3d85454f1118f8cf9de97979b4d26bcac", - "type": "github" - }, - "original": { - "owner": "pyproject-nix", - "repo": "uv2nix", "type": "github" } }
M flake.nix → flake.nix
@@ -26,7 +26,6 @@ inputs.nixpkgs.follows = "nixpkgs"; }; elgit.url = "git+https://git.alin.ovh/elgit?shallow=1"; - mycal.url = "git+https://git.alin.ovh/mycal?shallow=1"; searchix.url = "git+https://git.alin.ovh/searchix?shallow=1"; scriptura = { url = "git+https://git.alin.ovh/scriptura?shallow=1";
M system/hosts/hasel.nix → system/hosts/hasel.nix
@@ -9,7 +9,6 @@ ../roles/server.nix ../roles/auth-dns.nix ../roles/binary-cache.nix - ../roles/calendar-anonymiser.nix ../roles/ci.nix ../roles/exit-node.nix ../roles/file-server.nix
D system/roles/calendar-anonymiser.nix
@@ -1,37 +0,0 @@ -{ - inputs, - config, - ... -}: -let - email = "alan@alanpearce.eu"; - srv = config.services.mycal; -in -{ - imports = [ - inputs.mycal.nixosModules.mycal - ../../private/calendar.nix - ]; - services.mycal = { - enable = true; - port = 8002; - - settings = { - timezone = config.time.timeZone; - name = "Alin"; - inherit email; - }; - }; - - services.caddy.virtualHosts = { - "cal.${config.networking.domain}" = { - extraConfig = '' - encode zstd gzip - cache { - ttl 15m - } - reverse_proxy ${srv.host}:${toString srv.port} - ''; - }; - }; -}