From 92eb194682951dba5f217d05ea48582644371fff Mon Sep 17 00:00:00 2001 From: Miguel Palhas Date: Wed, 16 Jul 2025 11:06:21 +0100 Subject: [PATCH] wip --- flake.lock | 164 +++++++++++++++++++++++++++++++++++++++++++++++++++++ flake.nix | 5 ++ 2 files changed, 169 insertions(+) diff --git a/flake.lock b/flake.lock index 2402788..6aa7a45 100644 --- a/flake.lock +++ b/flake.lock @@ -87,6 +87,26 @@ "rust": "rust", "utils": "utils" }, +<<<<<<< HEAD +======= + "locked": { + "lastModified": 1752660141, + "narHash": "sha256-qNCrwVYhKMknoUbsLz4rQ8DAY3gnD5/4MUFKjLKRRX4=", + "owner": "ethui", + "repo": "ethui", + "rev": "ef14ee0e0059cccc7a6df81a8938404fb3984340", + "type": "github" + }, + "original": { + "owner": "ethui", + "ref": "flake", + "repo": "ethui", + "type": "github" + } + }, + "flake-compat": { + "flake": false, +>>>>>>> ca35dc2 (wip) "locked": { "lastModified": 1753721147, "narHash": "sha256-vKxdoi11ezlFeXo2zl08/iOuIZwzy1cNJCIbq3JZ+oA=", @@ -322,6 +342,49 @@ "type": "github" } }, +<<<<<<< HEAD +======= + "neovim-nightly-overlay": { + "inputs": { + "flake-compat": "flake-compat", + "flake-parts": "flake-parts", + "git-hooks": "git-hooks", + "hercules-ci-effects": "hercules-ci-effects", + "neovim-src": "neovim-src", + "nixpkgs": "nixpkgs_4", + "treefmt-nix": "treefmt-nix" + }, + "locked": { + "lastModified": 1750983411, + "narHash": "sha256-g10hXUUZ8FwMFAKsjWjHaJAzxyORR1kxA1DAyXrFMFg=", + "owner": "nix-community", + "repo": "neovim-nightly-overlay", + "rev": "97dddd4fc14547ee389b432b6525b7650f261253", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "neovim-nightly-overlay", + "type": "github" + } + }, + "neovim-src": { + "flake": false, + "locked": { + "lastModified": 1750976841, + "narHash": "sha256-NLKBKM9sapcb4IrNLmK/s++7oD8trZDond7Cb1aQFv8=", + "owner": "neovim", + "repo": "neovim", + "rev": "2b4c1127ad1c8cff38f562d71f411c35ec6ba8d6", + "type": "github" + }, + "original": { + "owner": "neovim", + "repo": "neovim", + "type": "github" + } + }, +>>>>>>> ca35dc2 (wip) "nix-colors": { "inputs": { "base16-schemes": "base16-schemes", @@ -376,6 +439,8 @@ "locked": { "lastModified": 1744536153, "narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=", +<<<<<<< HEAD +======= "owner": "NixOS", "repo": "nixpkgs", "rev": "18dd725c29603f582cf1900e0d25f9f1063dbf11", @@ -402,6 +467,37 @@ "type": "indirect" } }, + "nixpkgs_4": { + "locked": { + "lastModified": 1750865895, + "narHash": "sha256-p2dWAQcLVzquy9LxYCZPwyUdugw78Qv3ChvnX755qHA=", +>>>>>>> ca35dc2 (wip) + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "18dd725c29603f582cf1900e0d25f9f1063dbf11", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_5": { + "locked": { + "lastModified": 1666753130, + "narHash": "sha256-Wff1dGPFSneXJLI2c0kkdWTgxnQ416KE6X4KnFkgPYQ=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "f540aeda6f677354f1e7144ab04352f61aaa0118", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, "nixpkgs_4": { "locked": { "lastModified": 1748929857, @@ -418,7 +514,11 @@ "type": "github" } }, +<<<<<<< HEAD "nixpkgs_5": { +======= + "nixpkgs_6": { +>>>>>>> ca35dc2 (wip) "locked": { "lastModified": 1752077645, "narHash": "sha256-HM791ZQtXV93xtCY+ZxG1REzhQenSQO020cu6rHtAPk=", @@ -434,7 +534,11 @@ "type": "github" } }, +<<<<<<< HEAD "nixpkgs_6": { +======= + "nixpkgs_7": { +>>>>>>> ca35dc2 (wip) "locked": { "lastModified": 1710272261, "narHash": "sha256-g0bDwXFmTE7uGDOs9HcJsfLFhH7fOsASbAuOzDC+fhQ=", @@ -450,7 +554,11 @@ "type": "github" } }, +<<<<<<< HEAD "nixpkgs_7": { +======= + "nixpkgs_8": { +>>>>>>> ca35dc2 (wip) "locked": { "lastModified": 1752480373, "narHash": "sha256-JHQbm+OcGp32wAsXTE/FLYGNpb+4GLi5oTvCxwSoBOA=", @@ -468,8 +576,13 @@ }, "nixvim": { "inputs": { +<<<<<<< HEAD "flake-parts": "flake-parts", "nixpkgs": "nixpkgs_5", +======= + "flake-parts": "flake-parts_3", + "nixpkgs": "nixpkgs_6", +>>>>>>> ca35dc2 (wip) "nuschtosSearch": "nuschtosSearch", "systems": "systems_3" }, @@ -558,7 +671,11 @@ "home-manager": "home-manager", "hyprpanel": "hyprpanel", "nix-colors": "nix-colors", +<<<<<<< HEAD "nixpkgs": "nixpkgs_4", +======= + "nixpkgs": "nixpkgs_5", +>>>>>>> ca35dc2 (wip) "nixvim": "nixvim", "nvchad-starter": "nvchad-starter", "nvchad4nix": "nvchad4nix", @@ -571,7 +688,11 @@ "rose-pine-hyprcursor": { "inputs": { "hyprlang": "hyprlang", +<<<<<<< HEAD "nixpkgs": "nixpkgs_6", +======= + "nixpkgs": "nixpkgs_7", +>>>>>>> ca35dc2 (wip) "utils": "utils_2" }, "locked": { @@ -655,6 +776,8 @@ "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", +<<<<<<< HEAD +======= "owner": "nix-systems", "repo": "default", "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", @@ -670,6 +793,22 @@ "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", +>>>>>>> ca35dc2 (wip) + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_6": { + "locked": { + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", "owner": "nix-systems", "repo": "default-linux", "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", @@ -746,6 +885,27 @@ }, "utils_2": { "inputs": { +<<<<<<< HEAD +======= + "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" + } + }, + "utils_2": { + "inputs": { +>>>>>>> ca35dc2 (wip) "systems": "systems_6" }, "locked": { @@ -783,7 +943,11 @@ "zen-browser": { "inputs": { "home-manager": "home-manager_2", +<<<<<<< HEAD "nixpkgs": "nixpkgs_7" +======= + "nixpkgs": "nixpkgs_8" +>>>>>>> ca35dc2 (wip) }, "locked": { "lastModified": 1753069499, diff --git a/flake.nix b/flake.nix index ddc7dba..0a1c555 100644 --- a/flake.nix +++ b/flake.nix @@ -45,11 +45,16 @@ inputs.nixpkgs.follows = "nixpkgs"; }; ethui = { +<<<<<<< HEAD url = "github:ethui/ethui"; ref="flake"; inputs.nixpkgs.follows = "nixpkgs"; } >>>>>>> 08aa572 (wip) +======= + url = "github:ethui/ethui/flake"; + }; +>>>>>>> ca35dc2 (wip) }; outputs =