From 1f1e50f91be17ed2c04129ad8cb2ffcf9c0db6c4 Mon Sep 17 00:00:00 2001 From: Stuce Date: Sun, 16 Nov 2025 11:56:16 +0100 Subject: [PATCH 1/5] . --- flake.lock | 82 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) create mode 100644 flake.lock diff --git a/flake.lock b/flake.lock new file mode 100644 index 0000000..7acb779 --- /dev/null +++ b/flake.lock @@ -0,0 +1,82 @@ +{ + "nodes": { + "calDavToCsv": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1763287383, + "narHash": "sha256-BRitCTYlZ5XqENQOIxZpwFKpJ2eg3elWQMsO7mKwIbs=", + "ref": "refs/heads/main", + "rev": "049839b64b47a2384670c6f75151e653a0caa3c8", + "revCount": 2, + "type": "git", + "url": "https://git.stuce.ch/stuce/calDAVtoCSV" + }, + "original": { + "type": "git", + "url": "https://git.stuce.ch/stuce/calDAVtoCSV" + } + }, + "flake-utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1763049705, + "narHash": "sha256-A5LS0AJZ1yDPTa2fHxufZN++n8MCmtgrJDtxFxrH4S8=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "3acb677ea67d4c6218f33de0db0955f116b7588c", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-25.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "calDavToCsv": "calDavToCsv", + "nixpkgs": "nixpkgs" + } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + } + }, + "root": "root", + "version": 7 +} From 5e5c24c65a24c551d60d87739d6d703db643bcd0 Mon Sep 17 00:00:00 2001 From: Stuce Date: Sun, 16 Nov 2025 12:12:00 +0100 Subject: [PATCH 2/5] . --- flake.lock | 102 ++++++++++++++++++++++++++++++++++++++++++++++++++--- flake.nix | 15 ++++---- 2 files changed, 104 insertions(+), 13 deletions(-) diff --git a/flake.lock b/flake.lock index 7acb779..bed5d23 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ ] }, "locked": { - "lastModified": 1763287383, - "narHash": "sha256-BRitCTYlZ5XqENQOIxZpwFKpJ2eg3elWQMsO7mKwIbs=", + "lastModified": 1763291212, + "narHash": "sha256-4bTzGIb4ifWNiAMR740ptEFcML/bErg2OBEBfNBh/WQ=", "ref": "refs/heads/main", - "rev": "049839b64b47a2384670c6f75151e653a0caa3c8", - "revCount": 2, + "rev": "b083d7134a1bb4fc9721aceabf5df542abed0ff2", + "revCount": 7, "type": "git", "url": "https://git.stuce.ch/stuce/calDAVtoCSV" }, @@ -21,6 +21,43 @@ "url": "https://git.stuce.ch/stuce/calDAVtoCSV" } }, + "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1751685974, + "narHash": "sha256-NKw96t+BgHIYzHUjkTK95FqYRVKB8DHpVhefWSz/kTw=", + "ref": "refs/heads/main", + "rev": "549f2762aebeff29a2e5ece7a7dc0f955281a1d1", + "revCount": 92, + "type": "git", + "url": "https://git.lix.systems/lix-project/flake-compat.git" + }, + "original": { + "type": "git", + "url": "https://git.lix.systems/lix-project/flake-compat.git" + } + }, + "flake-parts": { + "inputs": { + "nixpkgs-lib": [ + "nvf", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1760948891, + "narHash": "sha256-TmWcdiUUaWk8J4lpjzu4gCGxWY6/Ok7mOK4fIFfBuU4=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "864599284fc7c0ba6357ed89ed5e2cd5040f0c04", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": "systems" @@ -39,6 +76,21 @@ "type": "github" } }, + "mnw": { + "locked": { + "lastModified": 1758834834, + "narHash": "sha256-Y7IvY4F8vajZyp3WGf+KaiIVwondEkMFkt92Cr9NZmg=", + "owner": "Gerg-L", + "repo": "mnw", + "rev": "cfbc7d1cc832e318d0863a5fc91d940a96034001", + "type": "github" + }, + "original": { + "owner": "Gerg-L", + "repo": "mnw", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1763049705, @@ -55,10 +107,35 @@ "type": "github" } }, + "nvf": { + "inputs": { + "flake-compat": "flake-compat", + "flake-parts": "flake-parts", + "mnw": "mnw", + "nixpkgs": [ + "nixpkgs" + ], + "systems": "systems_2" + }, + "locked": { + "lastModified": 1762622004, + "narHash": "sha256-NpzzgaoMK8aRHnndHWbYNKLcZN0r1y6icCoJvGoBsoE=", + "owner": "notashelf", + "repo": "nvf", + "rev": "09470524a214ed26633ddc2b6ec0c9bf31a8b909", + "type": "github" + }, + "original": { + "owner": "notashelf", + "repo": "nvf", + "type": "github" + } + }, "root": { "inputs": { "calDavToCsv": "calDavToCsv", - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs", + "nvf": "nvf" } }, "systems": { @@ -75,6 +152,21 @@ "repo": "default", "type": "github" } + }, + "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 5ed9e56..3871942 100644 --- a/flake.nix +++ b/flake.nix @@ -4,10 +4,10 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05"; - # nvf = { - # url = "github:notashelf/nvf"; - # inputs.nixpkgs.follows = "nixpkgs"; - # }; + nvf = { + url = "github:notashelf/nvf"; + inputs.nixpkgs.follows = "nixpkgs"; + }; # home-manager = { # url = "github:nix-community/home-manager"; @@ -21,15 +21,14 @@ outputs = { self, nixpkgs, # home-manager, - # nvf, - calDavToCsv, ... }: { + nvf, calDavToCsv, ... }: { nixosConfigurations.nixos = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; specialArgs = nixpkgs; modules = [ ./configuration.nix - # nvf.nixosModules.default - calDavToCsv.nixosModules.calDAVtoCSV + nvf.nixosModules.default + calDavToCsv.nixosModules # home-manager.nixosModules.home-manager # { # home-manager.useGlobalPkgs = true; From 0f9784e83cfdc082a2651c53989b3973613a06eb Mon Sep 17 00:00:00 2001 From: Stuce Date: Sun, 16 Nov 2025 12:27:15 +0100 Subject: [PATCH 3/5] . --- flake.lock | 44 +++++--------------------------------------- flake.nix | 2 +- 2 files changed, 6 insertions(+), 40 deletions(-) diff --git a/flake.lock b/flake.lock index bed5d23..59d09ed 100644 --- a/flake.lock +++ b/flake.lock @@ -2,17 +2,16 @@ "nodes": { "calDavToCsv": { "inputs": { - "flake-utils": "flake-utils", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1763291212, - "narHash": "sha256-4bTzGIb4ifWNiAMR740ptEFcML/bErg2OBEBfNBh/WQ=", + "lastModified": 1763292373, + "narHash": "sha256-GfhXGH86SUBUbssH4N/0qdCMeCiIHJ7qVLyydoi1d/s=", "ref": "refs/heads/main", - "rev": "b083d7134a1bb4fc9721aceabf5df542abed0ff2", - "revCount": 7, + "rev": "3efe1dad0ca6371329d74342b0b5365518d281f1", + "revCount": 9, "type": "git", "url": "https://git.stuce.ch/stuce/calDAVtoCSV" }, @@ -58,24 +57,6 @@ "type": "github" } }, - "flake-utils": { - "inputs": { - "systems": "systems" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "mnw": { "locked": { "lastModified": 1758834834, @@ -115,7 +96,7 @@ "nixpkgs": [ "nixpkgs" ], - "systems": "systems_2" + "systems": "systems" }, "locked": { "lastModified": 1762622004, @@ -152,21 +133,6 @@ "repo": "default", "type": "github" } - }, - "systems_2": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 3871942..1abfd74 100644 --- a/flake.nix +++ b/flake.nix @@ -28,7 +28,7 @@ modules = [ ./configuration.nix nvf.nixosModules.default - calDavToCsv.nixosModules + calDavToCsv.nixosModules.default # home-manager.nixosModules.home-manager # { # home-manager.useGlobalPkgs = true; From 778fe75aa21a297af8487acb212e76abb356aeeb Mon Sep 17 00:00:00 2001 From: Stuce Date: Sun, 16 Nov 2025 14:14:24 +0100 Subject: [PATCH 4/5] . --- configuration.nix | 2 ++ flake.lock | 8 ++++---- flake.nix | 15 ++++++++------- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/configuration.nix b/configuration.nix index ede61d8..7855b3f 100644 --- a/configuration.nix +++ b/configuration.nix @@ -13,7 +13,9 @@ ./lldap.nix ./vaultwarden.nix ./radicale.nix + ./calDavToCsv.nix ]; + services.calDavToCsv.enable = true; # Add flake support nix.settings.experimental-features = [ "nix-command" "flakes" ]; # Use the GRUB 2 boot loader. diff --git a/flake.lock b/flake.lock index 59d09ed..9bd3068 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1763292373, - "narHash": "sha256-GfhXGH86SUBUbssH4N/0qdCMeCiIHJ7qVLyydoi1d/s=", + "lastModified": 1763298643, + "narHash": "sha256-oFfWpSGnCtLVGUdOzpLExKLIA3Y7UXXGkAot7Ve3mXk=", "ref": "refs/heads/main", - "rev": "3efe1dad0ca6371329d74342b0b5365518d281f1", - "revCount": 9, + "rev": "0979838bf8d869c24957d32e1bae2fc30fa9be20", + "revCount": 11, "type": "git", "url": "https://git.stuce.ch/stuce/calDAVtoCSV" }, diff --git a/flake.nix b/flake.nix index 1abfd74..5ed9e56 100644 --- a/flake.nix +++ b/flake.nix @@ -4,10 +4,10 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05"; - nvf = { - url = "github:notashelf/nvf"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + # nvf = { + # url = "github:notashelf/nvf"; + # inputs.nixpkgs.follows = "nixpkgs"; + # }; # home-manager = { # url = "github:nix-community/home-manager"; @@ -21,14 +21,15 @@ outputs = { self, nixpkgs, # home-manager, - nvf, calDavToCsv, ... }: { + # nvf, + calDavToCsv, ... }: { nixosConfigurations.nixos = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; specialArgs = nixpkgs; modules = [ ./configuration.nix - nvf.nixosModules.default - calDavToCsv.nixosModules.default + # nvf.nixosModules.default + calDavToCsv.nixosModules.calDAVtoCSV # home-manager.nixosModules.home-manager # { # home-manager.useGlobalPkgs = true; From 65b9888e90deb22988e96ec79d03166165a99f51 Mon Sep 17 00:00:00 2001 From: Stuce Date: Sun, 16 Nov 2025 14:32:42 +0100 Subject: [PATCH 5/5] . --- flake.lock | 94 +----------------------------------------------------- 1 file changed, 1 insertion(+), 93 deletions(-) diff --git a/flake.lock b/flake.lock index 9bd3068..6c214fd 100644 --- a/flake.lock +++ b/flake.lock @@ -20,58 +20,6 @@ "url": "https://git.stuce.ch/stuce/calDAVtoCSV" } }, - "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1751685974, - "narHash": "sha256-NKw96t+BgHIYzHUjkTK95FqYRVKB8DHpVhefWSz/kTw=", - "ref": "refs/heads/main", - "rev": "549f2762aebeff29a2e5ece7a7dc0f955281a1d1", - "revCount": 92, - "type": "git", - "url": "https://git.lix.systems/lix-project/flake-compat.git" - }, - "original": { - "type": "git", - "url": "https://git.lix.systems/lix-project/flake-compat.git" - } - }, - "flake-parts": { - "inputs": { - "nixpkgs-lib": [ - "nvf", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1760948891, - "narHash": "sha256-TmWcdiUUaWk8J4lpjzu4gCGxWY6/Ok7mOK4fIFfBuU4=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "864599284fc7c0ba6357ed89ed5e2cd5040f0c04", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "mnw": { - "locked": { - "lastModified": 1758834834, - "narHash": "sha256-Y7IvY4F8vajZyp3WGf+KaiIVwondEkMFkt92Cr9NZmg=", - "owner": "Gerg-L", - "repo": "mnw", - "rev": "cfbc7d1cc832e318d0863a5fc91d940a96034001", - "type": "github" - }, - "original": { - "owner": "Gerg-L", - "repo": "mnw", - "type": "github" - } - }, "nixpkgs": { "locked": { "lastModified": 1763049705, @@ -88,50 +36,10 @@ "type": "github" } }, - "nvf": { - "inputs": { - "flake-compat": "flake-compat", - "flake-parts": "flake-parts", - "mnw": "mnw", - "nixpkgs": [ - "nixpkgs" - ], - "systems": "systems" - }, - "locked": { - "lastModified": 1762622004, - "narHash": "sha256-NpzzgaoMK8aRHnndHWbYNKLcZN0r1y6icCoJvGoBsoE=", - "owner": "notashelf", - "repo": "nvf", - "rev": "09470524a214ed26633ddc2b6ec0c9bf31a8b909", - "type": "github" - }, - "original": { - "owner": "notashelf", - "repo": "nvf", - "type": "github" - } - }, "root": { "inputs": { "calDavToCsv": "calDavToCsv", - "nixpkgs": "nixpkgs", - "nvf": "nvf" - } - }, - "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" + "nixpkgs": "nixpkgs" } } },