From 5e5c24c65a24c551d60d87739d6d703db643bcd0 Mon Sep 17 00:00:00 2001 From: Stuce Date: Sun, 16 Nov 2025 12:12:00 +0100 Subject: [PATCH] . --- 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;