From 32af22d8e40d208a04c706307e1ccb2d58bb5012 Mon Sep 17 00:00:00 2001 From: Goldstein Date: Wed, 17 Jul 2024 18:52:25 +0300 Subject: [PATCH] lix you --- flake.lock | 144 ++++++++++++++++++++++++++++++++++++++++++----------- flake.nix | 4 ++ metal.nix | 4 +- think.nix | 4 +- 4 files changed, 124 insertions(+), 32 deletions(-) diff --git a/flake.lock b/flake.lock index 95713a2..f8eef97 100644 --- a/flake.lock +++ b/flake.lock @@ -98,7 +98,7 @@ "crane": { "inputs": { "flake-compat": "flake-compat_4", - "flake-utils": "flake-utils_9", + "flake-utils": "flake-utils_10", "nixpkgs": [ "tg-vimhelpbot", "nixpkgs" @@ -303,6 +303,24 @@ "inputs": { "systems": "systems_10" }, + "locked": { + "lastModified": 1687709756, + "narHash": "sha256-Y5wKlQSkgEK2weWdOu4J3riRd+kV/VCgHsqLNTTWQ/0=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "dbabf0ca0c0c4bce6ea5eaf65af5cb694d2082c7", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_12": { + "inputs": { + "systems": "systems_11" + }, "locked": { "lastModified": 1685518550, "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", @@ -317,9 +335,9 @@ "type": "github" } }, - "flake-utils_12": { + "flake-utils_13": { "inputs": { - "systems": "systems_11" + "systems": "systems_12" }, "locked": { "lastModified": 1705309234, @@ -373,11 +391,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1681202837, - "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "cfacdce06f30d2b68473a46042957675eebb3401", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -391,11 +409,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1681202837, + "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "cfacdce06f30d2b68473a46042957675eebb3401", "type": "github" }, "original": { @@ -427,11 +445,11 @@ "systems": "systems_6" }, "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -441,12 +459,15 @@ } }, "flake-utils_8": { + "inputs": { + "systems": "systems_7" + }, "locked": { - "lastModified": 1659877975, - "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "lastModified": 1705309234, + "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", "owner": "numtide", "repo": "flake-utils", - "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", "type": "github" }, "original": { @@ -456,15 +477,12 @@ } }, "flake-utils_9": { - "inputs": { - "systems": "systems_8" - }, "locked": { - "lastModified": 1687709756, - "narHash": "sha256-Y5wKlQSkgEK2weWdOu4J3riRd+kV/VCgHsqLNTTWQ/0=", + "lastModified": 1659877975, + "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", "owner": "numtide", "repo": "flake-utils", - "rev": "dbabf0ca0c0c4bce6ea5eaf65af5cb694d2082c7", + "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", "type": "github" }, "original": { @@ -473,6 +491,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" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -515,7 +548,7 @@ }, "lib-aggregate": { "inputs": { - "flake-utils": "flake-utils_5", + "flake-utils": "flake-utils_6", "nixpkgs-lib": "nixpkgs-lib" }, "locked": { @@ -532,6 +565,41 @@ "type": "github" } }, + "lix": { + "flake": false, + "locked": { + "lastModified": 1720626042, + "narHash": "sha256-f8k+BezKdJfmE+k7zgBJiohtS3VkkriycdXYsKOm3sc=", + "rev": "2a4376be20d70feaa2b0e640c5041fb66ddc67ed", + "type": "tarball", + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/2a4376be20d70feaa2b0e640c5041fb66ddc67ed.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://git.lix.systems/lix-project/lix/archive/2.90.0.tar.gz" + } + }, + "lix-module": { + "inputs": { + "flake-utils": "flake-utils_4", + "flakey-profile": "flakey-profile", + "lix": "lix", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1720641669, + "narHash": "sha256-yEO2cGNgzm9x/XxiDQI+WckSWnZX63R8aJLBRSXtYNE=", + "rev": "5c48c833c15bb80d127a398a8c2484d42fdd8257", + "type": "tarball", + "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/5c48c833c15bb80d127a398a8c2484d42fdd8257.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.90.0.tar.gz" + } + }, "ln-s": { "inputs": { "nixpkgs": "nixpkgs_7" @@ -640,7 +708,7 @@ }, "neovim": { "inputs": { - "flake-utils": "flake-utils_11", + "flake-utils": "flake-utils_12", "nixpkgs": [ "tg-vimhelpbot", "nixpkgs" @@ -708,7 +776,7 @@ "nix-minecraft": { "inputs": { "flake-compat": "flake-compat", - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_5", "nixpkgs": "nixpkgs_9" }, "locked": { @@ -1098,7 +1166,7 @@ }, "perlsub": { "inputs": { - "flake-utils": "flake-utils_6", + "flake-utils": "flake-utils_7", "naersk": "naersk_3", "nixpkgs": "nixpkgs_13", "rust-overlay": "rust-overlay" @@ -1119,7 +1187,7 @@ }, "r9ktg": { "inputs": { - "flake-utils": "flake-utils_8", + "flake-utils": "flake-utils_9", "naersk": "naersk_4", "nixpkgs": "nixpkgs_16" }, @@ -1145,6 +1213,7 @@ "fenix": "fenix", "home-manager": "home-manager", "inftheory-slides": "inftheory-slides", + "lix-module": "lix-module", "ln-s": "ln-s", "naersk": "naersk_2", "nix-minecraft": "nix-minecraft", @@ -1194,7 +1263,7 @@ }, "rust-overlay": { "inputs": { - "flake-utils": "flake-utils_7", + "flake-utils": "flake-utils_8", "nixpkgs": "nixpkgs_14" }, "locked": { @@ -1240,7 +1309,7 @@ }, "rust-overlay_3": { "inputs": { - "flake-utils": "flake-utils_12", + "flake-utils": "flake-utils_13", "nixpkgs": "nixpkgs_20" }, "locked": { @@ -1323,6 +1392,21 @@ "type": "github" } }, + "systems_12": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "systems_2": { "locked": { "lastModified": 1681028828, @@ -1463,7 +1547,7 @@ "advisory-db": "advisory-db", "crane": "crane", "fenix": "fenix_2", - "flake-utils": "flake-utils_10", + "flake-utils": "flake-utils_11", "neovim": "neovim", "nixpkgs": "nixpkgs_18", "vim": "vim" @@ -1536,7 +1620,7 @@ }, "utils_3": { "inputs": { - "systems": "systems_7" + "systems": "systems_8" }, "locked": { "lastModified": 1709126324, diff --git a/flake.nix b/flake.nix index b32b9e8..bc75b37 100644 --- a/flake.nix +++ b/flake.nix @@ -1,6 +1,10 @@ { inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + lix-module = { + url = "https://git.lix.systems/lix-project/nixos-module/archive/2.90.0.tar.gz"; + inputs.nixpkgs.follows = "nixpkgs"; + }; naersk.url = "github:nmattia/naersk"; fenix.url = "github:nix-community/fenix"; classified = { diff --git a/metal.nix b/metal.nix index 3158119..15a63b6 100644 --- a/metal.nix +++ b/metal.nix @@ -1,6 +1,8 @@ -inputs @ { nixpkgs, classified, home-manager, ... }: nixpkgs.lib.nixosSystem rec { +inputs @ { nixpkgs, classified, home-manager, lix-module, ... }: nixpkgs.lib.nixosSystem rec { system = "x86_64-linux"; modules = [ + # Lix instead of Nix + lix-module.nixosModules.default # external imports classified.nixosModules."${system}".default home-manager.nixosModules.home-manager diff --git a/think.nix b/think.nix index c5f540f..d9baac5 100644 --- a/think.nix +++ b/think.nix @@ -1,6 +1,8 @@ -inputs @ { nixpkgs, classified, home-manager, ... }: nixpkgs.lib.nixosSystem rec { +inputs @ { nixpkgs, classified, home-manager, lix-module, ... }: nixpkgs.lib.nixosSystem rec { system = "x86_64-linux"; modules = [ + # Lix instead of Nix + lix-module.nixosModules.default # external imports classified.nixosModules."${system}".default home-manager.nixosModules.home-manager