From 58b72cbb8c24ecd7db736e6d7e923fb566c92b71 Mon Sep 17 00:00:00 2001 From: Natsu Kagami Date: Thu, 11 Jul 2024 16:35:11 +0200 Subject: [PATCH] Use Lix --- flake.lock | 120 +++++++++++++++++++++++++++++++++++++++++++++-------- flake.nix | 5 +++ 2 files changed, 107 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index d361616..3e76647 100644 --- a/flake.lock +++ b/flake.lock @@ -480,6 +480,24 @@ "type": "github" } }, + "flake-utils_10": { + "inputs": { + "systems": "systems_9" + }, + "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_2": { "inputs": { "systems": "systems" @@ -589,21 +607,6 @@ } }, "flake-utils_8": { - "locked": { - "lastModified": 1659877975, - "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_9": { "inputs": { "systems": "systems_8" }, @@ -621,6 +624,36 @@ "type": "github" } }, + "flake-utils_9": { + "locked": { + "lastModified": 1659877975, + "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "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" + } + }, "gitignore": { "inputs": { "nixpkgs": [ @@ -817,9 +850,44 @@ "type": "github" } }, - "mpd-mpris": { + "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_7", + "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" + } + }, + "mpd-mpris": { + "inputs": { + "flake-utils": "flake-utils_8", "nixpkgs": [ "nixpkgs" ] @@ -1229,6 +1297,7 @@ "kak-lsp": "kak-lsp", "kakoune": "kakoune", "lanzaboote": "lanzaboote", + "lix-module": "lix-module", "mpd-mpris": "mpd-mpris", "nix-gaming": "nix-gaming", "nixos-hardware": "nixos-hardware", @@ -1345,7 +1414,7 @@ }, "secrets": { "inputs": { - "flake-utils": "flake-utils_8" + "flake-utils": "flake-utils_9" }, "locked": { "lastModified": 1693981285, @@ -1525,6 +1594,21 @@ "type": "github" } }, + "systems_9": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "utils": { "inputs": { "systems": "systems_3" @@ -1546,7 +1630,7 @@ "youmubot": { "inputs": { "crane": "crane_5", - "flake-utils": "flake-utils_9", + "flake-utils": "flake-utils_10", "nixpkgs": "nixpkgs_11" }, "locked": { diff --git a/flake.nix b/flake.nix index 6849660..48b5179 100644 --- a/flake.nix +++ b/flake.nix @@ -27,6 +27,10 @@ flake-utils.url = github:numtide/flake-utils; crane.url = github:ipetkov/crane; arion.url = github:hercules-ci/arion; + lix-module = { + url = "https://git.lix.systems/lix-project/nixos-module/archive/2.90.0.tar.gz"; + inputs.nixpkgs.follows = "nixpkgs"; + }; # --- # Imported apps @@ -89,6 +93,7 @@ (nixpkgsAsRegistry_ stable) ./common.nix sops-nix.nixosModules.sops + inputs.lix-module.nixosModules.default ]; }; common-nixos = stable: { ... }: {