From 6ecd2829767d84303d0c8e6c332ff5e9dcd95625 Mon Sep 17 00:00:00 2001 From: Patrick Date: Sat, 13 Apr 2024 14:27:54 +0200 Subject: [PATCH] fix: deprecated calls in pkgs fix: remove unused enable --- pkgs/zsh-histdb-skim.nix | 2 +- pkgs/zsh-histdb.nix | 2 +- users/common/shells/zsh/default.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/zsh-histdb-skim.nix b/pkgs/zsh-histdb-skim.nix index 9f4f244..7bbacee 100644 --- a/pkgs/zsh-histdb-skim.nix +++ b/pkgs/zsh-histdb-skim.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-BMy9Shy9KAx5+VbvH2WaA0wMFUNM5dqU/dssUNE1NWY="; postInstall = '' substituteInPlace zsh-histdb-skim-vendored.zsh \ - --replace "zsh-histdb-skim" "$out/bin/zsh-histdb-skim" + --replace-fail "zsh-histdb-skim" "$out/bin/zsh-histdb-skim" cp zsh-histdb-skim-vendored.zsh $out/zsh-histdb-skim.plugin.zsh ''; } diff --git a/pkgs/zsh-histdb.nix b/pkgs/zsh-histdb.nix index ea9a453..9ea8b8e 100644 --- a/pkgs/zsh-histdb.nix +++ b/pkgs/zsh-histdb.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { }; patchPhase = '' substituteInPlace "sqlite-history.zsh" "histdb-migrate" "histdb-merge" \ - --replace "sqlite3" "${sqlite}/bin/sqlite3" + --replace-fail "sqlite3" "${sqlite}/bin/sqlite3" ''; installPhase = '' mkdir -p $out diff --git a/users/common/shells/zsh/default.nix b/users/common/shells/zsh/default.nix index 3912d2c..a5e01f3 100644 --- a/users/common/shells/zsh/default.nix +++ b/users/common/shells/zsh/default.nix @@ -14,7 +14,7 @@ programs.fzf.enable = true; programs.carapace = { - enable = true; + enable = false; # this would source all completers sadly some are worse than the builtin completers enableZshIntegration = false; };