From 7c0adece1f4288154c7454ed3668970abce560fc Mon Sep 17 00:00:00 2001 From: Natsu Kagami Date: Sun, 5 Feb 2023 13:58:35 +0100 Subject: [PATCH] Use a better fzf.fish --- flake.lock | 66 +++++++++++++++++++++++----------------------- home/fish/fish.nix | 19 +++++++++---- 2 files changed, 47 insertions(+), 38 deletions(-) diff --git a/flake.lock b/flake.lock index df15739..485c832 100644 --- a/flake.lock +++ b/flake.lock @@ -10,11 +10,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1674348649, - "narHash": "sha256-hBRlaUlsrmW1wAPevwQnkrT0XiLrmlAHWabWYmLeQlQ=", + "lastModified": 1675475924, + "narHash": "sha256-KWdfV9a6+zG6Ij/7PZYLnomjBZZUu8gdRy+hfjGrrJQ=", "owner": "ipetkov", "repo": "crane", - "rev": "ccea7b33178daf6010aae3ea2b3fb5b0241b9146", + "rev": "1bde9c762ebf26de9f8ecf502357c92105bc4577", "type": "github" }, "original": { @@ -67,11 +67,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1668681692, - "narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=", + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", "owner": "edolstra", "repo": "flake-compat", - "rev": "009399224d5e398d03b22badca40a37ac85412a1", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", "type": "github" }, "original": { @@ -181,11 +181,11 @@ "kak-lsp": { "flake": false, "locked": { - "lastModified": 1673686595, - "narHash": "sha256-TCgIWZR5irqGaGRe3EgzAJvGpqMSAkUf1j6nwpri1H0=", + "lastModified": 1674842415, + "narHash": "sha256-gAnbJVuNRtZxD/FCOdzybj7B1alW4J0CnfOA7l+3FnE=", "owner": "kak-lsp", "repo": "kak-lsp", - "rev": "9621c99d8ad358af806d4d88f43cd1e50bec87c7", + "rev": "c5645e7c8bc7c3508cf04939af3e365e248de8b0", "type": "github" }, "original": { @@ -197,11 +197,11 @@ "kakoune": { "flake": false, "locked": { - "lastModified": 1674455980, - "narHash": "sha256-y4r+UPLGzOu9rocZfFjoYR+r9I0BD04cuH758hv8hzo=", + "lastModified": 1675384273, + "narHash": "sha256-YKjePJbb7BqjWXxkXG9LxVl4I1sMm6Oi3xypYbw+eLA=", "owner": "mawww", "repo": "kakoune", - "rev": "509788460889ed934e4a51d03243aedf776e8b96", + "rev": "eb0e9831330d3b1e1d3ddb2bc789000706e6e445", "type": "github" }, "original": { @@ -257,11 +257,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1674423090, - "narHash": "sha256-waNhZrEDx6Ou5bjaKa3AJal3C+UamM81R0tlVtSjVfY=", + "lastModified": 1675100158, + "narHash": "sha256-B8Nhm28gfhjKQQJC3Za34pNrrgG0wCdrSwMwXq4W95k=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "b0b28d88fd5f1a55bd4d1041f92284f20633fff9", + "rev": "60c20c3c8682aaf55022e168b5b91f4dbd69849a", "type": "github" }, "original": { @@ -273,11 +273,11 @@ "nixos-m1": { "flake": false, "locked": { - "lastModified": 1674098029, - "narHash": "sha256-o7CNhxCl8LVd62bunIAuxPv7rh8Kivu8FAZfXSod3/4=", + "lastModified": 1675215747, + "narHash": "sha256-O7vwx67l2PNnkNpPXnp7D0oBW+OfFetxdrlwUtaweY4=", "owner": "tpwrules", "repo": "nixos-m1", - "rev": "fe4fff71fd1dbd8733512d0a2b83a84e3cfdc2bd", + "rev": "0086dd0e401f9dde826e6c170d312a87564aa6a4", "type": "github" }, "original": { @@ -320,11 +320,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1674361931, - "narHash": "sha256-lUIZItHbW+LmJAz9V9puLq2rHlewcUgg1RPehkQIkzc=", + "lastModified": 1675584158, + "narHash": "sha256-SBkchaDzCHxnPNRDdtZ5ko5caHio9iS0Mbyn/xXbXxs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ef479383e13698c8d5ccf8a608485dc8ce1d4f80", + "rev": "d840126a0890621e7b220894d749132dd4bde6a0", "type": "github" }, "original": { @@ -367,11 +367,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1674407282, - "narHash": "sha256-2qwc8mrPINSFdWffPK+ji6nQ9aGnnZyHSItVcYDZDlk=", + "lastModified": 1675512093, + "narHash": "sha256-u1CY4feK14B57E6T+0Bhkuoj8dpBxCPrWO+SP87UVP8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ab1254087f4cdf4af74b552d7fc95175d9bdbb49", + "rev": "8e8240194eda25b61449f29bb5131e02b28a5486", "type": "github" }, "original": { @@ -399,11 +399,11 @@ }, "nur": { "locked": { - "lastModified": 1674574136, - "narHash": "sha256-1VZkgpWft6Ifs35aIAry1vHUGLzxUe5M2eBvHhYVByA=", + "lastModified": 1675596041, + "narHash": "sha256-JLkALU22kbLla6Uq6aLDUIiZAqcPwURH2czlAEQHKbc=", "owner": "nix-community", "repo": "NUR", - "rev": "b87197cac6c38db9e32d76c6f286fee98e2ba752", + "rev": "2dd9a5ed773cbb884c659a2fa9ffc9ae74c996a9", "type": "github" }, "original": { @@ -464,11 +464,11 @@ ] }, "locked": { - "lastModified": 1672712534, - "narHash": "sha256-8S0DdMPcbITnlOu0uA81mTo3hgX84wK8S9wS34HEFY4=", + "lastModified": 1675391458, + "narHash": "sha256-ukDKZw922BnK5ohL9LhwtaDAdCsJL7L6ScNEyF1lO9w=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "69fb7bf0a8c40e6c4c197fa1816773774c8ac59f", + "rev": "383a4acfd11d778d5c2efcf28376cbd845eeaedf", "type": "github" }, "original": { @@ -505,11 +505,11 @@ ] }, "locked": { - "lastModified": 1674546403, - "narHash": "sha256-vkyNv0xzXuEnu9v52TUtRugNmQWIti8c2RhYnbLG71w=", + "lastModified": 1675566616, + "narHash": "sha256-Wki1ffvQUIB044M9ltjOxpXJGsqnQiVQPvMpQ0RiEBE=", "owner": "Mic92", "repo": "sops-nix", - "rev": "b6ab3c61e2ca5e07d1f4eb1b67304e2670ea230c", + "rev": "4d16c18787ba8ff80c1ff8db25c5ca56f68ceed3", "type": "github" }, "original": { diff --git a/home/fish/fish.nix b/home/fish/fish.nix index 598d5fd..ebabcd4 100644 --- a/home/fish/fish.nix +++ b/home/fish/fish.nix @@ -5,7 +5,13 @@ ./tide/nix-shell.nix ]; - home.packages = [ pkgs.timg ]; + home.packages = with pkgs; [ + timg + # For fzf.fish + fzf + fd + bat + ]; programs.fish = { enable = true; @@ -135,6 +141,9 @@ # Set up tty for GPG export GPG_TTY=(tty) + + # Set up fzf bindings + fzf_configure_bindings --directory=\ct --processes=\cp ''; plugins = [ { @@ -149,10 +158,10 @@ { name = "fzf"; src = pkgs.fetchFromGitHub { - owner = "jethrokuan"; - repo = "fzf"; - rev = "479fa67d7439b23095e01b64987ae79a91a4e283"; - sha256 = "0k6l21j192hrhy95092dm8029p52aakvzis7jiw48wnbckyidi6v"; + owner = "PatrickF1"; + repo = "fzf.fish"; + rev = "v9.7"; + sha256 = "sha256-haNSqXJzLL3JGvD4JrASVmhLJz6i9lna6/EdojXdFOo="; }; } {