feat: upgrade to Lix
Some checks are pending
Continuous Integration / Checks (push) Waiting to run

This commit is contained in:
Tim Schubert 2024-09-20 18:23:32 +02:00
parent 532c25a0c5
commit 11ac1b84b7
Signed by: dadada
SSH key fingerprint: SHA256:bFAjFH3hR8zRBaJjzQDjc3o4jqoq5EZ87l+KXEjxIz0
4 changed files with 69 additions and 4 deletions

53
flake.lock generated
View file

@ -101,6 +101,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"
}
},
"home-manager": {
"inputs": {
"nixpkgs": [
@ -157,6 +172,43 @@
"url": "https://git.dadada.li/dadada/dadada.li/archive/main.tar.gz"
}
},
"lix": {
"flake": false,
"locked": {
"lastModified": 1723503926,
"narHash": "sha256-Rosl9iA9MybF5Bud4BTAQ9adbY81aGmPfV8dDBGl34s=",
"rev": "bcaeb6388b8916ac6d1736e3aa2b13313e6a6bd2",
"type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/bcaeb6388b8916ac6d1736e3aa2b13313e6a6bd2.tar.gz?rev=bcaeb6388b8916ac6d1736e3aa2b13313e6a6bd2"
},
"original": {
"type": "tarball",
"url": "https://git.lix.systems/lix-project/lix/archive/2.91.0.tar.gz"
}
},
"lix-module": {
"inputs": {
"flake-utils": [
"flake-utils"
],
"flakey-profile": "flakey-profile",
"lix": "lix",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1723510904,
"narHash": "sha256-zNW/rqNJwhq2lYmQf19wJerRuNimjhxHKmzrWWFJYts=",
"rev": "622a2253a071a1fb97a4d3c8103a91114acc1140",
"type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/622a2253a071a1fb97a4d3c8103a91114acc1140.tar.gz"
},
"original": {
"type": "tarball",
"url": "https://git.lix.systems/lix-project/nixos-module/archive/2.91.0.tar.gz"
}
},
"nixlib": {
"locked": {
"lastModified": 1726362065,
@ -249,6 +301,7 @@
"flake-utils": "flake-utils",
"home-manager": "home-manager_2",
"homepage": "homepage",
"lix-module": "lix-module",
"nixos-generators": "nixos-generators",
"nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs",

View file

@ -25,6 +25,11 @@
url = "github:numtide/devshell";
inputs.nixpkgs.follows = "nixpkgs";
};
lix-module = {
url = "https://git.lix.systems/lix-project/nixos-module/archive/2.91.0.tar.gz";
inputs.nixpkgs.follows = "nixpkgs";
inputs.flake-utils.follows = "flake-utils";
};
nixos-generators = {
url = "github:nix-community/nixos-generators";
inputs.nixpkgs.follows = "nixpkgs";

View file

@ -1,5 +1,6 @@
{ self
, agenix
, lix-module
, nixpkgs
, nixpkgs-full
, home-manager
@ -9,13 +10,17 @@
, ...
}@inputs:
let
lixModule = lix-module.nixosModules.default;
nixosSystem = { n_nixpkgs ? nixpkgs, system ? "x86_64-linux", extraModules ? [ ] }: n_nixpkgs.lib.nixosSystem {
inherit system;
modules = [{
nixpkgs.overlays = n_nixpkgs.lib.attrValues self.overlays;
}] ++ (n_nixpkgs.lib.attrValues self.nixosModules) ++ [ agenix.nixosModules.age ] ++ extraModules;
modules = [
lixModule
{
nixpkgs.overlays = n_nixpkgs.lib.attrValues self.overlays;
}
] ++ (n_nixpkgs.lib.attrValues self.nixosModules) ++ [ agenix.nixosModules.age ] ++ extraModules;
};
in
{
@ -68,6 +73,7 @@ in
installer = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
modules = [
lixModule
nixos-generators.nixosModules.install-iso
self.nixosModules.admin
{

View file

@ -3,6 +3,7 @@
, flake-utils
, flake-registry
, homepage
, lix-module
, nixpkgs
, home-manager
, nixos-hardware