diff --git a/flake.lock b/flake.lock index e417fed..01b608b 100644 --- a/flake.lock +++ b/flake.lock @@ -498,36 +498,38 @@ "lix": { "flake": false, "locked": { - "lastModified": 1718419213, - "narHash": "sha256-WY7BGnu5PnbK4O8cKKv9kvxwzZIGbIQUQLGPHFXitI0=", - "rev": "253546d5fbf8a5aa60ac8164c1b4f5794dc4e9d1", + "lastModified": 1719439912, + "narHash": "sha256-Qn0y/WEYcBL/SKEnpJq1e9tDpVi57YGDiJM2MgavLXM=", + "rev": "5dc85e8b72d1ba433f69200537146275ff1c4a03", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/253546d5fbf8a5aa60ac8164c1b4f5794dc4e9d1.tar.gz" + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/5dc85e8b72d1ba433f69200537146275ff1c4a03.tar.gz" }, "original": { "type": "tarball", - "url": "https://git.lix.systems/lix-project/lix/archive/2.90.0-rc1.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": 1718778548, - "narHash": "sha256-64lB/NO6AQ6z6EDCemPSYZWX/Qc6Rt04cPia5T5v01g=", - "rev": "29ed1bb67751e5b107d08df35d18dda6d45324e9", + "lastModified": 1719353937, + "narHash": "sha256-86NBqDxAP20ET/UoKX0WvSItblNQ97czXb2q7lkMrwk=", + "rev": "5d9d94089fb1ca96222a34bfe245ef5c5ebefd37", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/29ed1bb67751e5b107d08df35d18dda6d45324e9.tar.gz" + "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/5d9d94089fb1ca96222a34bfe245ef5c5ebefd37.tar.gz" }, "original": { "type": "tarball", - "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.90.0-rc1.tar.gz" + "url": "https://git.lix.systems/lix-project/nixos-module/archive/main.tar.gz" } }, "nix-eval-jobs": { @@ -868,6 +870,7 @@ "hyprland": "hyprland", "hyprland-contrib": "hyprland-contrib", "hyprman": "hyprman", + "lix": "lix", "lix-module": "lix-module", "nix-index-database": "nix-index-database", "nixos-wsl": "nixos-wsl", diff --git a/flake.nix b/flake.nix index 958aead..4ce2208 100644 --- a/flake.nix +++ b/flake.nix @@ -12,11 +12,18 @@ url = "github:nix-community/nix-index-database"; inputs.nixpkgs.follows = "nixpkgs"; }; - lix-module = { - url = "https://git.lix.systems/lix-project/nixos-module/archive/2.90.0-rc1.tar.gz"; - inputs.nixpkgs.follows = "nixpkgs"; + 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"; + }; + + hyprland.url = "git+https://github.com/hyprwm/Hyprland/?submodules=1"; hyprland-contrib.url = "github:hyprwm/contrib"; diff --git a/lib/default.nix b/lib/default.nix index 762c4ed..e7078df 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -54,7 +54,7 @@ in nixosModules = listToAttrs (findModulesList ../modules); nixosConfigurations = mapAttrs (name: _: mkSystem name) (readDir ../hosts); packages = forAllSystems (pkgs: rec { - oizys-go = pkgs.callPackage ../pkgs/oizys {}; + oizys-go = pkgs.callPackage ../pkgs/oizys { }; default = oizys-go; }); devShells = forAllSystems (pkgs: {