From ec61dd4f555c28d2268b214465b6091e4e8413c1 Mon Sep 17 00:00:00 2001 From: Daniel Kempkens Date: Sat, 18 Nov 2023 21:40:58 +0100 Subject: [PATCH] fish: Update plugins; use starship transience --- home/programs/fish.nix | 15 ++------------- home/programs/nvim/plugins.nix | 10 +++++----- home/programs/starship.nix | 9 +++++++++ 3 files changed, 16 insertions(+), 18 deletions(-) diff --git a/home/programs/fish.nix b/home/programs/fish.nix index 6b3e4eb..db72a9c 100644 --- a/home/programs/fish.nix +++ b/home/programs/fish.nix @@ -32,8 +32,8 @@ in src = fetchFromGitHub { owner = "franciscolourenco"; repo = "done"; - rev = "1.17.1"; - sha256 = "sha256-aYKTkx5v7tB6k/UBcS0NOgA6SiRrjzn1lUTH/Xp5DFM="; + rev = "1.19.1"; + hash = "sha256-BGHfwKoMfOZUsa05kEt8W2luc1aC3Su/OyaGmcb4UiI="; }; } @@ -48,17 +48,6 @@ in }; } - # https://github.com/nickeb96/puffer-fish - { - name = "puffer-fish"; - src = fetchFromGitHub { - owner = "nickeb96"; - repo = "puffer-fish"; - rev = "5d3cb25e0d63356c3342fb3101810799bb651b64"; - hash = "sha256-aPxEHSXfiJJXosIm7b3Pd+yFnyz43W3GXyUB5BFAF54="; - }; - } - # https://github.com/PatrickF1/colored_man_pages.fish { name = "colored_man_pages"; diff --git a/home/programs/nvim/plugins.nix b/home/programs/nvim/plugins.nix index ed85cee..9cba547 100644 --- a/home/programs/nvim/plugins.nix +++ b/home/programs/nvim/plugins.nix @@ -29,12 +29,12 @@ in }; mini-nvim = buildVimPlugin { pname = "mini.nvim"; - version = "2023-11-17"; + version = "2023-11-18"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.nvim"; - rev = "b5645ac6eefce8e7af9d7dd4e5e296a81cba8a10"; - sha256 = "10wnamdjjg904j3rb87a4mfsrpr5aqv4n0bns443wn5a3myl8q0g"; + rev = "0628a86f036de4a4eb485f4d8d4a00273f116425"; + sha256 = "17yd7zzr9hivq2zvwj48dwabhmbd0zprsglv7pxcawyxsq8aphkj"; fetchSubmodules = false; }; }; @@ -132,8 +132,8 @@ in src = fetchFromGitHub { owner = "HiPhish"; repo = "rainbow-delimiters.nvim"; - rev = "769436897e32bc4f01a9d5f57a23169efe099d46"; - sha256 = "0lafii68ygk7c7x59hz2is6i6ir9v0hdcgnfi8x3rk3cfxzx75mq"; + rev = "f1d4bab54013ea4275522e42b5ffd9ac11f189f4"; + sha256 = "0kh7cz1lpykqgp9jnmqh9ynayfl6av5r3sqydc9dl8m4xbb05fwz"; fetchSubmodules = false; }; }; diff --git a/home/programs/starship.nix b/home/programs/starship.nix index 17881ca..7c4008a 100644 --- a/home/programs/starship.nix +++ b/home/programs/starship.nix @@ -1,7 +1,10 @@ +{ lib, config, ... }: + { programs.starship = { enable = true; enableFishIntegration = true; + enableTransience = true; settings = { add_newline = true; @@ -101,4 +104,10 @@ }; }; }; + + programs.fish.interactiveShellInit = lib.mkIf config.programs.starship.enableTransience '' + function starship_transient_prompt_func + starship module character + end + ''; }