diff --git a/flake.lock b/flake.lock --- a/flake.lock +++ b/flake.lock @@ -53,11 +53,11 @@ "nixpkgs" ] }, "locked": { - "lastModified": 1770922915, - "narHash": "sha256-6J/JoK9iL7sHvKJcGW2KId2agaKv1OGypsa7kN+ZBD4=", + "lastModified": 1772379624, + "narHash": "sha256-NG9LLTWlz4YiaTAiRGChbrzbVxBfX+Auq4Ab/SWmk4A=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "6c5a56295d2a24e43bcd8af838def1b9a95746b2", + "rev": "52d061516108769656a8bd9c6e811c677ec5b462", "type": "github" }, "original": { @@ -91,11 +91,11 @@ "nixpkgs" ] }, "locked": { - "lastModified": 1772206698, - "narHash": "sha256-wyEBuDbmkifIphiSddyZu/IAVrud1Iu1AyNXVkCTWB0=", + "lastModified": 1772662797, + "narHash": "sha256-qQ79x2HyFLrDZu9lsoGH721j/f4eNyYza62OaEe5v60=", "owner": "elixir-lang", "repo": "expert", - "rev": "44a43e2d146ddb1a5cd9cce35b5cd7cd8947a94f", + "rev": "5171d0d100684af638978e4c20ee3a1c95f08ce2", "type": "github" }, "original": { @@ -127,11 +127,11 @@ "inputs": { "nixpkgs-lib": "nixpkgs-lib_2" }, "locked": { - "lastModified": 1769996383, - "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=", + "lastModified": 1772408722, + "narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "57928607ea566b5db3ad13af0e57e921e6b12381", + "rev": "f20dc5d9b8027381c474144ecabc9034d6a839a3", "type": "github" }, "original": { @@ -155,39 +155,6 @@ "repo": "flake-utils", "type": "github" } }, - "flake-utils_2": { - "inputs": { - "systems": "systems" - }, - "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": [ @@ -195,11 +162,11 @@ "nixpkgs" ] }, "locked": { - "lastModified": 1771188132, - "narHash": "sha256-qLXxN/tPrZtnekaLBQuVtxQfvqqs5cT5WbyH4zZaTGI=", + "lastModified": 1772633327, + "narHash": "sha256-jl+DJB2DUx7EbWLRng+6HNWW/1/VQOnf0NsQB4PlA7I=", "owner": "nix-community", "repo": "home-manager", - "rev": "ae8003d8b61d0d373e7ca3da1a48f9c870d15df9", + "rev": "5a75730e6f21ee624cbf86f4915c6e7489c74acc", "type": "github" }, "original": { @@ -208,50 +175,13 @@ "repo": "home-manager", "type": "github" } }, - "lix": { - "flake": false, - "locked": { - "lastModified": 1768477252, - "narHash": "sha256-RgET5pILoiG+3GnDpgfUEA4y8ISfZe6SB+geE+8U76Y=", - "rev": "fbe811e94e9c4efc9b9c283fe2fbb3aeff50fca7", - "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/fbe811e94e9c4efc9b9c283fe2fbb3aeff50fca7.tar.gz?rev=fbe811e94e9c4efc9b9c283fe2fbb3aeff50fca7" - }, - "original": { - "type": "tarball", - "url": "https://git.lix.systems/lix-project/lix/archive/release-2.93.tar.gz" - } - }, - "lix-module": { - "inputs": { - "flake-utils": "flake-utils_2", - "flakey-profile": "flakey-profile", - "lix": [ - "lix" - ], - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1756125859, - "narHash": "sha256-6a+PWILmqHCs9B5eIBLg6HSZ8jYweZpgOWO8FlyVwYI=", - "rev": "d3292125035b04df00d01549a26e948631fabe1e", - "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/d3292125035b04df00d01549a26e948631fabe1e.tar.gz?rev=d3292125035b04df00d01549a26e948631fabe1e" - }, - "original": { - "type": "tarball", - "url": "https://git.lix.systems/lix-project/nixos-module/archive/release-2.93.tar.gz" - } - }, "nixpkgs": { "locked": { - "lastModified": 1771147098, - "narHash": "sha256-jpfPdBjKO232s5NueoNEvvVzpndiUzPLNYcH4/Ov0gY=", + "lastModified": 1772643971, + "narHash": "sha256-+bllfMsclzbAAPMZTm3K9G/a5lG+s6l18/AyyYLPSIE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e3cb16bccd9facebae3ba29c6a76a4cc1b73462a", + "rev": "400de68cd101e8cfebffea121397683caf7f5a34", "type": "github" }, "original": { @@ -278,11 +208,11 @@ } }, "nixpkgs-lib_2": { "locked": { - "lastModified": 1769909678, - "narHash": "sha256-cBEymOf4/o3FD5AZnzC3J9hLbiZ+QDT/KDuyHXVJOpM=", + "lastModified": 1772328832, + "narHash": "sha256-e+/T/pmEkLP6BHhYjx6GmwP5ivonQQn0bJdH9YrRB+Q=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "72716169fe93074c333e8d0173151350670b824c", + "rev": "c185c7a5e5dd8f9add5b2f8ebeff00888b070742", "type": "github" }, "original": { @@ -299,24 +229,7 @@ "darwin-stable": "darwin-stable", "expert": "expert", "flake-parts": "flake-parts_2", "home-manager": "home-manager", - "lix": "lix", - "lix-module": "lix-module", "nixpkgs": "nixpkgs" - } - }, - "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" } } }, diff --git a/flake.nix b/flake.nix --- a/flake.nix +++ b/flake.nix @@ -19,16 +19,6 @@ url = "github:lnl7/nix-darwin"; inputs.nixpkgs.follows = "nixpkgs"; }; - lix = { - url = "https://git.lix.systems/lix-project/lix/archive/release-2.93.tar.gz"; - flake = false; - }; - lix-module = { - url = "https://git.lix.systems/lix-project/nixos-module/archive/release-2.93.tar.gz"; - inputs.nixpkgs.follows = "nixpkgs"; - inputs.lix.follows = "lix"; - }; - # neorg-overlay = { # url = "github:nvim-neorg/nixpkgs-neorg-overlay"; # inputs.nixpkgs.follows = "nixpkgs"; diff --git a/hosts/niuniobook.nix b/hosts/niuniobook.nix --- a/hosts/niuniobook.nix +++ b/hosts/niuniobook.nix @@ -21,7 +21,6 @@ { system.stateVersion = 5; documentation.enable = true; } - inputs.lix-module.nixosModules.default inputs.home-manager.darwinModules.home-manager { users.users.hauleth.home = "/Users/hauleth"; diff --git a/modules/common.nix b/modules/common.nix --- a/modules/common.nix +++ b/modules/common.nix @@ -6,6 +6,7 @@ }: { # nixpkgs.config.allowUnfree = true; nix.enable = true; + nix.package = pkgs.lixPackageSets.stable.lix; environment.systemPackages = [ pkgs.cachix