diff --git a/home-manager/bash.nix b/home-manager/bash.nix index 23127de6..ba014eaa 100644 --- a/home-manager/bash.nix +++ b/home-manager/bash.nix @@ -3,6 +3,7 @@ lib, pkgs, homemade-pkgs, + edge-pkgs, ... }: @@ -122,7 +123,9 @@ source "${pkgs.fzf-git-sh}/share/fzf-git-sh/fzf-git.sh" source "${pkgs.podman}/share/bash-completion/completions/podman" source "${pkgs.zellij}/share/bash-completion/completions/zellij.bash" - source "${homemade-pkgs.cargo-make-completions}/share/bash-completion/completions/makers-completion.bash" + + # Adding only in devshell is not enough + source "${edge-pkgs.cargo-make}/share/bash-completion/completions/makers-completion.bash" source "${../dependencies/dprint/completions.bash}" diff --git a/home-manager/zsh.nix b/home-manager/zsh.nix index d6b7ded4..99291a46 100644 --- a/home-manager/zsh.nix +++ b/home-manager/zsh.nix @@ -3,6 +3,7 @@ lib, pkgs, homemade-pkgs, + edge-pkgs, ... }: @@ -231,7 +232,7 @@ in source "${pkgs.fzf-git-sh}/share/fzf-git-sh/fzf-git.sh" source "${pkgs.podman}/share/zsh/site-functions/_podman" # cargo-make recommends to use bash completions for zsh - source "${homemade-pkgs.cargo-make-completions}/share/bash-completion/completions/makers-completion.bash" + source "${edge-pkgs.cargo-make}/share/bash-completion/completions/makers-completion.bash" # fzf completions are also possible to be used in bash, but it overrides default completions with the registering # So currently injecting only in zsh diff --git a/pkgs/cargo-make-completions/default.nix b/pkgs/cargo-make-completions/default.nix deleted file mode 100644 index 0ee52943..00000000 --- a/pkgs/cargo-make-completions/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - installShellFiles, -}: - -stdenv.mkDerivation rec { - pname = "cargo-make-completions"; - version = "0.37.16"; - - src = fetchFromGitHub { - owner = "sagiegurari"; - repo = "cargo-make"; - rev = version; - hash = "sha256-OC1HzoEb9OyusYGC5jmEC4qW4U3oGApYvpy5XkZttSg="; - }; - - nativeBuildInputs = [ installShellFiles ]; - - installPhase = '' - installShellCompletion extra/shell/*.bash - ''; - - meta = with lib; { - description = "cargo-make shell completions which missing in nixpkgs"; - homepage = "https://github.com/sagiegurari/cargo-make"; - license = licenses.asl20; - platforms = platforms.all; - }; -} diff --git a/pkgs/default.nix b/pkgs/default.nix index 0a5b7f58..25d6f02f 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -61,8 +61,6 @@ micro-kdl = pkgs.callPackage ./micro-kdl { }; micro-nordcolors = pkgs.callPackage ./micro-nordcolors { }; - cargo-make-completions = pkgs.callPackage ./cargo-make-completions { }; - kdl-vim = pkgs.callPackage ./kdl.vim { }; nix-hash-url = pkgs.callPackage ./nix-hash-url { };