diff --git a/share/completions/nmcli.fish b/share/completions/nmcli.fish
index 459371db9..f1481d8bb 100644
--- a/share/completions/nmcli.fish
+++ b/share/completions/nmcli.fish
@@ -1,31 +1,81 @@
-complete -c nmcli -s t -l terse   -d 'Output is terse'
-complete -c nmcli -s p -l pretty  -d 'Output is pretty'
-complete -c nmcli -s m -l mode    -xa 'tabular multiline' -d 'Switch between tabular and multiline mode'
-complete -c nmcli -s f -l fields  -xa 'all common' -d 'Specify the output fields'
-complete -c nmcli -s e -l escape  -xa 'yes no' -d 'Whether to escape ":" and "\\" characters'
-complete -c nmcli -s v -l version -d 'Show nmcli version'
-complete -c nmcli -s h -l help    -d 'Print help information'
-complete -c nmcli -d 'Command-line tool to control NetworkManager' -x
+set -l nmcli_commands general networking radio connection device agent monitor help
+set -l nmcli_general status hostname permissions logging help
+set -l nmcli_networking on off connectivity help
+set -l nmcli_radio all wifi wwan help
+set -l nmcli_connection show up down add modify clone edit delete monitor reload load import export help
+set -l nmcli_device status show set connect reapply modify disconnect delete monitor wifi lldp help
+set -l nmcli_agent secret polkit all help
 
-complete -c nmcli -xa nm -n '__fish_use_subcommand' -d 'Inquiry and change the state of NM' -x
-complete -c nmcli -n '__fish_seen_subcommand_from nm; and not __fish_seen_subcommand_from status enable sleep wifi wwan' -xa 'status enable sleep wifi wwan'
-complete -c nmcli -n '__fish_seen_subcommand_from nm; and __fish_seen_subcommand_from enable sleep' -xa 'true false'
-complete -c nmcli -n '__fish_seen_subcommand_from nm; and __fish_seen_subcommand_from wifi wwan' -xa 'on off'
+complete -c nmcli -s t -l terse -d 'Output is terse' -n "not __fish_seen_subcommand_from $nmcli_commands"
+complete -c nmcli -s p -l pretty -d 'Output is pretty' -n "not __fish_seen_subcommand_from $nmcli_commands"
+complete -c nmcli -s m -l mode -d 'Switch between tabular and multiline mode' -xa 'tabular multiline' -n "not __fish_seen_subcommand_from $nmcli_commands"
+complete -c nmcli -s c -l color -d 'Whether to use colors in output' -xa 'auto yes no' -n "not __fish_seen_subcommand_from $nmcli_commands"
+complete -c nmcli -s f -l fields -d 'Specify the output fields' -xa 'all common' -n "not __fish_seen_subcommand_from $nmcli_commands"
+complete -c nmcli -s e -l escape -d 'Whether to escape ":" and "\\" characters' -xa 'yes no' -n "not __fish_seen_subcommand_from $nmcli_commands"
+complete -c nmcli -s a -l ask -d 'Ask for missing parameters' -n "not __fish_seen_subcommand_from $nmcli_commands"
+complete -c nmcli -s s -l show-secrets -d 'Allow displaying passwords' -n "not __fish_seen_subcommand_from $nmcli_commands"
+complete -c nmcli -s w -l wait -d 'Set timeout (seconds) waiting for finishing operations' -x -n "not __fish_seen_subcommand_from $nmcli_commands"
+complete -c nmcli -s v -l version -d 'Show nmcli version' -x -n "not __fish_seen_subcommand_from $nmcli_commands"
+complete -c nmcli -s h -l help -d 'Print help information' -x
+complete -c nmcli -d 'Command-line tool to control NetworkManager'
 
-complete -c nmcli -xa con -n '__fish_use_subcommand' -d "Get information about NM's connections" -x
-complete -c nmcli -n '__fish_seen_subcommand_from con; and not __fish_seen_subcommand_from list status up down delete' -xa 'list status up down delete'
-complete -c nmcli -n '__fish_seen_subcommand_from con; and __fish_seen_subcommand_from list up down delete' -xa 'id uuid'
-complete -c nmcli -n 'contains_seq con up -- (commandline -op)' -xa 'iface ap'
-complete -c nmcli -n 'contains_seq con up iface -- (commandline -op)' -xa '(__fish_print_interfaces)'
-complete -c nmcli -n 'contains_seq con up -- (commandline -op)' -l nowait -d 'Exit immediately'
-complete -c nmcli -n 'contains_seq con up -- (commandline -op)' -l timeout -d 'How long to wait for operation completion' -x
+complete -c nmcli -n "not __fish_seen_subcommand_from $nmcli_commands" -xa "$nmcli_commands"
 
-complete -c nmcli -xa dev -n '__fish_use_subcommand' -d 'Get information about devices' -x
-complete -c nmcli -n '__fish_seen_subcommand_from dev; and not __fish_seen_subcommand_from status list disconnect wifi' -xa 'status list disconnect wifi'
-complete -c nmcli -n 'contains_seq dev disconnect -- (commandline -op)' -l nowait -d 'Exit immediately'
-complete -c nmcli -n 'contains_seq dev list -- (commandline -op)' -xa 'iface'
-complete -c nmcli -n '__fish_seen_subcommand_from dev; and __fish_seen_subcommand_from iface' -xa '(__fish_print_interfaces)'
-complete -c nmcli -n 'contains_seq dev wifi -- (commandline -op)' -xa 'list iface'
-complete -c nmcli -n 'contains_seq dev wifi list -- (commandline -op)' -xa 'essid bssid'
+complete -c nmcli -n "__fish_seen_subcommand_from general; and not __fish_seen_subcommand_from $nmcli_general" -xa 'status' -d 'Show overall status of NetworkManager'
+complete -c nmcli -n "__fish_seen_subcommand_from general; and not __fish_seen_subcommand_from $nmcli_general" -xa 'hostname' -d 'Get or change persistent system hostname'
+complete -c nmcli -n "__fish_seen_subcommand_from general; and not __fish_seen_subcommand_from $nmcli_general" -xa 'permissions' -d 'Show caller permissions for authenticated operations'
+complete -c nmcli -n "__fish_seen_subcommand_from general; and not __fish_seen_subcommand_from $nmcli_general" -xa 'logging' -d 'Get or change NetworkManager logging level and domains'
+complete -c nmcli -n "__fish_seen_subcommand_from general; and not __fish_seen_subcommand_from $nmcli_general" -xa 'help'
+complete -c nmcli -n "contains_seq general logging -- (commandline -op)" -xa 'level domains help'
 
+complete -c nmcli -n "__fish_seen_subcommand_from networking; and not __fish_seen_subcommand_from $nmcli_networking" -xa 'on' -d 'Switch networking on'
+complete -c nmcli -n "__fish_seen_subcommand_from networking; and not __fish_seen_subcommand_from $nmcli_networking" -xa 'off' -d 'Switch networking off'
+complete -c nmcli -n "__fish_seen_subcommand_from networking; and not __fish_seen_subcommand_from $nmcli_networking" -xa 'connectivity' -d 'Get network connectivity state'
+complete -c nmcli -n "__fish_seen_subcommand_from networking; and not __fish_seen_subcommand_from $nmcli_networking" -xa 'help'
+complete -c nmcli -n "contains_seq networking connectivity -- (commandline -op)" -xa 'check' -d 'Re-check the connectivity'
 
+complete -c nmcli -n "__fish_seen_subcommand_from radio; and not __fish_seen_subcommand_from $nmcli_radio" -xa 'all' -d 'Get status of all radio switches; turn them on/off'
+complete -c nmcli -n "contains_seq radio all -- (commandline -op)" -xa 'on off help'
+complete -c nmcli -n "__fish_seen_subcommand_from radio; and not __fish_seen_subcommand_from $nmcli_radio" -xa 'wifi' -d 'Get status of Wi-Fi radio switch; turn it on/off'
+complete -c nmcli -n "contains_seq radio wifi -- (commandline -op)" -xa 'on off help'
+complete -c nmcli -n "__fish_seen_subcommand_from radio; and not __fish_seen_subcommand_from $nmcli_radio" -xa 'wwan' -d 'Get status of mobile broadband radio switch; turn it on/off'
+complete -c nmcli -n "contains_seq radio wwan -- (commandline -op)" -xa 'on off help'
+
+complete -c nmcli -n "__fish_seen_subcommand_from connection; and not __fish_seen_subcommand_from $nmcli_connection" -xa "$nmcli_connection"
+# Connection subcommands are self-explanatory, I'm just highlighting a difference between edit and modify
+complete -c nmcli -n "__fish_seen_subcommand_from connection; and not __fish_seen_subcommand_from $nmcli_connection" -xa "modify" -d "Modify one or more properties"
+complete -c nmcli -n "__fish_seen_subcommand_from connection; and not __fish_seen_subcommand_from $nmcli_connection" -xa "edit" -d "Interactive edit"
+complete -c nmcli -n "contains_seq connection show -- (commandline -op)" -l active -d 'List only active profiles'
+complete -c nmcli -n "contains_seq connection show -- (commandline -op)" -l order -d 'Custom connection ordering'
+complete -c nmcli -n "contains_seq connection show -- (commandline -op)" -xa 'id uuid path apath help'
+complete -c nmcli -n "contains_seq connection up -- (commandline -op)" -xa 'id uuid path ifname help'
+complete -c nmcli -n "contains_seq connection up -- (commandline -op)" -xa 'ap' -d 'Specify AP to connect to (only for Wi-Fi)'
+complete -c nmcli -n "contains_seq connection up -- (commandline -op)" -xa 'nsp' -d 'Specify NSP to connect to (only for WiMAX)'
+complete -c nmcli -n "contains_seq connection up -- (commandline -op)" -xa 'passwd-file' -d 'password file to activate the connection'
+complete -c nmcli -n "contains_seq connection down -- (commandline -op)" -xa 'id uuid path apath help'
+complete -c nmcli -n "contains_seq connection add -- (commandline -op)" -xa 'type ifname con-name autoconnect save master slave-type help'
+complete -c nmcli -n "contains_seq connection modify -- (commandline -op)" -l temporary
+complete -c nmcli -n "contains_seq connection modify -- (commandline -op)" -xa 'id uuid path help'
+complete -c nmcli -n "contains_seq connection clone -- (commandline -op)" -l temporary
+complete -c nmcli -n "contains_seq connection clone -- (commandline -op)" -xa 'id uuid path help'
+complete -c nmcli -n "contains_seq connection edit -- (commandline -op)" -xa 'id uuid path type help'
+complete -c nmcli -n "contains_seq connection edit type -- (commandline -op)" -xa 'con-name'
+complete -c nmcli -n "contains_seq connection delete -- (commandline -op)" -xa 'id uuid path help'
+complete -c nmcli -n "contains_seq connection monitor -- (commandline -op)" -xa 'id uuid path help'
+complete -c nmcli -n "contains_seq connection import -- (commandline -op)" -l temporary
+complete -c nmcli -n "contains_seq connection import -- (commandline -op)" -xa 'type file help'
+complete -c nmcli -n "contains_seq connection export -- (commandline -op)" -xa 'id uuid path help'
+
+set -l wifi_commands list connect hotspot rescan help
+complete -c nmcli -n "__fish_seen_subcommand_from device; and not __fish_seen_subcommand_from $nmcli_device" -xa "$nmcli_device"
+complete -c nmcli -n "contains_seq device set -- (commandline -op)" -xa 'ifname autoconnect managed'
+complete -c nmcli -n "contains_seq device wifi -- (commandline -op); and not __fish_seen_subcommand_from $wifi_commands" -xa "$wifi_commands"
+complete -c nmcli -n "contains_seq device wifi list -- (commandline -op)" -xa 'ifname bssid'
+complete -c nmcli -n "contains_seq device wifi connect -- (commandline -op)" -xa 'password wep-key-type ifname bssid name private hidden'
+complete -c nmcli -n "contains_seq device wifi hotspot -- (commandline -op)" -xa 'ifname con-name ssid band channel password'
+complete -c nmcli -n "contains_seq device wifi rescan -- (commandline -op)" -xa 'ifname ssid'
+complete -c nmcli -n "contains_seq device lldp -- (commandline -op)" -xa 'list'
+
+complete -c nmcli -n "__fish_seen_subcommand_from agent; and not __fish_seen_subcommand_from $nmcli_agent" -xa "secret" -d "Register nmcli as NM secret agent"
+complete -c nmcli -n "__fish_seen_subcommand_from agent; and not __fish_seen_subcommand_from $nmcli_agent" -xa "polkit" -d "Register nmcli as a polkit agent for user session"
+complete -c nmcli -n "__fish_seen_subcommand_from agent; and not __fish_seen_subcommand_from $nmcli_agent" -xa "all" -d "Run nmcli as secret and polkit agent"