From 532c25a0c5734019c1db591458f58f7bb582fd72 Mon Sep 17 00:00:00 2001
From: Tim Schubert <dadada@dadada.li>
Date: Fri, 20 Sep 2024 16:34:40 +0200
Subject: [PATCH 1/2] chore: update flake inputs
---
flake.lock | 48 ++++++++++++++++++++++++------------------------
1 file changed, 24 insertions(+), 24 deletions(-)
diff --git a/flake.lock b/flake.lock
index e86e642..aa39a63 100644
--- a/flake.lock
+++ b/flake.lock
@@ -88,11 +88,11 @@
]
},
"locked": {
- "lastModified": 1710146030,
- "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
+ "lastModified": 1726560853,
+ "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
"owner": "numtide",
"repo": "flake-utils",
- "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
+ "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
"type": "github"
},
"original": {
@@ -129,11 +129,11 @@
]
},
"locked": {
- "lastModified": 1720042825,
- "narHash": "sha256-A0vrUB6x82/jvf17qPCpxaM+ulJnD8YZwH9Ci0BsAzE=",
+ "lastModified": 1726818100,
+ "narHash": "sha256-z2V74f5vXqkN5Q+goFlhbFXY/dNaBAyeLpr2bxu4Eic=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "e1391fb22e18a36f57e6999c7a9f966dc80ac073",
+ "rev": "1bbc1a5a1f4de7401c92db85b2119ed21bb4139d",
"type": "github"
},
"original": {
@@ -159,11 +159,11 @@
},
"nixlib": {
"locked": {
- "lastModified": 1723337705,
- "narHash": "sha256-znSU0DeNDPt7+LMAfFkvKloMaeQ6yl/U5SqV/ktl1vA=",
+ "lastModified": 1726362065,
+ "narHash": "sha256-4h15WKdrs9zf6DGaeeV7ntU/pHHGkH6geYt1QBW0CP4=",
"owner": "nix-community",
"repo": "nixpkgs.lib",
- "rev": "ace7856d327b618d3777e31b1f224b3ab57ed71a",
+ "rev": "9db4db09d82e4b2207bfa7f1e747a4f49d214555",
"type": "github"
},
"original": {
@@ -180,11 +180,11 @@
]
},
"locked": {
- "lastModified": 1723683171,
- "narHash": "sha256-hQMQQHOVVkiCO5hmbjI3EVimWFIkRNkGIGUhyIQ0mQ0=",
+ "lastModified": 1726817511,
+ "narHash": "sha256-r3R7zZzGklN0udSO/JhWbU/xyq6i1aXKKwfs33LUVls=",
"owner": "nix-community",
"repo": "nixos-generators",
- "rev": "1cb3dc2f3af215ea40911de8fd0942c1ff3fb673",
+ "rev": "bfa25c9065f4cb5d884a0ad70f6e82f55ae90448",
"type": "github"
},
"original": {
@@ -195,11 +195,11 @@
},
"nixos-hardware": {
"locked": {
- "lastModified": 1723310128,
- "narHash": "sha256-IiH8jG6PpR4h9TxSGMYh+2/gQiJW9MwehFvheSb5rPc=",
+ "lastModified": 1726724509,
+ "narHash": "sha256-sVeAM1tgVi52S1e29fFBTPUAFSzgQwgLon3CrztXGm8=",
"owner": "NixOS",
"repo": "nixos-hardware",
- "rev": "c54cf53e022b0b3c1d3b8207aa0f9b194c24f0cf",
+ "rev": "10d5e0ecc32984c1bf1a9a46586be3451c42fd94",
"type": "github"
},
"original": {
@@ -211,11 +211,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1723746470,
- "narHash": "sha256-xOWtLQpYetDWPlOvAo04as/ocpGTm1W556zfA24Vdh4=",
+ "lastModified": 1726688310,
+ "narHash": "sha256-Xc9lEtentPCEtxc/F1e6jIZsd4MPDYv4Kugl9WtXlz0=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "9bbda8b76be48dd59d352199d06c24d61b94206a",
+ "rev": "dbebdd67a6006bb145d98c8debf9140ac7e651d0",
"type": "github"
},
"original": {
@@ -227,11 +227,11 @@
},
"nixpkgs-full": {
"locked": {
- "lastModified": 1723688146,
- "narHash": "sha256-sqLwJcHYeWLOeP/XoLwAtYjr01TISlkOfz+NG82pbdg=",
+ "lastModified": 1726447378,
+ "narHash": "sha256-2yV8nmYE1p9lfmLHhOCbYwQC/W8WYfGQABoGzJOb1JQ=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "c3d4ac725177c030b1e289015989da2ad9d56af0",
+ "rev": "086b448a5d54fd117f4dc2dee55c9f0ff461bdc1",
"type": "github"
},
"original": {
@@ -279,11 +279,11 @@
]
},
"locked": {
- "lastModified": 1723808491,
- "narHash": "sha256-rhis3qNuGmJmYC/okT7Dkc4M8CeUuRCSvW6kC2f3hBc=",
+ "lastModified": 1726734507,
+ "narHash": "sha256-VUH5O5AcOSxb0uL/m34dDkxFKP6WLQ6y4I1B4+N3L2w=",
"owner": "numtide",
"repo": "treefmt-nix",
- "rev": "1d07739554fdc4f8481068f1b11d6ab4c1a4167a",
+ "rev": "ee41a466c2255a3abe6bc50fc6be927cdee57a9f",
"type": "github"
},
"original": {
From 11ac1b84b78831ed590356b214246d350b66cbac Mon Sep 17 00:00:00 2001
From: Tim Schubert <dadada@dadada.li>
Date: Fri, 20 Sep 2024 18:23:32 +0200
Subject: [PATCH 2/2] feat: upgrade to Lix
---
flake.lock | 53 ++++++++++++++++++++++++++++++++++++++++
flake.nix | 5 ++++
nixos/configurations.nix | 14 ++++++++---
outputs.nix | 1 +
4 files changed, 69 insertions(+), 4 deletions(-)
diff --git a/flake.lock b/flake.lock
index aa39a63..9cc797c 100644
--- a/flake.lock
+++ b/flake.lock
@@ -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",
diff --git a/flake.nix b/flake.nix
index 1e28a54..5e512b9 100644
--- a/flake.nix
+++ b/flake.nix
@@ -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";
diff --git a/nixos/configurations.nix b/nixos/configurations.nix
index 41aabe8..040ec6b 100644
--- a/nixos/configurations.nix
+++ b/nixos/configurations.nix
@@ -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
{
diff --git a/outputs.nix b/outputs.nix
index b96b7bb..efa3dab 100644
--- a/outputs.nix
+++ b/outputs.nix
@@ -3,6 +3,7 @@
, flake-utils
, flake-registry
, homepage
+, lix-module
, nixpkgs
, home-manager
, nixos-hardware