diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4cb125a..dfefd32 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -18,7 +18,6 @@ jobs: - foot-transparent - headscale-ui - mastodon-bird-ui - - zsh-stripped uses: ./.github/workflows/nix.yml with: diff --git a/README.md b/README.md index c475372..f4d0ca9 100644 --- a/README.md +++ b/README.md @@ -7,15 +7,15 @@ My personal package overlay for sharing my most commonly used derivations. There are several packages exposed by this flake. Each directory in `pkgs` contains a description of the package inside its README. -| Package | Description | -| :--------------- | :----------------------------------------------------------------------------------------------: | -| alejandra-custom | A patched version of the **Alejandra** Nix formatter, without the pesky ads and spacing patches | -| ani-cli | An up-to-date, auto updated version of ani-cli following auto-updated pins | -| cloneit | A CLI tool to download specific GitHub directories or files | -| foot-transparent | A patched version of the foot terminal emulator that brings back fullscreen transparency[^1] | -| headscale-ui | A web frontend for the headscale Tailscale-compatible coordination server | -| mastodon-bird-ui | Mastodon web UI, but strongly inspired by Twitter. | -| zsh-stripped | ZSH with newinstall scripts removed, and patches to handle special characters such as `^` or `#` | +| Package | Description | +| :--------------- | :---------------------------------------------------------------------------------------------: | +| alejandra-no-ads | A patched version of the **Alejandra** Nix formatter, without the pesky ads and spacing patches | +| ani-cli | An up-to-date, auto updated version of ani-cli | +| cloneit | A CLI tool to download specific GitHub directories or files | +| foot-transparent | A patched version of the foot terminal emulator that brings back fullscreen transparency[^1] | +| headscale-ui | A web frontend for the headscale Tailscale-compatible coordination server | +| mastodon-bird-ui | Mastodon web UI, but strongly inspired by Twitter. | +| mov-cli | A cli tool to browse and watch Movies/Shows/TV/Sports | ## Usage diff --git a/pkgs/zsh-stripped/0001-globquote.patch b/pkgs/zsh-stripped/0001-globquote.patch deleted file mode 100644 index 9a67e9c..0000000 --- a/pkgs/zsh-stripped/0001-globquote.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/Src/utils.c b/Src/utils.c -index edf5d3df7..2d1712227 100644 ---- a/Src/utils.c -+++ b/Src/utils.c -@@ -6205,11 +6205,11 @@ quotestring(const char *s, int instring) - continue; - } - else if (ispecial(*u) && -- ((*u != '=' && *u != '~') || -+ ((*u != '=' && *u != '~' && *u != '#' && *u != '^') || - u == s || - (isset(MAGICEQUALSUBST) && -- (u[-1] == '=' || u[-1] == ':')) || -+ (u[-1] == '=' || u[-1] == ':')) -- (*u == '~' && isset(EXTENDEDGLOB))) && -+ ) && - (instring == QT_BACKSLASH || - instring == QT_SINGLE_OPTIONAL || - ( diff --git a/pkgs/zsh-stripped/0001-remote-complete-files.patch b/pkgs/zsh-stripped/0001-remote-complete-files.patch deleted file mode 100644 index 067690e..0000000 --- a/pkgs/zsh-stripped/0001-remote-complete-files.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/Completion/Unix/Type/_remote_files b/Completion/Unix/Type/_remote_files -index 93e1b7f43..4d4a7abbf 100644 ---- a/Completion/Unix/Type/_remote_files -+++ b/Completion/Unix/Type/_remote_files -@@ -60,10 +60,7 @@ if zstyle -T ":completion:${curcontext}:files" remote-access; then - dirprefix=${dir}/ - fi - -- if [[ -z $QIPREFIX ]] -- then rempat="${dirprefix}${PREFIX%%[^./][^/]#}\*" -- else rempat="${dirprefix}${(q)PREFIX%%[^./][^/]#}\*" -- fi -+ rempat="${dirprefix}${(q)PREFIX%%[^./][^/]#}\*" - - # remote filenames - remfiles=(${(M)${(f)"$( -@@ -92,9 +89,9 @@ if zstyle -T ":completion:${curcontext}:files" remote-access; then - while _tags; do - while _next_label remote-files expl ${suf:-remote directory}; do - [[ -n $suf ]] && -- compadd "$args[@]" "$expl[@]" -d remdispf -- ${(q)remdispf%[*=|]} && ret=0 -+ compadd "$args[@]" "$expl[@]" -d remdispf -- ${remdispf%[*=|]} && ret=0 - compadd ${suf:+-S/} $autoremove "$args[@]" "$expl[@]" -d remdispd \ -- -- ${(q)remdispd%/} && ret=0 -+ -- ${remdispd%/} && ret=0 - done - (( ret )) || return 0 - done - diff --git a/pkgs/zsh-stripped/package.nix b/pkgs/zsh-stripped/package.nix deleted file mode 100644 index 232ea61..0000000 --- a/pkgs/zsh-stripped/package.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ - lib, - zsh, - ... -}: -zsh.overrideAttrs (old: { - patches = - (old.patches or []) - ++ [ - ./0001-globquote.patch - - # From: - # - ./0001-remote-complete-files.patch - ]; - - postConfigure = - (old.postConfigure or "") - + '' - # Find all instances of name=zsh/newuser in config.modules - # remove them. - sed -i -e '/^name=zsh\/newuser/d' config.modules - - # Also remove the newuser script to try and save some space - # it doesn't amount to much, but every little bit counts. - rm Scripts/newuser - ''; - - meta = { - description = "Patched version of zsh with globquote and remote file completion"; - mainProgram = "zsh"; - maintainers = with lib.maintainers; [NotAShelf]; - }; -})