From 4e70bb10a78f99853b1a71272cbf7436c1ac5090 Mon Sep 17 00:00:00 2001 From: blahai Date: Mon, 3 Feb 2025 21:06:58 +0200 Subject: [PATCH] lix module --- flake.lock | 196 ++++++++++++++++++++++-------------- flake.nix | 10 +- hosts/nyx/configuration.nix | 1 - 3 files changed, 131 insertions(+), 76 deletions(-) diff --git a/flake.lock b/flake.lock index 00a7cc7..9366b14 100644 --- a/flake.lock +++ b/flake.lock @@ -82,11 +82,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1738535544, - "narHash": "sha256-HR7TfT9GuQoS4bumPxhOvBuh9SaoZ98tUiyiTQ0noS4=", + "lastModified": 1738552004, + "narHash": "sha256-eYE+8F0ZrSIYvlVkgTjTBlnM1COqUdSs4GKyWnel6I4=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "143eaa3fa95b3681d058435f577ee48c2a646720", + "rev": "894d1db77131a4a449d1993c7ba314ee15dd4e36", "type": "github" }, "original": { @@ -118,23 +118,6 @@ "type": "github" } }, - "disko": { - "inputs": { - "nixpkgs": "nixpkgs_3" - }, - "locked": { - "lastModified": 1738148035, - "narHash": "sha256-KYOATYEwaKysL3HdHdS5kbQMXvzS4iPJzJrML+3TKAo=", - "owner": "nix-community", - "repo": "disko", - "rev": "18d0a984cc2bc82cf61df19523a34ad463aa7f54", - "type": "github" - }, - "original": { - "id": "disko", - "type": "indirect" - } - }, "fenix": { "inputs": { "nixpkgs": [ @@ -277,7 +260,7 @@ }, "flake-utils_3": { "inputs": { - "systems": "systems_6" + "systems": "systems_5" }, "locked": { "lastModified": 1731533236, @@ -293,6 +276,39 @@ "type": "github" } }, + "flake-utils_4": { + "inputs": { + "systems": "systems_7" + }, + "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" + } + }, "freetype2": { "flake": false, "locked": { @@ -390,11 +406,11 @@ ] }, "locked": { - "lastModified": 1738550671, - "narHash": "sha256-yflgQxwzIzqHRVSd6GEkvm8VQ2TP94V1pZh6ivp9LnQ=", + "lastModified": 1738584474, + "narHash": "sha256-FjlqjgmfR3BGLlClwzkTPAYUVhfq94+KQOslldssIYQ=", "ref": "refs/heads/main", - "rev": "66268d8ed5154969c7387194dad3129602bb3c0c", - "revCount": 21, + "rev": "2bbc10b60b7e9d101840198650b8264e8795aef1", + "revCount": 29, "type": "git", "url": "https://git.blahai.gay/blahai/haipkgs.git" }, @@ -573,7 +589,7 @@ "hyprlang": "hyprlang", "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_4", "pre-commit-hooks": "pre-commit-hooks", "systems": "systems_4", "xdph": "xdph" @@ -833,6 +849,41 @@ "type": "github" } }, + "lix": { + "flake": false, + "locked": { + "lastModified": 1737234286, + "narHash": "sha256-CCKIAE84dzkrnlxJCKFyffAxP3yfsOAbdvydUGqq24g=", + "rev": "2837da71ec1588c1187d2e554719b15904a46c8b", + "type": "tarball", + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/2837da71ec1588c1187d2e554719b15904a46c8b.tar.gz?rev=2837da71ec1588c1187d2e554719b15904a46c8b" + }, + "original": { + "type": "tarball", + "url": "https://git.lix.systems/lix-project/lix/archive/2.92.0.tar.gz" + } + }, + "lix-module": { + "inputs": { + "flake-utils": "flake-utils_3", + "flakey-profile": "flakey-profile", + "lix": "lix", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1737237494, + "narHash": "sha256-YMLrcBpf0TR5r/eaqm8lxzFPap2TxCor0ZGcK3a7+b8=", + "rev": "b90bf629bbd835e61f1317b99e12f8c831017006", + "type": "tarball", + "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/b90bf629bbd835e61f1317b99e12f8c831017006.tar.gz?rev=b90bf629bbd835e61f1317b99e12f8c831017006" + }, + "original": { + "type": "tarball", + "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.92.0.tar.gz" + } + }, "nix-darwin": { "inputs": { "nixpkgs": [ @@ -896,11 +947,11 @@ }, "nixpkgs-smol": { "locked": { - "lastModified": 1738532490, - "narHash": "sha256-Zt6oFCas78fRSFKX4yFLCh5D2o2+N67ox0g4LenzA0c=", + "lastModified": 1738581456, + "narHash": "sha256-lqcxxsXbRJbEW2/qyS/nISgBKV2gd+4hC2OahsRJaeI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ff0654c494b7484c4854ddabecdb91b0b7f7c4d0", + "rev": "a748ecefd49930bae17b61ad2810b59eccd2f1aa", "type": "github" }, "original": { @@ -927,22 +978,6 @@ } }, "nixpkgs_3": { - "locked": { - "lastModified": 1737879851, - "narHash": "sha256-H+FXIKj//kmFHTTW4DFeOjR7F1z2/3eb2iwN6Me4YZk=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "5d3221fd57cc442a1a522a15eb5f58230f45a304", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { "locked": { "lastModified": 1738297584, "narHash": "sha256-AYvaFBzt8dU0fcSK2jKD0Vg23K2eIRxfsVXIPCW9a0E=", @@ -958,7 +993,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_4": { "locked": { "lastModified": 1738410390, "narHash": "sha256-xvTo0Aw0+veek7hvEVLzErmJyQkEcRk6PSR4zsRQFEc=", @@ -974,23 +1009,23 @@ "type": "github" } }, + "nixpkgs_5": { + "locked": { + "lastModified": 1738410390, + "narHash": "sha256-xvTo0Aw0+veek7hvEVLzErmJyQkEcRk6PSR4zsRQFEc=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "3a228057f5b619feb3186e986dbe76278d707b6e", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_6": { - "locked": { - "lastModified": 1738410390, - "narHash": "sha256-xvTo0Aw0+veek7hvEVLzErmJyQkEcRk6PSR4zsRQFEc=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "3a228057f5b619feb3186e986dbe76278d707b6e", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_7": { "locked": { "lastModified": 1735821806, "narHash": "sha256-cuNapx/uQeCgeuhUhdck3JKbgpsml259sjUQnWM7zW8=", @@ -1006,7 +1041,7 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_7": { "locked": { "lastModified": 1735471104, "narHash": "sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs=", @@ -1030,7 +1065,7 @@ "git-hooks": "git-hooks", "home-manager": "home-manager_2", "nix-darwin": "nix-darwin", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_3", "nuschtosSearch": "nuschtosSearch", "treefmt-nix": "treefmt-nix" }, @@ -1100,12 +1135,12 @@ "ags": "ags", "catppuccin": "catppuccin", "chaotic": "chaotic", - "disko": "disko", "haipkgs": "haipkgs", "haivim": "haivim", "home-manager": "home-manager_3", "hyprland": "hyprland", - "nixpkgs": "nixpkgs_6", + "lix-module": "lix-module", + "nixpkgs": "nixpkgs_5", "nixpkgs-smol": "nixpkgs-smol", "spicetify-nix": "spicetify-nix", "wezterm": "wezterm", @@ -1156,14 +1191,14 @@ "nixpkgs": [ "nixpkgs" ], - "systems": "systems_5" + "systems": "systems_6" }, "locked": { - "lastModified": 1738527890, - "narHash": "sha256-y5WosmqAtq3P1cXX4vhP58t6i6zEX9PeO8LF1onPTWY=", + "lastModified": 1738580832, + "narHash": "sha256-xgF3wq6cFYtsgHFNQw8NL6fb+bkeM7LmdNpdp/KTt3Y=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "6835108e9a472b99ab9e1f43a0fee3bdefaae14a", + "rev": "fb1d78cbac7ceafa01cd8ddddcc1315781852056", "type": "github" }, "original": { @@ -1262,6 +1297,21 @@ "type": "github" } }, + "systems_7": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -1286,11 +1336,11 @@ }, "wezterm": { "inputs": { - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_4", "freetype2": "freetype2", "harfbuzz": "harfbuzz", "libpng": "libpng", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_6", "rust-overlay": "rust-overlay", "zlib": "zlib" }, @@ -1353,7 +1403,7 @@ }, "zen-browser": { "inputs": { - "nixpkgs": "nixpkgs_8" + "nixpkgs": "nixpkgs_7" }, "locked": { "lastModified": 1738530884, diff --git a/flake.nix b/flake.nix index 26de080..6dd7a3e 100644 --- a/flake.nix +++ b/flake.nix @@ -10,6 +10,11 @@ nixpkgs-smol.url = "github:nixos/nixpkgs?ref=nixos-unstable-small"; chaotic.url = "github:chaotic-cx/nyx/nyxpkgs-unstable"; + lix-module = { + url = "https://git.lix.systems/lix-project/nixos-module/archive/2.92.0.tar.gz"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + haipkgs = { url = "git+https://git.blahai.gay/blahai/haipkgs.git"; inputs = { @@ -48,9 +53,9 @@ outputs = { nixpkgs, nixpkgs-smol, + lix-module, chaotic, home-manager, - disko, ... } @ inputs: let system = "x86_64-linux"; @@ -66,6 +71,7 @@ }; modules = [ ./hosts/nyx/configuration.nix + lix-module.nixosModules.default home-manager.nixosModules.default chaotic.nixosModules.default ]; @@ -76,7 +82,7 @@ inherit inputs; pkgs-smol = import nixpkgs-smol {inherit system;}; }; - modules = [./hosts/epimetheus/configuration.nix disko.nixosModules.disko]; + modules = [./hosts/epimetheus/configuration.nix]; }; }; }; diff --git a/hosts/nyx/configuration.nix b/hosts/nyx/configuration.nix index fbf908f..d5e0ac3 100644 --- a/hosts/nyx/configuration.nix +++ b/hosts/nyx/configuration.nix @@ -178,7 +178,6 @@ }; nix = { nixPath = ["nixpkgs=${inputs.nixpkgs}"]; - package = pkgs.lix; settings = { experimental-features = ["nix-command" "flakes" "auto-allocate-uids"]; max-jobs = "auto";