mirror of
				https://github.com/NotAShelf/nyxexprs.git
				synced 2025-10-31 11:02:37 +00:00 
			
		
		
		
	Compare commits
	
		
			2 commits
		
	
	
		
			
				7edb5c6f37
			
			...
			
				fbcd07e6bd
			
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| fbcd07e6bd | |||
| 68bdc4f3f0 | 
					 5 changed files with 92 additions and 9 deletions
				
			
		
							
								
								
									
										1
									
								
								.github/workflows/build.yml
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										1
									
								
								.github/workflows/build.yml
									
										
									
									
										vendored
									
									
								
							|  | @ -18,6 +18,7 @@ jobs: | ||||||
|           - foot-transparent |           - foot-transparent | ||||||
|           - headscale-ui |           - headscale-ui | ||||||
|           - mastodon-bird-ui |           - mastodon-bird-ui | ||||||
|  |           - zsh-stripped | ||||||
| 
 | 
 | ||||||
|     uses: ./.github/workflows/nix.yml |     uses: ./.github/workflows/nix.yml | ||||||
|     with: |     with: | ||||||
|  |  | ||||||
							
								
								
									
										18
									
								
								README.md
									
										
									
									
									
								
							
							
						
						
									
										18
									
								
								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` | There are several packages exposed by this flake. Each directory in `pkgs` | ||||||
| contains a description of the package inside its README. | contains a description of the package inside its README. | ||||||
| 
 | 
 | ||||||
| | Package          |                                           Description                                           | | | Package          |                                           Description                                            | | ||||||
| | :--------------- | :---------------------------------------------------------------------------------------------: | | | :--------------- | :----------------------------------------------------------------------------------------------: | | ||||||
| | alejandra-no-ads | A patched version of the **Alejandra** Nix formatter, without the pesky ads and spacing patches | | | 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                          | | | 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                   | | | 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]   | | | 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            | | | headscale-ui     |            A web frontend for the headscale Tailscale-compatible coordination server             | | ||||||
| | mastodon-bird-ui |                       Mastodon web UI, but strongly inspired by Twitter.                        | | | mastodon-bird-ui |                        Mastodon web UI, but strongly inspired by Twitter.                        | | ||||||
| | mov-cli          |                      A cli tool to browse and watch Movies/Shows/TV/Sports                      | | | zsh-stripped     | ZSH with newinstall scripts removed, and patches to handle special characters such as `^` or `#` | | ||||||
| 
 | 
 | ||||||
| ## Usage | ## Usage | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
							
								
								
									
										19
									
								
								pkgs/zsh-stripped/0001-globquote.patch
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										19
									
								
								pkgs/zsh-stripped/0001-globquote.patch
									
										
									
									
									
										Normal file
									
								
							|  | @ -0,0 +1,19 @@ | ||||||
|  | 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 || | ||||||
|  |  		      ( | ||||||
							
								
								
									
										29
									
								
								pkgs/zsh-stripped/0001-remote-complete-files.patch
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										29
									
								
								pkgs/zsh-stripped/0001-remote-complete-files.patch
									
										
									
									
									
										Normal file
									
								
							|  | @ -0,0 +1,29 @@ | ||||||
|  | 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 | ||||||
|  | 
 | ||||||
							
								
								
									
										34
									
								
								pkgs/zsh-stripped/package.nix
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										34
									
								
								pkgs/zsh-stripped/package.nix
									
										
									
									
									
										Normal file
									
								
							|  | @ -0,0 +1,34 @@ | ||||||
|  | { | ||||||
|  |   lib, | ||||||
|  |   zsh, | ||||||
|  |   ... | ||||||
|  | }: | ||||||
|  | zsh.overrideAttrs (old: { | ||||||
|  |   patches = | ||||||
|  |     (old.patches or []) | ||||||
|  |     ++ [ | ||||||
|  |       ./0001-globquote.patch | ||||||
|  | 
 | ||||||
|  |       # From: | ||||||
|  |       #  <https://github.com/fugidev/nix-config> | ||||||
|  |       ./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]; | ||||||
|  |   }; | ||||||
|  | }) | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue