fish: improve completions a little bit

3 files changed, 25 insertions, 22 deletions

diff --git a/completions/fish/sway.fish b/completions/fish/sway.fish
index 31165ef4..d488d49a 100644
--- a/completions/fish/sway.fish
+++ b/completions/fish/sway.fish
@@ -1,5 +1,6 @@
 # sway(1) completion
 
+complete -f -c sway
 complete -c sway -s h -l help --description "Show help message and quit."
 complete -c sway -s c -l config --description "Specifies a config file."
 complete -c sway -s C -l validate --description "Check the validity of the config file, then exit."
diff --git a/completions/fish/swaymsg.fish b/completions/fish/swaymsg.fish
index fd577413..636e3500 100644
--- a/completions/fish/swaymsg.fish
+++ b/completions/fish/swaymsg.fish
@@ -1,5 +1,6 @@
 # swaymsg(1) completion
 
+complete -f -c swaymsg
 complete -c swaymsg -s h -l help --description "Show help message and quit."
 complete -c swaymsg -s q -l quiet --description "Sends the IPC message but does not print the response from sway."
 complete -c swaymsg -s v -l version --description "Print the version (of swaymsg) and quit."
diff --git a/completions/fish/swaynag.fish b/completions/fish/swaynag.fish
index 784d7fad..7015d5e3 100644
--- a/completions/fish/swaynag.fish
+++ b/completions/fish/swaynag.fish
@@ -1,29 +1,30 @@
 # swaynag
-complete -c swaynag -s C -l config --description 'The config file to use. Default: $HOME/.swaylock/config, $XDG_CONFIG_HOME/swaylock/config, and SYSCONFDIR/swaylock/config.'
+complete -f -c swaynag
+complete -c swaynag -s C -l config -r --description 'The config file to use. Default: $HOME/.swaynag/config, $XDG_CONFIG_HOME/swaynag/config, and SYSCONFDIR/swaynag/config.'
 complete -c swaynag -s d -l debug --description 'Enable debugging.'
-complete -c swaynag -s e -l edge --description 'Set the edge to use: top or bottom'
-complete -c swaynag -s f -l font --description 'Set the font to use.'
+complete -c swaynag -s e -l edge -fr --description 'Set the edge to use: top or bottom'
+complete -c swaynag -s f -l font -r --description 'Set the font to use.'
 complete -c swaynag -s h -l help --description 'Show help message and quit.'
-complete -c swaynag -s b -l button --description 'Create a button with a text and an action which is executed when pressed. Multiple buttons can be defined by providing the flag multiple times.'
+complete -c swaynag -s b -l button -fr --description 'Create a button with a text and an action which is executed when pressed. Multiple buttons can be defined by providing the flag multiple times.'
 complete -c swaynag -s l -l detailed-message --description 'Read a detailed message from stdin. A button to toggle details will be added. Details are shown in a scrollable multi-line text area.'
-complete -c swaynag -s L -l detailed-button --description 'Set the text for the button that toggles details. This has no effect if there is not a detailed message. The default is "Toggle details".'
-complete -c swaynag -s m -l message --description 'Set the message text.'
-complete -c swaynag -s o -l output --description 'Set the output to use.'
-complete -c swaynag -s s -l dismiss-button --description 'Sets the text for the dismiss nagbar button. The default is "X".'
-complete -c swaynag -s t -l type --description 'Set the message type. Two types are created by default "error" and "warning". Custom types can be defined in the config file.'
+complete -c swaynag -s L -l detailed-button -fr --description 'Set the text for the button that toggles details. This has no effect if there is not a detailed message. The default is "Toggle details".'
+complete -c swaynag -s m -l message -fr --description 'Set the message text.'
+complete -c swaynag -s o -l output -fr --description 'Set the output to use.'
+complete -c swaynag -s s -l dismiss-button -fr --description 'Sets the text for the dismiss nagbar button. The default is "X".'
+complete -c swaynag -s t -l type -fr --description 'Set the message type. Two types are created by default "error" and "warning". Custom types can be defined in the config file.'
 complete -c swaynag -s v -l version --description 'Show the version number and quit.'
 
 # Appearance
-complete -c swaynag -l background --description 'Set the color of the background.'
-complete -c swaynag -l border --description 'Set the color of the border.'
-complete -c swaynag -l border-bottom --description 'Set the color of the bottom border.'
-complete -c swaynag -l button-background --description 'Set the color for the background for buttons.'
-complete -c swaynag -l text --description 'Set the text color.'
-complete -c swaynag -l border-bottom-size --description 'Set the thickness of the bottom border.'
-complete -c swaynag -l message-padding --description 'Set the padding for the message.'
-complete -c swaynag -l details-border-size --description 'Set the thickness for the details border.'
-complete -c swaynag -l button-border-size --description 'Set the thickness for the button border.'
-complete -c swaynag -l button-gap --description 'Set the size of the gap between buttons.'
-complete -c swaynag -l button-dismiss-gap --description 'Set the size of the gap between the dismiss button and another button.'
-complete -c swaynag -l button-margin-right --description 'Set the margin from the right of the dismiss button to edge.'
-complete -c swaynag -l button-padding --description 'Set the padding for the button text.'
+complete -c swaynag -l background -fr --description 'Set the color of the background.'
+complete -c swaynag -l border -fr --description 'Set the color of the border.'
+complete -c swaynag -l border-bottom -fr --description 'Set the color of the bottom border.'
+complete -c swaynag -l button-background -fr --description 'Set the color for the background for buttons.'
+complete -c swaynag -l text -fr --description 'Set the text color.'
+complete -c swaynag -l border-bottom-size -fr --description 'Set the thickness of the bottom border.'
+complete -c swaynag -l message-padding -fr --description 'Set the padding for the message.'
+complete -c swaynag -l details-border-size -fr --description 'Set the thickness for the details border.'
+complete -c swaynag -l button-border-size -fr --description 'Set the thickness for the button border.'
+complete -c swaynag -l button-gap -fr --description 'Set the size of the gap between buttons.'
+complete -c swaynag -l button-dismiss-gap -fr --description 'Set the size of the gap between the dismiss button and another button.'
+complete -c swaynag -l button-margin-right -fr --description 'Set the margin from the right of the dismiss button to edge.'
+complete -c swaynag -l button-padding -fr --description 'Set the padding for the button text.'