From 9214503d41bf7573b2e1b3928670bfa76bc721a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= Date: Mon, 6 Oct 2025 13:10:40 +0200 Subject: [PATCH] host ical ephemeris MVP --- flake.lock | 213 ++++++++++++++++++++++++++------- flake.nix | 9 +- secrets | 2 +- secrets.txt | 1 + systems/ful/ical-ephemeris.nix | 2 +- 5 files changed, 177 insertions(+), 50 deletions(-) diff --git a/flake.lock b/flake.lock index b7aad6b..ed4f5bc 100644 --- a/flake.lock +++ b/flake.lock @@ -53,6 +53,43 @@ "type": "github" } }, + "almanac": { + "flake": false, + "locked": { + "lastModified": 1640984494, + "narHash": "sha256-xxbrGJtRK6wzOR09vGPqoUvnY5f0h6hn6Uecy331Zhw=", + "owner": "lfborjas", + "repo": "almanac", + "rev": "72931bd9accefccd2df59d9d64a6cbb91f2d5f17", + "type": "github" + }, + "original": { + "owner": "lfborjas", + "repo": "almanac", + "type": "github" + } + }, + "astro-calendar": { + "inputs": { + "almanac": "almanac", + "nixpkgs": "nixpkgs_4", + "swiss-ephemeris": "swiss-ephemeris", + "swisseph": "swisseph" + }, + "locked": { + "lastModified": 1759748138, + "narHash": "sha256-x2UlKYMfYt0/1GSqR64Y0mGdgWE8YQnnY0Lm2AKU97Y=", + "owner": "kmein", + "repo": "astro-calendar", + "rev": "96f82ec5fb9b1424455b5cf4d072f6cf700a2bd2", + "type": "github" + }, + "original": { + "owner": "kmein", + "repo": "astro-calendar", + "type": "github" + } + }, "base16": { "inputs": { "fromYaml": "fromYaml" @@ -287,7 +324,7 @@ }, "fenix": { "inputs": { - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_6", "rust-analyzer-src": "rust-analyzer-src" }, "locked": { @@ -604,6 +641,25 @@ "type": "github" } }, + "ical-ephemeris": { + "inputs": { + "astro-calendar": "astro-calendar", + "nixpkgs": "nixpkgs_5" + }, + "locked": { + "lastModified": 1759748846, + "narHash": "sha256-T2iJHsW91nouS7qaJT9SfPG42uKr+2vdoMl2e2ThV9A=", + "ref": "refs/heads/master", + "rev": "d7b74e16e6c21e381b3343974d8d653b8ba98954", + "revCount": 10, + "type": "git", + "url": "ssh://gitea@code.kmein.de:22022/kfm/ical-ephemeris" + }, + "original": { + "type": "git", + "url": "ssh://gitea@code.kmein.de:22022/kfm/ical-ephemeris" + } + }, "kellia-dictionary": { "flake": false, "locked": { @@ -672,7 +728,7 @@ "inputs": { "fenix": "fenix", "flake-utils": "flake-utils_4", - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_7" }, "locked": { "lastModified": 1759437689, @@ -931,7 +987,7 @@ }, "nixinate_2": { "inputs": { - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_8" }, "locked": { "lastModified": 1742737607, @@ -1060,6 +1116,38 @@ } }, "nixpkgs_10": { + "locked": { + "lastModified": 1755615617, + "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "20075955deac2583bb12f07151c2df830ef346b4", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_11": { + "locked": { + "lastModified": 1751792365, + "narHash": "sha256-J1kI6oAj25IG4EdVlg2hQz8NZTBNYvIS0l4wpr9KcUo=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "1fd8bada0b6117e6c7eb54aad5813023eed37ccb", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_12": { "locked": { "lastModified": 1659446231, "narHash": "sha256-hekabNdTdgR/iLsgce5TGWmfIDZ86qjPhxDg/8TlzhE=", @@ -1075,7 +1163,7 @@ "type": "github" } }, - "nixpkgs_11": { + "nixpkgs_13": { "locked": { "lastModified": 1615532953, "narHash": "sha256-SWpaGjrp/INzorEqMz3HLi6Uuk9I0KAn4YS8B4n3q5g=", @@ -1119,11 +1207,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1701436327, - "narHash": "sha256-tRHbnoNI8SIM5O5xuxOmtSLnswEByzmnQcGGyNRjxsE=", + "lastModified": 1758035966, + "narHash": "sha256-qqIJ3yxPiB0ZQTT9//nFGQYn8X/PBoJbofA7hRKZnmE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "91050ea1e57e50388fa87a3302ba12d188ef723a", + "rev": "8d4ddb19d03c65a36ad8d189d001dc32ffb0306b", "type": "github" }, "original": { @@ -1134,6 +1222,22 @@ } }, "nixpkgs_5": { + "locked": { + "lastModified": 1759381078, + "narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "7df7ff7d8e00218376575f0acdcc5d66741351ee", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_6": { "locked": { "lastModified": 1701436327, "narHash": "sha256-tRHbnoNI8SIM5O5xuxOmtSLnswEByzmnQcGGyNRjxsE=", @@ -1149,7 +1253,23 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_7": { + "locked": { + "lastModified": 1701436327, + "narHash": "sha256-tRHbnoNI8SIM5O5xuxOmtSLnswEByzmnQcGGyNRjxsE=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "91050ea1e57e50388fa87a3302ba12d188ef723a", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_8": { "locked": { "lastModified": 1653060744, "narHash": "sha256-kfRusllRumpt33J1hPV+CeCCylCXEU7e0gn2/cIM7cY=", @@ -1165,7 +1285,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_9": { "locked": { "lastModified": 1755704039, "narHash": "sha256-gKlP0LbyJ3qX0KObfIWcp5nbuHSb5EHwIvU6UcNBg2A=", @@ -1181,38 +1301,6 @@ "type": "github" } }, - "nixpkgs_8": { - "locked": { - "lastModified": 1755615617, - "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "20075955deac2583bb12f07151c2df830ef346b4", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_9": { - "locked": { - "lastModified": 1751792365, - "narHash": "sha256-J1kI6oAj25IG4EdVlg2hQz8NZTBNYvIS0l4wpr9KcUo=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "1fd8bada0b6117e6c7eb54aad5813023eed37ccb", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nmd": { "flake": false, "locked": { @@ -1327,7 +1415,7 @@ "nur_2": { "inputs": { "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs_8" + "nixpkgs": "nixpkgs_10" }, "locked": { "lastModified": 1755984779, @@ -1457,11 +1545,12 @@ "coptic-dictionary": "coptic-dictionary", "flake-utils": "flake-utils_3", "home-manager": "home-manager_2", + "ical-ephemeris": "ical-ephemeris", "menstruation-backend": "menstruation-backend_2", "menstruation-telegram": "menstruation-telegram_2", "nix-on-droid": "nix-on-droid_2", "nixinate": "nixinate_2", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_9", "nixpkgs-old": "nixpkgs-old_2", "nixpkgs-unstable": "nixpkgs-unstable_2", "nur": "nur_2", @@ -1604,7 +1693,7 @@ "inputs": { "buildbot-nix": "buildbot-nix", "nix-writers": "nix-writers", - "nixpkgs": "nixpkgs_9" + "nixpkgs": "nixpkgs_11" }, "locked": { "lastModified": 1754761025, @@ -1685,6 +1774,38 @@ "type": "github" } }, + "swiss-ephemeris": { + "flake": false, + "locked": { + "lastModified": 1638583659, + "narHash": "sha256-EEgKk5DDkmICteFzFzXdvdGke7aPoJa6aQ228nAYieQ=", + "owner": "lfborjas", + "repo": "swiss-ephemeris", + "rev": "3094368f5f963e8756e89e3b3dd24b96796b8682", + "type": "github" + }, + "original": { + "owner": "lfborjas", + "repo": "swiss-ephemeris", + "type": "github" + } + }, + "swisseph": { + "flake": false, + "locked": { + "lastModified": 1757697308, + "narHash": "sha256-m2Qgzhsgrv0KyJin8UfNFJ8KL/HFfoN8AmCTlcirHXE=", + "owner": "aloistr", + "repo": "swisseph", + "rev": "3084917b5d2384af6fb928583552e0a299fb6d83", + "type": "github" + }, + "original": { + "owner": "aloistr", + "repo": "swisseph", + "type": "github" + } + }, "systems": { "locked": { "lastModified": 1681028828, @@ -1782,7 +1903,7 @@ "telebots_2": { "inputs": { "flake-utils": "flake-utils_5", - "nixpkgs": "nixpkgs_10" + "nixpkgs": "nixpkgs_12" }, "locked": { "lastModified": 1703313352, @@ -2042,7 +2163,7 @@ "flake-utils": [ "flake-utils" ], - "nixpkgs": "nixpkgs_11" + "nixpkgs": "nixpkgs_13" }, "locked": { "lastModified": 1615819231, diff --git a/flake.nix b/flake.nix index d873b38..86d1c54 100644 --- a/flake.nix +++ b/flake.nix @@ -2,6 +2,8 @@ description = "niveum: packages, modules, systems"; inputs = { + self.submodules = true; + agenix.url = "github:ryantm/agenix"; # alew-web.url = "git+ssh://gitea@code.kmein.de:22022/kfm/alew-web.git?ref=refs/heads/master"; coptic-dictionary.url = "github:kmein/coptic-dictionary"; @@ -26,6 +28,7 @@ voidrice.url = "github:Lukesmithxyz/voidrice"; wallpaper-generator.url = "github:pinpox/wallpaper-generator/v1.1"; wallpapers.url = "github:kmein/wallpapers"; + ical-ephemeris.url = "git+ssh://gitea@code.kmein.de:22022/kfm/ical-ephemeris"; agenix.inputs.home-manager.follows = "home-manager"; agenix.inputs.nixpkgs.follows = "nixpkgs"; @@ -120,7 +123,7 @@ exec ${pkgs.nixos-rebuild}/bin/nixos-rebuild switch \ --max-jobs 2 \ --log-format internal-json \ - --flake .?submodules=1#${hostname} \ + --flake .#${hostname} \ --target-host ${targets.${hostname}} 2>&1 \ | ${pkgs.nix-output-monitor}/bin/nom --json ''); @@ -129,7 +132,7 @@ deploy-ful = { type = "app"; program = toString (pkgs.writers.writeDash "deploy-ful" '' - exec ${pkgs.nix}/bin/nix run .?submodules=1#nixinate.ful \ + exec ${pkgs.nix}/bin/nix run .#nixinate.ful \ --log-format internal-json 2>&1 \ | ${pkgs.nix-output-monitor}/bin/nom --json ''); @@ -207,6 +210,7 @@ systems/ful/configuration.nix agenix.nixosModules.default inputs.self.nixosModules.passport + inputs.ical-ephemeris.nixosModules.default inputs.self.nixosModules.panoptikon inputs.self.nixosModules.go-webring inputs.self.nixosModules.htgen @@ -414,6 +418,7 @@ ttspaste = pkgs.callPackage packages/ttspaste.nix {}; unicodmenu = pkgs.callPackage packages/unicodmenu.nix {}; emailmenu = pkgs.callPackage packages/emailmenu.nix {}; + stag = pkgs.callPackage packages/stag.nix {}; untilport = pkgs.callPackage packages/untilport.nix {}; vg = pkgs.callPackage packages/vg.nix {}; vim = pkgs.callPackage packages/vim.nix {niveumPackages = self.packages.${system};}; diff --git a/secrets b/secrets index 15c3424..b995cec 160000 --- a/secrets +++ b/secrets @@ -1 +1 @@ -Subproject commit 15c342418209f078295ba75d970e14711db2d378 +Subproject commit b995cec9d1ec55d60dfb9e2439750db9cacbe138 diff --git a/secrets.txt b/secrets.txt index e525890..25a76f0 100644 --- a/secrets.txt +++ b/secrets.txt @@ -1,4 +1,5 @@ secrets/alertmanager-token-reporters.age +secrets/brevo-key.age secrets/cifs-credentials-zodiac.age secrets/di-fm-key.age secrets/email-password-cock.age diff --git a/systems/ful/ical-ephemeris.nix b/systems/ful/ical-ephemeris.nix index 3c29bf1..daac652 100644 --- a/systems/ful/ical-ephemeris.nix +++ b/systems/ful/ical-ephemeris.nix @@ -1,7 +1,7 @@ { config, pkgs, ... }: { services.nginx.virtualHosts."ical-ephemeris.kmein.de" = { - addSSL = true; + forceSSL = true; enableACME = true; locations."/" = { proxyPass = "http://localhost:9090";