From f294a49400e64b27606e094189e78ab353e04df3 Mon Sep 17 00:00:00 2001 From: Daylin Morgan Date: Tue, 15 Oct 2024 09:07:12 -0500 Subject: [PATCH] switch back to dev lix --- flake.lock | 25 ++++++++++++++----------- flake.nix | 19 ++++++------------- 2 files changed, 20 insertions(+), 24 deletions(-) diff --git a/flake.lock b/flake.lock index db3f1d6..e3cf68b 100644 --- a/flake.lock +++ b/flake.lock @@ -575,36 +575,38 @@ "lix": { "flake": false, "locked": { - "lastModified": 1723503926, - "narHash": "sha256-Rosl9iA9MybF5Bud4BTAQ9adbY81aGmPfV8dDBGl34s=", - "rev": "bcaeb6388b8916ac6d1736e3aa2b13313e6a6bd2", + "lastModified": 1728943608, + "narHash": "sha256-xcLDHLBRA1ZVO26f/Kdl7xBVnwjBemeWokQnjicO7GM=", + "rev": "fbf7a8b4405610368c6d2bd12ff369fefa94f7a7", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/bcaeb6388b8916ac6d1736e3aa2b13313e6a6bd2.tar.gz?rev=bcaeb6388b8916ac6d1736e3aa2b13313e6a6bd2" + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/fbf7a8b4405610368c6d2bd12ff369fefa94f7a7.tar.gz?rev=fbf7a8b4405610368c6d2bd12ff369fefa94f7a7" }, "original": { "type": "tarball", - "url": "https://git.lix.systems/lix-project/lix/archive/2.91.0.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": 1723510904, - "narHash": "sha256-zNW/rqNJwhq2lYmQf19wJerRuNimjhxHKmzrWWFJYts=", - "rev": "622a2253a071a1fb97a4d3c8103a91114acc1140", + "lastModified": 1727752861, + "narHash": "sha256-jowmo2aEzrEpPSM96IWtajuogdJm7DjAWxFTEb7Ct0s=", + "rev": "fd186f535a4ac7ae35d98c1dd5d79f0a81b7976d", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/622a2253a071a1fb97a4d3c8103a91114acc1140.tar.gz?rev=622a2253a071a1fb97a4d3c8103a91114acc1140" + "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/fd186f535a4ac7ae35d98c1dd5d79f0a81b7976d.tar.gz?rev=fd186f535a4ac7ae35d98c1dd5d79f0a81b7976d" }, "original": { "type": "tarball", - "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.91.0.tar.gz" + "url": "https://git.lix.systems/lix-project/nixos-module/archive/main.tar.gz" } }, "nim2nix": { @@ -1070,6 +1072,7 @@ "hyprland": "hyprland", "hyprland-contrib": "hyprland-contrib", "hyprman": "hyprman", + "lix": "lix", "lix-module": "lix-module", "nim2nix": "nim2nix", "nix-index-database": "nix-index-database", diff --git a/flake.nix b/flake.nix index 4115087..4f61da4 100644 --- a/flake.nix +++ b/flake.nix @@ -12,21 +12,14 @@ # pipe support added nixd.url = "github:nix-community/nixd/2.4.0"; - # ?? - # error: path '/nix/store/9ryh7avijc1yn8jaa099zbfyhynxmd0a-lix-2.92.0-dev-pre20241009-9865eba-doc' does not exist in the store - # 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/main.tar.gz"; - # inputs.nixpkgs.follows = "nixpkgs"; - # inputs.lix.follows = "lix"; - # }; - + 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.91.0.tar.gz"; + url = "https://git.lix.systems/lix-project/nixos-module/archive/main.tar.gz"; inputs.nixpkgs.follows = "nixpkgs"; + inputs.lix.follows = "lix"; }; hyprland.url = "git+https://github.com/hyprwm/Hyprland/?submodules=1";