Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backport nixpkgs merged changes for integration of cargo-make completions #859

Merged
merged 3 commits into from
Oct 20, 2024
Merged

Backport nixpkgs merged changes for integration of cargo-make completions #859

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5106399
Backport cargo-make completions since merged in nixpkgs
kachick Oct 20, 2024
813aa78
Install cargo-make completions in global again
kachick Oct 20, 2024
723d373
Remove code which used in experimental phase
kachick Oct 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion home-manager/bash.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
lib,
pkgs,
homemade-pkgs,
edge-pkgs,
...
}:

Expand Down Expand Up @@ -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}"

Expand Down
3 changes: 2 additions & 1 deletion home-manager/zsh.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
lib,
pkgs,
homemade-pkgs,
edge-pkgs,
...
}:

Expand Down Expand Up @@ -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
Expand Down
31 changes: 0 additions & 31 deletions pkgs/cargo-make-completions/default.nix
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions pkgs/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 { };
Expand Down