From cba81505552bb0e1d4d35402e1ad7917911009b2 Mon Sep 17 00:00:00 2001 From: Grisha Shipunov Date: Sun, 31 Aug 2025 11:23:03 +0200 Subject: switch to nixpkgs lix --- flake.lock | 171 -------------------------------------------- flake.nix | 20 ------ modules/basic-tools/nix.nix | 19 +++++ modules/devtools.nix | 2 - 4 files changed, 19 insertions(+), 193 deletions(-) diff --git a/flake.lock b/flake.lock index d0882d2..5e66c42 100644 --- a/flake.lock +++ b/flake.lock @@ -169,72 +169,6 @@ "type": "github" } }, - "flake-utils_3": { - "inputs": { - "systems": "systems_3" - }, - "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" - } - }, - "flake-utils_4": { - "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" - } - }, - "flakey-profile_2": { - "locked": { - "lastModified": 1712898590, - "narHash": "sha256-FhGIEU93VHAChKEXx905TSiPZKga69bWl1VB37FK//I=", - "owner": "lf-", - "repo": "flakey-profile", - "rev": "243c903fd8eadc0f63d205665a92d4df91d42d9d", - "type": "github" - }, - "original": { - "owner": "lf-", - "repo": "flakey-profile", - "type": "github" - } - }, "gitignore": { "inputs": { "nixpkgs": [ @@ -283,78 +217,6 @@ "type": "github" } }, - "lix": { - "flake": false, - "locked": { - "lastModified": 1750762203, - "narHash": "sha256-LmQhjQ7c+AOkwhvR9GFgJOy8oHW35MoQRELtrwyVnPw=", - "rev": "38b358ce27203f972faa2973cf44ba80c758f46e", - "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/38b358ce27203f972faa2973cf44ba80c758f46e.tar.gz?rev=38b358ce27203f972faa2973cf44ba80c758f46e" - }, - "original": { - "type": "tarball", - "url": "https://git.lix.systems/lix-project/lix/archive/release-2.93.tar.gz" - } - }, - "lix-main": { - "flake": false, - "locked": { - "lastModified": 1756265386, - "narHash": "sha256-AGzXkcbafClvd31K/C/Nb9MByIws+WV0lYKQ1JzvVQA=", - "rev": "fe6395cd4d7aa1ffd415cb2267ff431b5c66152f", - "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/fe6395cd4d7aa1ffd415cb2267ff431b5c66152f.tar.gz?rev=fe6395cd4d7aa1ffd415cb2267ff431b5c66152f" - }, - "original": { - "type": "tarball", - "url": "https://git.lix.systems/lix-project/lix/archive/main.tar.gz" - } - }, - "lix-module": { - "inputs": { - "flake-utils": "flake-utils_3", - "flakey-profile": "flakey-profile", - "lix": "lix", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1750776670, - "narHash": "sha256-EfA5K5EZAnspmraJrXQlziffVpaT+QDBiE6yKmuaNNQ=", - "rev": "c3c78a32273e89d28367d8605a4c880f0b6607e3", - "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/c3c78a32273e89d28367d8605a4c880f0b6607e3.tar.gz?rev=c3c78a32273e89d28367d8605a4c880f0b6607e3" - }, - "original": { - "type": "tarball", - "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.93.1.tar.gz" - } - }, - "lix-module-main": { - "inputs": { - "flake-utils": "flake-utils_4", - "flakey-profile": "flakey-profile_2", - "lix": [ - "lix-main" - ], - "nixpkgs": [ - "nixpkgs-unstable" - ] - }, - "locked": { - "lastModified": 1756511062, - "narHash": "sha256-IgD1JR7scSEwlK/YAbmrcTWpAYT30LPldCUHdzXkaMs=", - "rev": "3f09a5eb772e02d98bb8878ab687d5b721f00d16", - "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/3f09a5eb772e02d98bb8878ab687d5b721f00d16.tar.gz?rev=3f09a5eb772e02d98bb8878ab687d5b721f00d16" - }, - "original": { - "type": "tarball", - "url": "https://git.lix.systems/lix-project/nixos-module/archive/main.tar.gz" - } - }, "microvm": { "inputs": { "flake-utils": [ @@ -582,9 +444,6 @@ "authentik-nix": "authentik-nix", "flake-utils": "flake-utils_2", "lanzaboote": "lanzaboote", - "lix-main": "lix-main", - "lix-module": "lix-module", - "lix-module-main": "lix-module-main", "microvm": "microvm", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_2", @@ -681,36 +540,6 @@ "type": "github" } }, - "systems_3": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_4": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "tmux-yank": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index 7f48943..08396fc 100644 --- a/flake.nix +++ b/flake.nix @@ -3,22 +3,6 @@ nixpkgs-unstable.url = "github:nixos/nixpkgs?ref=nixos-unstable"; nixpkgs.url = "github:NixOS/nixpkgs?ref=nixos-25.05"; - lix-module = { - url = "https://git.lix.systems/lix-project/nixos-module/archive/2.93.1.tar.gz"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - - lix-main = { - url = "https://git.lix.systems/lix-project/lix/archive/main.tar.gz"; - flake = false; - }; - - lix-module-main = { - url = "https://git.lix.systems/lix-project/nixos-module/archive/main.tar.gz"; - inputs.nixpkgs.follows = "nixpkgs-unstable"; - inputs.lix.follows = "lix-main"; - }; - flake-utils.url = "github:numtide/flake-utils"; sops-nix = { @@ -60,8 +44,6 @@ outputs = inputs@{ lanzaboote, - lix-module, - lix-module-main, microvm, nixos-hardware, nixpkgs, @@ -118,7 +100,6 @@ sops-nix.nixosModules.sops lanzaboote.nixosModules.lanzaboote nixos-hardware.nixosModules.lenovo-thinkpad-t14-amd-gen3 - lix-module-main.nixosModules.default ./hosts/toaster @@ -155,7 +136,6 @@ modules = [ sops-nix.nixosModules.sops microvm.nixosModules.host - lix-module.nixosModules.default ./hosts/minime ./modules/basic-tools diff --git a/modules/basic-tools/nix.nix b/modules/basic-tools/nix.nix index a67c6a8..c3bc1d7 100644 --- a/modules/basic-tools/nix.nix +++ b/modules/basic-tools/nix.nix @@ -3,8 +3,27 @@ ... }: { + nixpkgs.overlays = [ + (final: prev: { + inherit (final.lixPackageSets.latest) + nixpkgs-review + nix-eval-jobs + nix-fast-build + colmena + ; + }) + ]; + + programs.direnv = { + enable = true; + nix-direnv.enable = true; + nix-direnv.package = pkgs.lixPackageSets.latest.nix-direnv; + + }; nix = { + package = pkgs.lixPackageSets.latest.lix; + extraOptions = '' experimental-features = nix-command flakes narinfo-cache-negative-ttl = 0 diff --git a/modules/devtools.nix b/modules/devtools.nix index bf8cf1b..2b81952 100644 --- a/modules/devtools.nix +++ b/modules/devtools.nix @@ -42,6 +42,4 @@ package = pkgs.wireshark; }; users.users."0xa".extraGroups = [ "wireshark" ]; - - programs.direnv.enable = true; } -- cgit v1.3.1