From 2ffdd71d712c2547a315882199d8b07751024dc7 Mon Sep 17 00:00:00 2001 From: Daylin Morgan Date: Mon, 6 May 2024 14:15:05 -0500 Subject: [PATCH] try out lix for fun and profit --- flake.lock | 108 ++++++++++++++++++++++++++++++++++++++++++++---- flake.nix | 9 ++++ lib/default.nix | 13 ++++-- modules/nix.nix | 2 +- 4 files changed, 119 insertions(+), 13 deletions(-) diff --git a/flake.lock b/flake.lock index f8a0ba3..f4fd855 100644 --- a/flake.lock +++ b/flake.lock @@ -127,6 +127,24 @@ "inputs": { "systems": "systems_4" }, + "locked": { + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_4": { + "inputs": { + "systems": "systems_5" + }, "locked": { "lastModified": 1705309234, "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", @@ -141,9 +159,9 @@ "type": "github" } }, - "flake-utils_4": { + "flake-utils_5": { "inputs": { - "systems": "systems_5" + "systems": "systems_6" }, "locked": { "lastModified": 1710146030, @@ -159,7 +177,7 @@ "type": "github" } }, - "flake-utils_5": { + "flake-utils_6": { "locked": { "lastModified": 1659877975, "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", @@ -174,6 +192,21 @@ "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" + } + }, "gitignore": { "inputs": { "nixpkgs": [ @@ -358,7 +391,7 @@ }, "lib-aggregate": { "inputs": { - "flake-utils": "flake-utils", + "flake-utils": "flake-utils_2", "nixpkgs-lib": "nixpkgs-lib" }, "locked": { @@ -375,6 +408,48 @@ "type": "github" } }, + "lix": { + "flake": false, + "locked": { + "lastModified": 1714955862, + "narHash": "sha256-REWlo2RYHfJkxnmZTEJu3Cd/2VM+wjjpPy7Xi4BdDTQ=", + "ref": "refs/tags/2.90-beta.1", + "rev": "b6799ab0374a8e1907a48915d3187e07da41d88c", + "revCount": 15501, + "type": "git", + "url": "https://git@git.lix.systems/lix-project/lix" + }, + "original": { + "ref": "refs/tags/2.90-beta.1", + "type": "git", + "url": "https://git@git.lix.systems/lix-project/lix" + } + }, + "lix-module": { + "inputs": { + "flake-utils": "flake-utils", + "flakey-profile": "flakey-profile", + "lix": [ + "lix" + ], + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1715278311, + "narHash": "sha256-Z787hdZuwBhQCQOeOmln5j9cCKxDWql7tbF1ukKDFZU=", + "ref": "refs/heads/main", + "rev": "c8ab1e79ba0140bc75731c75177242089506260b", + "revCount": 75, + "type": "git", + "url": "https://git.lix.systems/lix-project/nixos-module" + }, + "original": { + "type": "git", + "url": "https://git.lix.systems/lix-project/nixos-module" + } + }, "nix-eval-jobs": { "inputs": { "flake-parts": "flake-parts", @@ -634,7 +709,7 @@ "roc": { "inputs": { "flake-compat": "flake-compat_2", - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils_3", "nixgl": "nixgl", "nixpkgs": "nixpkgs_7", "rust-overlay": "rust-overlay" @@ -658,6 +733,8 @@ "f1multiviewer": "f1multiviewer", "hyprland": "hyprland", "hyprland-contrib": "hyprland-contrib", + "lix": "lix", + "lix-module": "lix-module", "nix-index-database": "nix-index-database", "nixpkgs": "nixpkgs_4", "nixpkgs-wayland": "nixpkgs-wayland", @@ -785,6 +862,21 @@ "type": "github" } }, + "systems_6": { + "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": [ @@ -862,7 +954,7 @@ "zig-overlay": { "inputs": { "flake-compat": "flake-compat_3", - "flake-utils": "flake-utils_5", + "flake-utils": "flake-utils_6", "nixpkgs": [ "zls", "nixpkgs" @@ -884,7 +976,7 @@ }, "zig2nix": { "inputs": { - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_4", "nixpkgs": [ "nixpkgs" ] @@ -905,7 +997,7 @@ }, "zls": { "inputs": { - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_5", "gitignore": "gitignore", "langref": "langref", "nixpkgs": [ diff --git a/flake.nix b/flake.nix index 18a5c25..83455bd 100644 --- a/flake.nix +++ b/flake.nix @@ -4,6 +4,13 @@ outputs = inputs: (import ./lib inputs).oizysFlake; inputs = { + lix.url = "git+https://git@git.lix.systems/lix-project/lix?ref=refs/tags/2.90-beta.1"; + lix.flake = false; + + lix-module.url = "git+https://git.lix.systems/lix-project/nixos-module"; + lix-module.inputs.lix.follows = "lix"; + lix-module.inputs.nixpkgs.follows = "nixpkgs"; + nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; stable.url = "github:nixos/nixpkgs/nixos-23.11"; @@ -37,12 +44,14 @@ "https://hyprland.cachix.org" "https://nixpkgs-wayland.cachix.org" "https://daylin.cachix.org" + "https://cache.lix.systems" # "https://cache.garnix.io" ]; extra-trusted-public-keys = [ "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" "nixpkgs-wayland.cachix.org-1:3lwxaILxMRkVhehr5StQprHdEo4IrE8sRho9R9HOLYA=" "daylin.cachix.org-1:fLdSnbhKjtOVea6H9KqXeir+PyhO+sDSPhEW66ClE/k=" + "cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o=" # "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g=" ]; }; diff --git a/lib/default.nix b/lib/default.nix index b4f35ee..2dea12c 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -32,10 +32,15 @@ rec { hostname: nixosSystem { system = "x86_64-linux"; - modules = [ - ../modules/oizys.nix - ../overlays - ] ++ filter isNixFile (listFilesRecursive (../. + "/hosts/${hostname}")); + modules = + [ + ../modules/oizys.nix + ../overlays + inputs.lix-module.nixosModules.default + ] + ++ filter + isNixFile + (listFilesRecursive (../. + "/hosts/${hostname}")); specialArgs = { inherit diff --git a/modules/nix.nix b/modules/nix.nix index c91718a..672ec6d 100644 --- a/modules/nix.nix +++ b/modules/nix.nix @@ -8,7 +8,7 @@ imports = [ inputs.nix-index-database.nixosModules.nix-index ]; nixpkgs.config.allowUnfree = true; - nix.package = pkgs.nixVersions.latest; + # nix.package = pkgs.nixVersions.latest; nix.extraOptions = '' experimental-features = nix-command flakes '';