1 files changed, 28 insertions, 104 deletions
diff --git a/extra/completions/alacritty.fish b/extra/completions/alacritty.fish
index fa399ffb..48f118c2 100644
--- a/extra/completions/alacritty.fish
+++ b/extra/completions/alacritty.fish
@@ -1,104 +1,28 @@
-# Available subcommands
-set -l commands msg help
-
-complete -c alacritty \
-  -n "not __fish_seen_subcommand_from $commands" \
-  -a "msg help"
-
-# Meta
-complete -c alacritty \
-  -n "not __fish_seen_subcommand_from help" \
-  -s "v" \
-  -l "version" \
-  -d "Prints version information"
-complete -c alacritty \
-  -n "not __fish_seen_subcommand_from help" \
-  -s "h" \
-  -l "help" \
-  -d "Prints help information"
-
-# Config
-complete -c alacritty \
-  -n "not __fish_seen_subcommand_from $commands" \
-  -f \
-  -l "config-file" \
-  -d "Specify an alternative config file"
-complete -c alacritty \
-  -n "not __fish_seen_subcommand_from $commands" \
-  -s "t" \
-  -l "title" \
-  -d "Defines the window title"
-complete -c alacritty \
-  -n "not __fish_seen_subcommand_from $commands" \
-  -l "class" \
-  -d "Defines the window class"
-complete -c alacritty \
-  -n "not __fish_seen_subcommand_from $commands" \
-  -l "embed" \
-  -d "Defines the X11 window ID (as a decimal integer) to embed Alacritty within"
-complete -c alacritty \
-  -n "not __fish_seen_subcommand_from $commands" \
-  -x \
-  -a '(__fish_complete_directories (commandline -ct))' \
-  -l "working-directory" \
-  -d "Start shell in specified directory"
-complete -c alacritty \
-  -n "not __fish_seen_subcommand_from $commands" \
-  -l "hold" \
-  -d "Remain open after child process exits"
-complete -c alacritty \
-  -n "not __fish_seen_subcommand_from $commands" \
-  -s "o" \
-  -l "option" \
-  -d "Override config file options"
-complete -c alacritty \
-  -n "not __fish_seen_subcommand_from $commands" \
-  -l "socket" \
-  -d "Path for IPC socket creation"
-
-# Output
-complete -c alacritty \
-  -n "not __fish_seen_subcommand_from $commands" \
-  -l "print-events" \
-  -d "Print all events to stdout"
-complete -c alacritty \
-  -n "not __fish_seen_subcommand_from $commands" \
-  -s "q" \
-  -d "Reduces the level of verbosity (min is -qq)"
-complete -c alacritty \
-  -n "not __fish_seen_subcommand_from $commands" \
-  -s "qq" \
-  -d "Reduces the level of verbosity"
-complete -c alacritty \
-  -n "not __fish_seen_subcommand_from $commands" \
-  -s "v" \
-  -d "Increases the level of verbosity"
-complete -c alacritty \
-  -n "not __fish_seen_subcommand_from $commands" \
-  -s "vv" \
-  -d "Increases the level of verbosity"
-complete -c alacritty \
-  -n "not __fish_seen_subcommand_from $commands" \
-  -s "vvv" \
-  -d "Increases the level of verbosity"
-
-complete -c alacritty \
-  -n "not __fish_seen_subcommand_from $commands" \
-  -l "ref-test" \
-  -d "Generates ref test"
-
-complete -c alacritty \
-  -n "not __fish_seen_subcommand_from $commands" \
-  -s "e" \
-  -l "command" \
-  -d "Execute command (must be last arg)"
-
-# Subcommand `msg`
-complete -c alacritty \
-  -n "__fish_seen_subcommand_from msg" \
-  -s "s" \
-  -l "socket" \
-  -d "Socket path override"
-complete -c alacritty \
-  -n "__fish_seen_subcommand_from msg" \
-  -a "create-window help"
+complete -c alacritty -n "__fish_use_subcommand" -s t -l title -d 'Defines the window title [default: Alacritty]'
+complete -c alacritty -n "__fish_use_subcommand" -l class -d 'Defines window class/app_id on X11/Wayland [default: Alacritty]'
+complete -c alacritty -n "__fish_use_subcommand" -l embed -d 'Defines the X11 window ID (as a decimal integer) to embed Alacritty within'
+complete -c alacritty -n "__fish_use_subcommand" -l working-directory -d 'Start the shell in the specified working directory'
+complete -c alacritty -n "__fish_use_subcommand" -l config-file -d 'Specify alternative configuration file [default: $XDG_CONFIG_HOME/alacritty/alacritty.yml]'
+complete -c alacritty -n "__fish_use_subcommand" -l socket -d 'Path for IPC socket creation'
+complete -c alacritty -n "__fish_use_subcommand" -s e -l command -d 'Command and args to execute (must be last argument)'
+complete -c alacritty -n "__fish_use_subcommand" -s o -l option -d 'Override configuration file options [example: cursor.style=Beam]'
+complete -c alacritty -n "__fish_use_subcommand" -l print-events -d 'Print all events to stdout'
+complete -c alacritty -n "__fish_use_subcommand" -l ref-test -d 'Generates ref test'
+complete -c alacritty -n "__fish_use_subcommand" -l hold -d 'Remain open after child process exits'
+complete -c alacritty -n "__fish_use_subcommand" -s q -d 'Reduces the level of verbosity (the min level is -qq)'
+complete -c alacritty -n "__fish_use_subcommand" -s v -d 'Increases the level of verbosity (the max level is -vvv)'
+complete -c alacritty -n "__fish_use_subcommand" -s h -l help -d 'Prints help information'
+complete -c alacritty -n "__fish_use_subcommand" -s V -l version -d 'Prints version information'
+complete -c alacritty -n "__fish_use_subcommand" -f -a "msg" -d 'Available socket messages'
+complete -c alacritty -n "__fish_use_subcommand" -f -a "help" -d 'Prints this message or the help of the given subcommand(s)'
+complete -c alacritty -n "__fish_seen_subcommand_from msg" -s s -l socket -d 'IPC socket connection path override'
+complete -c alacritty -n "__fish_seen_subcommand_from msg" -s h -l help -d 'Prints help information'
+complete -c alacritty -n "__fish_seen_subcommand_from msg" -s V -l version -d 'Prints version information'
+complete -c alacritty -n "__fish_seen_subcommand_from msg" -f -a "create-window" -d 'Create a new window in the same Alacritty process'
+complete -c alacritty -n "__fish_seen_subcommand_from msg" -f -a "help" -d 'Prints this message or the help of the given subcommand(s)'
+complete -c alacritty -n "__fish_seen_subcommand_from create-window" -s h -l help -d 'Prints help information'
+complete -c alacritty -n "__fish_seen_subcommand_from create-window" -s V -l version -d 'Prints version information'
+complete -c alacritty -n "__fish_seen_subcommand_from help" -s h -l help -d 'Prints help information'
+complete -c alacritty -n "__fish_seen_subcommand_from help" -s V -l version -d 'Prints version information'
+complete -c alacritty -n "__fish_seen_subcommand_from help" -s h -l help -d 'Prints help information'
+complete -c alacritty -n "__fish_seen_subcommand_from help" -s V -l version -d 'Prints version information'