From d69c197fa41d3ea916014faaeb191ec1a76a8180 Mon Sep 17 00:00:00 2001 From: "Gustavo L de Mello (Guz)" Date: Thu, 12 Dec 2024 18:28:23 -0300 Subject: [PATCH] fix: infinite recursion in yazi --- flake.lock | 135 +++++++++++++++++++++++++++++++++++++++++++++++------ flake.nix | 5 +- neovim.nix | 1 + 3 files changed, 125 insertions(+), 16 deletions(-) diff --git a/flake.lock b/flake.lock index 0cfdb40..3d5d326 100644 --- a/flake.lock +++ b/flake.lock @@ -92,6 +92,24 @@ "type": "github" } }, + "flake-utils_2": { + "inputs": { + "systems": "systems_2" + }, + "locked": { + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "git-hooks": { "inputs": { "flake-compat": "flake-compat_2", @@ -144,9 +162,7 @@ "go-grip": { "inputs": { "flake-utils": "flake-utils", - "nixpkgs": [ - "nixpkgs" - ] + "nixpkgs": "nixpkgs" }, "locked": { "lastModified": 1733702535, @@ -191,15 +207,15 @@ "git-hooks": "git-hooks", "hercules-ci-effects": "hercules-ci-effects", "neovim-src": "neovim-src", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1733903671, - "narHash": "sha256-pztctU+iwx4zh1TrGAmnrZOv9ud8/tRjlObXmZnbRbo=", + "lastModified": 1733962285, + "narHash": "sha256-djpjqhPZkqfe1USsuu+eT4ZyGO+dVvAf3l4FUCZEb6Y=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "331e9c8200a2413f891b9dd762fc179ce6d335f9", + "rev": "2025aef04baf723bfa4cb8225fc11a319a5681f1", "type": "github" }, "original": { @@ -211,11 +227,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1733850961, - "narHash": "sha256-GpdTTQ1g7tERjY/rzGZtiWd5eAqKsTtPJN/LEBkTU0E=", + "lastModified": 1733924897, + "narHash": "sha256-Fxzl754uzyNebXW54LUliFliMbw30XG+bdb0AVtPSM0=", "owner": "neovim", "repo": "neovim", - "rev": "3f1d09bc94d02266d6fa588a2ccd1be1ca084cf7", + "rev": "442d338cb50e4cf08c58cb82b6d33b6d5df9fb1b", "type": "github" }, "original": { @@ -226,11 +242,27 @@ }, "nixpkgs": { "locked": { - "lastModified": 1733686850, - "narHash": "sha256-NQEO/nZWWGTGlkBWtCs/1iF1yl2lmQ1oY/8YZrumn3I=", + "lastModified": 1728241625, + "narHash": "sha256-yumd4fBc/hi8a9QgA9IT8vlQuLZ2oqhkJXHPKxH/tRw=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "c31898adf5a8ed202ce5bea9f347b1c6871f32d1", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1733749988, + "narHash": "sha256-+5qdtgXceqhK5ZR1YbP1fAUsweBIrhL38726oIEAtDs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dd51f52372a20a93c219e8216fe528a648ffcbf4", + "rev": "bc27f0fde01ce4e1bfec1ab122d72b7380278e68", "type": "github" }, "original": { @@ -240,7 +272,7 @@ "type": "github" } }, - "nixpkgs_2": { + "nixpkgs_3": { "locked": { "lastModified": 1733759999, "narHash": "sha256-463SNPWmz46iLzJKRzO3Q2b0Aurff3U1n0nYItxq7jU=", @@ -256,11 +288,49 @@ "type": "github" } }, + "nixpkgs_4": { + "locked": { + "lastModified": 1729265718, + "narHash": "sha256-4HQI+6LsO3kpWTYuVGIzhJs1cetFcwT7quWCk/6rqeo=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "ccc0c2126893dd20963580b6478d1a10a4512185", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "root": { "inputs": { "go-grip": "go-grip", "neovim-nightly-overlay": "neovim-nightly-overlay", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs_3", + "yazi": "yazi" + } + }, + "rust-overlay": { + "inputs": { + "nixpkgs": [ + "yazi", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1729391507, + "narHash": "sha256-as0I9xieJUHf7kiK2a9znDsVZQTFWhM1pLivII43Gi0=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "784981a9feeba406de38c1c9a3decf966d853cca", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" } }, "systems": { @@ -278,6 +348,21 @@ "type": "github" } }, + "systems_2": { + "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": [ @@ -298,6 +383,26 @@ "repo": "treefmt-nix", "type": "github" } + }, + "yazi": { + "inputs": { + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs_4", + "rust-overlay": "rust-overlay" + }, + "locked": { + "lastModified": 1733925272, + "narHash": "sha256-HFr9MykhffcIa++uxjg5Mk69x5C/poiaKf+QV2REnSY=", + "owner": "sxyazi", + "repo": "yazi", + "rev": "c78f39b50f04fb23c8376369d6c9a21226002d9c", + "type": "github" + }, + "original": { + "owner": "sxyazi", + "repo": "yazi", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index a7d20bc..4ee075a 100644 --- a/flake.nix +++ b/flake.nix @@ -6,7 +6,9 @@ go-grip = { url = "github:guz013/go-grip"; - inputs.nixpkgs.follows = "nixpkgs"; + }; + yazi = { + url = "github:sxyazi/yazi"; }; }; outputs = { @@ -32,6 +34,7 @@ packages = forAllSystems (system: pkgs: { neovim = pkgs.callPackage ./neovim.nix { go-grip = inputs.go-grip.packages.${system}.default; + yazi = inputs.yazi.packages.${system}.default; }; default = self.packages.${system}.neovim; }); diff --git a/neovim.nix b/neovim.nix index 1f0ca7a..b0b6764 100644 --- a/neovim.nix +++ b/neovim.nix @@ -101,6 +101,7 @@ ripgrep args.go-grip + args.yazi ]; foldPlugins = builtins.foldl' (acc: next: acc ++ [next] ++ (foldPlugins (next.dependencies or []))) [];