From 5931e932cdb6d0255d23f3e8f4c334bb2f6a91f3 Mon Sep 17 00:00:00 2001 From: Stefan Ellmauthaler Date: Thu, 22 Aug 2024 09:50:51 +0200 Subject: [PATCH] Use lix instead of nix Signed-off-by: Stefan Ellmauthaler --- flake.lock | 89 +++++++++++++++++++++++++++++++++++++++++++++++++++++- flake.nix | 12 ++++++++ 2 files changed, 100 insertions(+), 1 deletion(-) diff --git a/flake.lock b/flake.lock index bc46bc3..ae4714a 100644 --- a/flake.lock +++ b/flake.lock @@ -188,6 +188,39 @@ "type": "github" } }, + "flake-utils_3": { + "inputs": { + "systems": "systems_3" + }, + "locked": { + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flakey-profile": { + "locked": { + "lastModified": 1712898590, + "narHash": "sha256-FhGIEU93VHAChKEXx905TSiPZKga69bWl1VB37FK//I=", + "owner": "lf-", + "repo": "flakey-profile", + "rev": "243c903fd8eadc0f63d205665a92d4df91d42d9d", + "type": "github" + }, + "original": { + "owner": "lf-", + "repo": "flakey-profile", + "type": "github" + } + }, "glpi-inventory": { "inputs": { "nixpkgs": [ @@ -232,6 +265,43 @@ "type": "github" } }, + "lix": { + "flake": false, + "locked": { + "lastModified": 1724311200, + "narHash": "sha256-z5RuyNFPrVZkbSlEbMhFgfR+5AAG/3WCMjJTktaGsR0=", + "rev": "f2e7f8bab875809e8b489e1e5a7aa8572bb4bc13", + "type": "tarball", + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/f2e7f8bab875809e8b489e1e5a7aa8572bb4bc13.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://git.lix.systems/lix-project/lix/archive/main.tar.gz" + } + }, + "lix-module": { + "inputs": { + "flake-utils": "flake-utils_3", + "flakey-profile": "flakey-profile", + "lix": [ + "lix" + ], + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1723511483, + "narHash": "sha256-rT/OkVXKkns2YvyF1nFvl+8Gc3sld1c1sXPtGkbqaDY=", + "rev": "cecf70b77539c1a593f60ec9d0305b5e537ab6a9", + "type": "tarball", + "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/cecf70b77539c1a593f60ec9d0305b5e537ab6a9.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://git.lix.systems/lix-project/nixos-module/archive/main.tar.gz" + } + }, "lowdown-src": { "flake": false, "locked": { @@ -424,6 +494,8 @@ "flake-utils-plus": "flake-utils-plus", "glpi-inventory": "glpi-inventory", "home-manager": "home-manager", + "lix": "lix", + "lix-module": "lix-module", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_2", "nixpkgs-unstable": "nixpkgs-unstable", @@ -523,9 +595,24 @@ "type": "github" } }, + "systems_4": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "utils": { "inputs": { - "systems": "systems_3" + "systems": "systems_4" }, "locked": { "lastModified": 1709126324, diff --git a/flake.nix b/flake.nix index 341922c..5c077b7 100644 --- a/flake.nix +++ b/flake.nix @@ -11,6 +11,17 @@ # inputs.nixpkgs.follows = "nixpkgs"; #}; + lix = { + url = "https://git.lix.systems/lix-project/lix/archive/main.tar.gz"; + flake = false; + }; + + lix-module = { + url = "https://git.lix.systems/lix-project/nixos-module/archive/main.tar.gz"; + inputs.nixpkgs.follows = "nixpkgs"; + inputs.lix.follows = "lix"; + }; + nixos-hardware = {url = "github:NixOS/nixos-hardware/master";}; home-manager = { @@ -123,6 +134,7 @@ inputs.simple-nixos-mailserver.nixosModules.mailserver ./common/wireguard.nix inputs.glpi-inventory.nixosModules.glpi-inventory + inputs.lix-module.nixosModules.default ] ++ (map (name: ./modules + "/${name}") (moduleNames ./modules)); specialArgs = {