From 7f7df52c7943fbeca06b00b1693d4dfe3d66abbe Mon Sep 17 00:00:00 2001 From: Grisha Shipunov Date: Tue, 21 Jan 2025 23:09:25 +0100 Subject: switch toaster to stable, add lix --- flake.nix | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) (limited to 'flake.nix') diff --git a/flake.nix b/flake.nix index 08ae017..e868ea9 100644 --- a/flake.nix +++ b/flake.nix @@ -1,13 +1,13 @@ { inputs = { nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; - nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-24.11"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; flake-utils.url = "github:numtide/flake-utils"; sops-nix = { url = "github:Mic92/sops-nix"; - inputs.nixpkgs.follows = "nixpkgs-stable"; + inputs.nixpkgs.follows = "nixpkgs"; }; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; @@ -15,19 +15,24 @@ microvm = { url = "github:astro/microvm.nix/v0.5.0"; inputs = { - nixpkgs.follows = "nixpkgs-stable"; + nixpkgs.follows = "nixpkgs"; flake-utils.follows = "flake-utils"; }; }; lanzaboote = { url = "github:nix-community/lanzaboote/v0.4.1"; - inputs.nixpkgs.follows = "nixpkgs-unstable"; + inputs.nixpkgs.follows = "nixpkgs"; }; authentik-nix = { url = "github:nix-community/authentik-nix"; - inputs.nixpkgs.follows = "nixpkgs-stable"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + + lix-module = { + url = "https://git.lix.systems/lix-project/nixos-module/archive/2.92.0.tar.gz"; + inputs.nixpkgs.follows = "nixpkgs"; }; tmux-yank = { @@ -42,9 +47,10 @@ authentik-nix, flake-utils, lanzaboote, + lix-module, microvm, nixos-hardware, - nixpkgs-stable, + nixpkgs, nixpkgs-unstable, sops-nix, ... @@ -52,13 +58,14 @@ { nixosConfigurations = { - toaster = nixpkgs-unstable.lib.nixosSystem { + toaster = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; specialArgs = { inherit inputs; }; modules = [ sops-nix.nixosModules.sops lanzaboote.nixosModules.lanzaboote nixos-hardware.nixosModules.lenovo-thinkpad-t14-amd-gen3 + lix-module.nixosModules.default ./hosts/toaster @@ -77,7 +84,7 @@ ./modules/wg ]; }; - cloud = nixpkgs-stable.lib.nixosSystem { + cloud = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; specialArgs = { inherit inputs; }; modules = [ @@ -91,7 +98,7 @@ ./modules/wg ]; }; - minime = nixpkgs-stable.lib.nixosSystem { + minime = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; specialArgs = { inherit inputs; }; modules = [ @@ -106,7 +113,7 @@ ]; }; - auth = nixpkgs-stable.lib.nixosSystem { + auth = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; specialArgs = { inherit inputs; }; modules = [ @@ -120,7 +127,7 @@ ]; }; - radicale = nixpkgs-stable.lib.nixosSystem { + radicale = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; specialArgs = { inherit inputs; }; modules = [ -- cgit v1.3.1