diff --git a/flake.lock b/flake.lock index e93a613..b31739c 100644 --- a/flake.lock +++ b/flake.lock @@ -321,6 +321,39 @@ "url": "https://flakehub.com/f/DeterminateSystems/flake-schemas/%3D0.1.5.tar.gz" } }, + "flake-utils": { + "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" + } + }, "fromYaml": { "flake": false, "locked": { @@ -813,6 +846,41 @@ "type": "github" } }, + "lix": { + "inputs": { + "flake-utils": "flake-utils", + "flakey-profile": "flakey-profile", + "lix": "lix_2", + "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_2": { + "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" + } + }, "mysecrets": { "flake": false, "locked": { @@ -1060,6 +1128,7 @@ "hyprland": "hyprland", "hyprsunset": "hyprsunset", "lanzaboote": "lanzaboote", + "lix": "lix", "mysecrets": "mysecrets", "nix-flatpak": "nix-flatpak", "nix-index-database": "nix-index-database", @@ -1069,7 +1138,7 @@ "nixpkgs-stable": "nixpkgs-stable_2", "sops-nix": "sops-nix", "stylix": "stylix", - "systems": "systems", + "systems": "systems_2", "walker": "walker" } }, @@ -1212,6 +1281,21 @@ "type": "github" } }, + "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "tinted-foot": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index 3458305..deee960 100644 --- a/flake.nix +++ b/flake.nix @@ -2,10 +2,10 @@ description = "unexplrd's personal configuration"; inputs = { - # lix = { - # inputs.nixpkgs.follows = "nixpkgs"; - # url = "https://git.lix.systems/lix-project/nixos-module/archive/2.92.0-2.tar.gz"; - # }; + lix = { + url = "https://git.lix.systems/lix-project/nixos-module/archive/2.93.1.tar.gz"; + inputs.nixpkgs.follows = "nixpkgs"; + }; # neve = { # inputs.nixvim.follows = "nixvim"; # url = "git+https://gitea.linerds.us/unexplrd/Neve"; diff --git a/modules/shared/nixos/nix/common.nix b/modules/shared/nixos/nix/common.nix index 88f15b7..08497ce 100644 --- a/modules/shared/nixos/nix/common.nix +++ b/modules/shared/nixos/nix/common.nix @@ -1,10 +1,12 @@ { - pkgs, + # pkgs, + inputs, lib, ... }: { + imports = with inputs; [lix.nixosModules.default]; nix = { - package = pkgs.lixPackageSets.latest.lix; + # package = pkgs.lixPackageSets.latest.lix; channel.enable = false; daemonCPUSchedPolicy = "idle"; optimise = {