From 1cee88929a3a886d460df946c9fefebf165b827e Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Wed, 15 May 2024 16:53:41 +0200 Subject: [PATCH] Use `lix` fork --- flake.lock | 94 ++++++++++++++++++++++++++++++++++++++++- flake.nix | 9 ++++ hosts/module.nix | 1 + modules/nix/default.nix | 5 ++- 4 files changed, 107 insertions(+), 2 deletions(-) diff --git a/flake.lock b/flake.lock index 59f2448..c5ec0c4 100644 --- a/flake.lock +++ b/flake.lock @@ -487,6 +487,24 @@ "type": "github" } }, + "flake-utils_3": { + "inputs": { + "systems": "systems_4" + }, + "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" + } + }, "flakeParts": { "inputs": { "nixpkgs-lib": "nixpkgs-lib_2" @@ -505,6 +523,21 @@ "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": [ @@ -719,6 +752,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": [ + "nixpkgsUnstable" + ] + }, + "locked": { + "lastModified": 1715442723, + "narHash": "sha256-pXMH7lqr5bT2FjH/3tEdTT/+1+hKx+15WkcGKycWWSM=", + "ref": "refs/heads/main", + "rev": "87b7b7e4bd936301b139e472589d1966b136f45f", + "revCount": 76, + "type": "git", + "url": "https://git.lix.systems/lix-project/nixos-module" + }, + "original": { + "type": "git", + "url": "https://git.lix.systems/lix-project/nixos-module" + } + }, "nix-fast-build": { "inputs": { "flake-parts": "flake-parts_5", @@ -1337,7 +1412,7 @@ "pre-commit-hooks": { "inputs": { "flake-compat": "flake-compat", - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils_3", "gitignore": "gitignore", "nixpkgs": [ "nixpkgsUnstable" @@ -1435,6 +1510,8 @@ "hercules-ci-effects": "hercules-ci-effects_2", "homeManager": "homeManager", "homeManagerGitWorkspace": "homeManagerGitWorkspace", + "lix": "lix", + "lix-module": "lix-module", "nix-fast-build": "nix-fast-build", "nix-on-droid": "nix-on-droid", "nixDarwin": "nixDarwin", @@ -1533,6 +1610,21 @@ "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" + } + }, "tow-boot": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index 62908f4..6798b8b 100644 --- a/flake.nix +++ b/flake.nix @@ -52,6 +52,15 @@ }; nix-on-droid.url = "github:nix-community/nix-on-droid"; nixd.url = "github:nix-community/nixd"; + 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 = "nixpkgsUnstable"; + }; }; outputs = inputs @ {flakeParts, ...}: diff --git a/hosts/module.nix b/hosts/module.nix index 507d279..8a4f3b6 100644 --- a/hosts/module.nix +++ b/hosts/module.nix @@ -206,6 +206,7 @@ in { nixpkgs.overlays = config.overlays; }) "${self.outPath}/hosts/${hostname}" + inputs.lix-module.nixosModules.default ] ++ (lib.optionals (config.secrets != []) [ inputs.agenix.nixosModules.default diff --git a/modules/nix/default.nix b/modules/nix/default.nix index 9ee18a5..db4ab4f 100644 --- a/modules/nix/default.nix +++ b/modules/nix/default.nix @@ -8,7 +8,8 @@ nix = { optimise.automatic = true; - package = pkgs.nixVersions.latest; + # Commented out otherwise Lix is not set + # package = pkgs.nixVersions.latest; settings = { auto-optimise-store = true; @@ -21,10 +22,12 @@ substituters = [ # "s3://cache?profile=default®ion=eu-south-1&scheme=https&endpoint=cache.aciceri.dev" "https://cache.iog.io" + "https://cache.lix.systems" ]; trusted-public-keys = [ # "cache.aciceri.dev~1:nJMfcBnYieY2WMbYDG0s9S5qUhU+V4RPL+X9zcxXxZY=" "hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ=" + "cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o=" ]; };