From ccf8c750366492e39f2a4a590833815814a61943 Mon Sep 17 00:00:00 2001 From: Michael Thomas Date: Sun, 18 May 2025 08:57:43 -0400 Subject: [PATCH] treewide: switch from nix to lix --- flake.lock | 92 ++++++++++++++++++++++++++++++++++++++++++-- flake.nix | 4 ++ overlays/default.nix | 1 + user/modules/dev.nix | 1 - 4 files changed, 93 insertions(+), 5 deletions(-) diff --git a/flake.lock b/flake.lock index 8ac7243..f224b70 100644 --- a/flake.lock +++ b/flake.lock @@ -222,6 +222,39 @@ "type": "github" } }, + "flake-utils_3": { + "inputs": { + "systems": "systems_4" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "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": [ @@ -313,6 +346,41 @@ "type": "github" } }, + "lix": { + "flake": false, + "locked": { + "lastModified": 1746827285, + "narHash": "sha256-hsFe4Tsqqg4l+FfQWphDtjC79WzNCZbEFhHI8j2KJzw=", + "rev": "47aad376c87e2e65967f17099277428e4b3f8e5a", + "type": "tarball", + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/47aad376c87e2e65967f17099277428e4b3f8e5a.tar.gz?rev=47aad376c87e2e65967f17099277428e4b3f8e5a" + }, + "original": { + "type": "tarball", + "url": "https://git.lix.systems/lix-project/lix/archive/2.93.0.tar.gz" + } + }, + "lix-module": { + "inputs": { + "flake-utils": "flake-utils", + "flakey-profile": "flakey-profile", + "lix": "lix", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1746838955, + "narHash": "sha256-11R4K3iAx4tLXjUs+hQ5K90JwDABD/XHhsM9nkeS5N8=", + "rev": "cd2a9c028df820a83ca2807dc6c6e7abc3dfa7fc", + "type": "tarball", + "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/cd2a9c028df820a83ca2807dc6c6e7abc3dfa7fc.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.93.0.tar.gz" + } + }, "master": { "locked": { "lastModified": 1746825093, @@ -330,7 +398,7 @@ }, "nix-vscode-extensions": { "inputs": { - "flake-utils": "flake-utils", + "flake-utils": "flake-utils_2", "nixpkgs": "nixpkgs" }, "locked": { @@ -521,7 +589,7 @@ }, "nuschtosSearch": { "inputs": { - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils_3", "ixx": "ixx", "nixpkgs": [ "nixvim", @@ -549,6 +617,7 @@ "flake-parts": "flake-parts", "home-manager": "home-manager_2", "hyprpanel": "hyprpanel", + "lix-module": "lix-module", "master": "master", "nix-vscode-extensions": "nix-vscode-extensions", "nixos-wsl": "nixos-wsl", @@ -586,7 +655,7 @@ "nixpkgs": [ "nixpkgs" ], - "systems": "systems_4" + "systems": "systems_5" }, "locked": { "lastModified": 1743595372, @@ -678,6 +747,21 @@ "type": "github" } }, + "systems_6": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -734,7 +818,7 @@ }, "utils": { "inputs": { - "systems": "systems_5" + "systems": "systems_6" }, "locked": { "lastModified": 1731533236, diff --git a/flake.nix b/flake.nix index d077bae..901bf10 100644 --- a/flake.nix +++ b/flake.nix @@ -18,6 +18,10 @@ inputs.nixpkgs.follows = "nixpkgs"; }; nixos-wsl.url = "github:nix-community/NixOS-WSL/main"; + lix-module = { + url = "https://git.lix.systems/lix-project/nixos-module/archive/2.93.0.tar.gz"; + inputs.nixpkgs.follows = "nixpkgs"; + }; utils.url = "github:numtide/flake-utils"; flake-parts.url = "github:hercules-ci/flake-parts"; diff --git a/overlays/default.nix b/overlays/default.nix index 4c02252..c62c7ed 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -33,6 +33,7 @@ # External overlays # Included after the above to ensure modifications are applied + lix = inputs.lix-module.overlays.default; hyprpanel = inputs.hyprpanel.overlay; rust-overlay = inputs.rust-overlay.overlays.default; vscode-extensions = inputs.nix-vscode-extensions.overlays.default; diff --git a/user/modules/dev.nix b/user/modules/dev.nix index b8ff537..79bee47 100644 --- a/user/modules/dev.nix +++ b/user/modules/dev.nix @@ -19,7 +19,6 @@ # Python python3 # Nix - unstable.nixd alejandra # Rust (rust-bin.stable.latest.default.override {