summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDevin Finlinson <devin.finlinson@pm.me>2025-12-05 15:51:51 -0700
committerDevin Finlinson <devin.finlinson@pm.me>2025-12-05 15:51:51 -0700
commit488ee45806803579e65c0c7e42c1e1adf1634d84 (patch)
tree31da518e4844e9b5347a8d1f81f7bc7b7005e297
parent055aea08f91823d4ad32c124fe06e8bd07f2e5c7 (diff)
lix upgrade stuffHEADmaster
-rw-r--r--flake.lock25
-rw-r--r--flake.nix7
-rw-r--r--modules/nixos/lix.nix12
3 files changed, 32 insertions, 12 deletions
diff --git a/flake.lock b/flake.lock
index 9b7074a..0158dfa 100644
--- a/flake.lock
+++ b/flake.lock
@@ -643,36 +643,38 @@
"lix": {
"flake": false,
"locked": {
- "lastModified": 1753223229,
- "narHash": "sha256-tkT4aCZZE6IEmjYotOzKKa2rV3pGpH3ZREeQn7ACgdU=",
- "rev": "7ac20fc47cf2f1b7469c7a2f379e5a3a51a6789a",
+ "lastModified": 1764956195,
+ "narHash": "sha256-GQkAJ1h0P1lO9X5cAWTsGjwn/J9C+6s6zlXjw1qluOU=",
+ "rev": "74f5d66b391e63fbf33fc9d6c427221298cd6141",
"type": "tarball",
- "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/7ac20fc47cf2f1b7469c7a2f379e5a3a51a6789a.tar.gz?rev=7ac20fc47cf2f1b7469c7a2f379e5a3a51a6789a"
+ "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/74f5d66b391e63fbf33fc9d6c427221298cd6141.tar.gz?rev=74f5d66b391e63fbf33fc9d6c427221298cd6141"
},
"original": {
"type": "tarball",
- "url": "https://git.lix.systems/lix-project/lix/archive/release-2.93.tar.gz"
+ "url": "https://git.lix.systems/lix-project/lix/archive/main.tar.gz"
}
},
"lix-module": {
"inputs": {
"flake-utils": "flake-utils",
"flakey-profile": "flakey-profile",
- "lix": "lix",
+ "lix": [
+ "lix"
+ ],
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
- "lastModified": 1753282722,
- "narHash": "sha256-KYMUrTV7H/RR5/HRnjV5R3rRIuBXMemyJzTLi50NFTs=",
- "rev": "46a9e8fcfe4be72b4c7c8082ee11d2c42da1e873",
+ "lastModified": 1764519849,
+ "narHash": "sha256-XnNABKfIYKSimQVvKc9FnlC2H0LurOhd9MS6l0Z67lE=",
+ "rev": "6c95c0b6f73f831226453fc6905c216ab634c30f",
"type": "tarball",
- "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/46a9e8fcfe4be72b4c7c8082ee11d2c42da1e873.tar.gz?rev=46a9e8fcfe4be72b4c7c8082ee11d2c42da1e873"
+ "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/6c95c0b6f73f831226453fc6905c216ab634c30f.tar.gz?rev=6c95c0b6f73f831226453fc6905c216ab634c30f"
},
"original": {
"type": "tarball",
- "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.93.3-1.tar.gz"
+ "url": "https://git.lix.systems/lix-project/nixos-module/archive/main.tar.gz"
}
},
"lowdown-src": {
@@ -955,6 +957,7 @@
"home-manager": "home-manager",
"hugo-congo": "hugo-congo",
"hyprland": "hyprland",
+ "lix": "lix",
"lix-module": "lix-module",
"microvm": "microvm",
"modded-minecraft-servers": "modded-minecraft-servers",
diff --git a/flake.nix b/flake.nix
index 1712a31..42a0d04 100644
--- a/flake.nix
+++ b/flake.nix
@@ -14,9 +14,14 @@
};
# alternative nix compiler
+ lix = {
+ url = "https://git.lix.systems/lix-project/lix/archive/main.tar.gz";
+ flake = false;
+ };
lix-module = {
- url = "https://git.lix.systems/lix-project/nixos-module/archive/2.93.3-1.tar.gz";
+ url = "https://git.lix.systems/lix-project/nixos-module/archive/main.tar.gz";
inputs.nixpkgs.follows = "nixpkgs";
+ inputs.lix.follows = "lix";
};
#for device formatting
diff --git a/modules/nixos/lix.nix b/modules/nixos/lix.nix
new file mode 100644
index 0000000..f116fb1
--- /dev/null
+++ b/modules/nixos/lix.nix
@@ -0,0 +1,12 @@
+{ pkgs, ... }:
+{
+ nixpkgs.overlays = [ (final: prev: {
+ inherit (prev.lixPackageSets.stable)
+ nixpkgs-review
+ nix-eval-jobs
+ nix-fast-build
+ colmena;
+ }) ];
+
+ nix.package = pkgs.lixPackageSets.stable.lix;
+} \ No newline at end of file