From c091d4a952ee5be8b28fea083719a95c94fbf369 Mon Sep 17 00:00:00 2001 From: clerie Date: Fri, 3 Jan 2025 15:01:09 +0100 Subject: [PATCH 1/4] pkgs/clerie-update-nixfiles: Fix changed nix command --- pkgs/clerie-update-nixfiles/clerie-update-nixfiles.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/clerie-update-nixfiles/clerie-update-nixfiles.sh b/pkgs/clerie-update-nixfiles/clerie-update-nixfiles.sh index ea11c3d..20a6dbd 100755 --- a/pkgs/clerie-update-nixfiles/clerie-update-nixfiles.sh +++ b/pkgs/clerie-update-nixfiles/clerie-update-nixfiles.sh @@ -56,7 +56,7 @@ echo "[!] Create branch ${UPDATE_BRANCH}" xgit checkout -b "${UPDATE_BRANCH}" echo "[!] Update nixpkgs" -nix flake lock --update-input nixpkgs +nix flake update nixpkgs echo "[!] Commit changes" xgit add flake.lock From df7fba921fe1e73a46da48f8be6f6401f63c185a Mon Sep 17 00:00:00 2001 From: clerie Date: Fri, 3 Jan 2025 15:49:22 +0100 Subject: [PATCH 2/4] hosts/web-2: Add etebase.clerie.de --- hosts/web-2/configuration.nix | 1 + hosts/web-2/etebase.nix | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+) create mode 100644 hosts/web-2/etebase.nix diff --git a/hosts/web-2/configuration.nix b/hosts/web-2/configuration.nix index dcc3aa7..68c4a78 100644 --- a/hosts/web-2/configuration.nix +++ b/hosts/web-2/configuration.nix @@ -9,6 +9,7 @@ ./chaosevents.nix ./clerie.nix ./drop.nix + ./etebase.nix ./fieldpoc.nix ./gitea.nix ./ip.nix diff --git a/hosts/web-2/etebase.nix b/hosts/web-2/etebase.nix new file mode 100644 index 0000000..626779d --- /dev/null +++ b/hosts/web-2/etebase.nix @@ -0,0 +1,21 @@ +{ ... }: + +{ + services.etebase-server = { + enable = true; + port = 8001; + settings.allowed_hosts.allowed_host1 = "etebase.clerie.de"; + }; + + services.nginx.virtualHosts = { + "etebase.clerie.de" = { + enableACME = true; + forceSSL = true; + locations = { + "/" = { + proxyPass = "http://127.0.0.1:8001"; + }; + }; + }; + }; +} From aad53d50725bebfc21817acb526365bea83260fc Mon Sep 17 00:00:00 2001 From: clerie Date: Fri, 3 Jan 2025 16:15:57 +0100 Subject: [PATCH 3/4] hosts/krypton: Add etesync-dav --- flake.lock | 17 +++++++++++++++++ flake.nix | 2 ++ flake/overlay.nix | 3 +++ hosts/krypton/configuration.nix | 1 + hosts/krypton/etesync-dav.nix | 10 ++++++++++ 5 files changed, 33 insertions(+) create mode 100644 hosts/krypton/etesync-dav.nix diff --git a/flake.lock b/flake.lock index 808cce4..5df4e69 100644 --- a/flake.lock +++ b/flake.lock @@ -476,6 +476,22 @@ "type": "github" } }, + "nixpkgs-0dc1c7": { + "locked": { + "lastModified": 1725718979, + "narHash": "sha256-TNj62uDY5ilnYu0Jne8/IIunfh1kf6kDPY9KdS+Eotw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "0dc1c7294c13f5d1dd6eccab4f75d268d7296efe", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "0dc1c7294c13f5d1dd6eccab4f75d268d7296efe", + "type": "github" + } + }, "nixpkgs-regression": { "locked": { "lastModified": 1643052045, @@ -589,6 +605,7 @@ "nixos-exporter": "nixos-exporter", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_3", + "nixpkgs-0dc1c7": "nixpkgs-0dc1c7", "nurausstieg": "nurausstieg", "scan-to-gpg": "scan-to-gpg", "solid-xmpp-alarm": "solid-xmpp-alarm", diff --git a/flake.nix b/flake.nix index 1763ede..0000bef 100644 --- a/flake.nix +++ b/flake.nix @@ -1,6 +1,8 @@ { inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + # for etesync-dav + nixpkgs-0dc1c7.url = "github:NixOS/nixpkgs/0dc1c7294c13f5d1dd6eccab4f75d268d7296efe"; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; berlinerbaeder-exporter = { url = "git+https://git.clerie.de/clerie/berlinerbaeder-exporter.git"; diff --git a/flake/overlay.nix b/flake/overlay.nix index d50a81d..3a91216 100644 --- a/flake/overlay.nix +++ b/flake/overlay.nix @@ -1,4 +1,5 @@ { self +, nixpkgs-0dc1c7 , berlinerbaeder-exporter , bij , chaosevents @@ -10,6 +11,8 @@ , ... }@inputs: final: prev: { + inherit (nixpkgs-0dc1c7.legacyPackages.${final.system}) + etesync-dav; inherit (berlinerbaeder-exporter.packages.${final.system}) berlinerbaeder-exporter; inherit (bij.packages.${final.system}) diff --git a/hosts/krypton/configuration.nix b/hosts/krypton/configuration.nix index 2886bc8..64a0390 100644 --- a/hosts/krypton/configuration.nix +++ b/hosts/krypton/configuration.nix @@ -9,6 +9,7 @@ ./android.nix ./backup.nix + ./etesync-dav.nix #./initrd.nix ./network.nix ./programs.nix diff --git a/hosts/krypton/etesync-dav.nix b/hosts/krypton/etesync-dav.nix new file mode 100644 index 0000000..43df56d --- /dev/null +++ b/hosts/krypton/etesync-dav.nix @@ -0,0 +1,10 @@ +{ ... }: + +{ + + services.etesync-dav = { + enable = true; + apiUrl = "https://etebase.clerie.de"; + }; + +} From 48f950b152c4fa77566308e9b66671fc6d07af6e Mon Sep 17 00:00:00 2001 From: Flake Update Bot Date: Sat, 4 Jan 2025 03:04:56 +0100 Subject: [PATCH 4/4] Update nixpkgs 2025-01-04-02-03 --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 5df4e69..4c2d362 100644 --- a/flake.lock +++ b/flake.lock @@ -542,11 +542,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1732521221, - "narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=", + "lastModified": 1735834308, + "narHash": "sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d", + "rev": "6df24922a1400241dae323af55f30e4318a6ca65", "type": "github" }, "original": {