From bf67950b31e2bcccd7191a7769f06c68e6a3569d Mon Sep 17 00:00:00 2001 From: buffet Date: Tue, 21 May 2024 19:27:35 +0200 Subject: [PATCH] feat: switch to lix --- flake.lock | 92 +++++++++++++++++++++++++++++++++++++++++ flake.nix | 11 +++++ hosts/alice/default.nix | 2 + 3 files changed, 105 insertions(+) diff --git a/flake.lock b/flake.lock index 494884a..f81df8a 100644 --- a/flake.lock +++ b/flake.lock @@ -101,6 +101,39 @@ "type": "github" } }, + "flake-utils_2": { + "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" + } + }, "gitignore": { "inputs": { "nixpkgs": [ @@ -143,6 +176,48 @@ "type": "github" } }, + "lix": { + "flake": false, + "locked": { + "lastModified": 1714955862, + "narHash": "sha256-REWlo2RYHfJkxnmZTEJu3Cd/2VM+wjjpPy7Xi4BdDTQ=", + "ref": "refs/tags/2.90-beta.1", + "rev": "b6799ab0374a8e1907a48915d3187e07da41d88c", + "revCount": 15501, + "type": "git", + "url": "https://git@git.lix.systems/lix-project/lix" + }, + "original": { + "ref": "refs/tags/2.90-beta.1", + "type": "git", + "url": "https://git@git.lix.systems/lix-project/lix" + } + }, + "lix-module": { + "inputs": { + "flake-utils": "flake-utils_2", + "flakey-profile": "flakey-profile", + "lix": [ + "lix" + ], + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1715885250, + "narHash": "sha256-IUFYAl3158Ig5vySnRBHoPReb2/S97bjodCo6FhzJv4=", + "ref": "refs/heads/main", + "rev": "53d713eb486f21d653af3ef3528e9a19ecfc45e5", + "revCount": 81, + "type": "git", + "url": "https://git.lix.systems/lix-project/nixos-module" + }, + "original": { + "type": "git", + "url": "https://git.lix.systems/lix-project/nixos-module" + } + }, "nix-index-database": { "inputs": { "nixpkgs": [ @@ -284,6 +359,8 @@ "disko": "disko", "flake-utils": "flake-utils", "home-manager": "home-manager", + "lix": "lix", + "lix-module": "lix-module", "nix-index-database": "nix-index-database", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", @@ -323,6 +400,21 @@ "type": "github" } }, + "systems_3": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "website": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index add4d00..ecf1455 100644 --- a/flake.nix +++ b/flake.nix @@ -37,6 +37,17 @@ inputs.nixpkgs.follows = "nixpkgs"; }; + lix = { + url = "git+https://git@git.lix.systems/lix-project/lix?ref=refs/tags/2.90-beta.1"; + flake = false; + }; + + lix-module = { + url = "git+https://git.lix.systems/lix-project/nixos-module"; + inputs.lix.follows = "lix"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + nix-index-database = { url = "github:Mic92/nix-index-database"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/hosts/alice/default.nix b/hosts/alice/default.nix index 20d19c5..f164620 100644 --- a/hosts/alice/default.nix +++ b/hosts/alice/default.nix @@ -1,6 +1,7 @@ { agenix, home-manager, + lix-module, nixos-hardware, nur, pkgs, @@ -11,6 +12,7 @@ ./system.nix agenix.nixosModules.default home-manager.nixosModule + lix-module.nixosModules.default nur.nixosModules.nur ./borg.nix