diff --git a/build_tools/style.fish b/build_tools/style.fish
index 9ac4bb7f0..fc60228a1 100755
--- a/build_tools/style.fish
+++ b/build_tools/style.fish
@@ -30,12 +30,10 @@ if test $all = yes
         exit 1
     end
     set c_files src/*.h src/*.cpp
-    # For now we don't restyle all the fish scripts. That's because `fish_indent` still has some
-    # problems with its output that require manual intervention. Not to mention that very few of the
-    # fish scripts even conform to `fish_indent` output at this time. When `fish_indent` output is
-    # deemed acceptable as a default and all the fish scripts have been restyled this comment should
-    # be removed and the following statement uncommented.
-    #   set f_files share/***.fish
+    # For now we don't restyle all fish scripts other than completion scripts. That's because people
+    # really like to vertically align the elements of the `complete` command and fish_indent
+    # currently does not honor that whitespace.
+    set f_files (printf '%s\n' share/***.fish | grep -v /completions/)
 else
     # We haven't been asked to reformat all the source. If there are uncommitted changes reformat
     # those using `git clang-format`. Else reformat the files in the most recent commit.
diff --git a/share/config.fish b/share/config.fish
index e473e9ea8..debbe77c4 100644
--- a/share/config.fish
+++ b/share/config.fish
@@ -10,51 +10,52 @@ set -g IFS \n\ \t
 # Create the default command_not_found handler
 #
 function __fish_default_command_not_found_handler
-	echo "fish: Unknown command '$argv'" >&2
+    echo "fish: Unknown command '$argv'" >&2
 end
 
 set -g version $FISH_VERSION
 
 if status --is-interactive
-        # The user has seemingly explicitly launched an old fish with too-new scripts installed.
-	if not contains  -- "string" (builtin -n)
-		set -g __is_launched_without_string 1
-		# XXX nostring - fix old fish binaries with no `string' builtin.
-		# When executed on fish 2.2.0, the `else' block after this would
-		# force on 24-bit mode due to changes to in test behavior.
-		# These "XXX nostring" hacks were added for 2.3.1
-		set_color --bold
-		echo "You appear to be trying to launch an old fish binary with newer scripts "
-		echo "installed into" (set_color --underline)"$__fish_datadir"
-		set_color normal
-		echo -e "\nThis is an unsupported configuration.\n"
-		set_color yellow
-		echo "You may need to uninstall and reinstall fish!"
-		set_color normal
-		# Remove this code when we've made it safer to upgrade fish.
-	else
-		# Enable truecolor/24-bit support for select terminals
-		# Ignore Neovim (in 0.1.4 at least), Screen and emacs' ansi-term as they swallow the sequences, rendering the text white.
-		if not set -q NVIM_LISTEN_ADDRESS
-			and not set -q STY
-			and not string match -q -- 'eterm*' $TERM
-			and begin
-				set -q KONSOLE_PROFILE_NAME # KDE's konsole
-				or string match -q -- "*:*" $ITERM_SESSION_ID # Supporting versions of iTerm2 will include a colon here
-				or string match -q -- "st-*" $TERM # suckless' st
-				or test -n "$VTE_VERSION" -a "$VTE_VERSION" -ge 3600 # Should be all gtk3-vte-based terms after version 3.6.0.0
-				or test "$COLORTERM" = truecolor -o "$COLORTERM" = 24bit # slang expects this
-			end
-			# Only set it if it isn't to allow override by setting to 0
-			set -q fish_term24bit; or set -g fish_term24bit 1
-		end
-	end
+    # The user has seemingly explicitly launched an old fish with too-new scripts installed.
+    if not contains -- "string" (builtin -n)
+        set -g __is_launched_without_string 1
+        # XXX nostring - fix old fish binaries with no `string' builtin.
+        # When executed on fish 2.2.0, the `else' block after this would
+        # force on 24-bit mode due to changes to in test behavior.
+        # These "XXX nostring" hacks were added for 2.3.1
+        set_color --bold
+        echo "You appear to be trying to launch an old fish binary with newer scripts "
+        echo "installed into" (set_color --underline)"$__fish_datadir"
+        set_color normal
+        echo -e "\nThis is an unsupported configuration.\n"
+        set_color yellow
+        echo "You may need to uninstall and reinstall fish!"
+        set_color normal
+        # Remove this code when we've made it safer to upgrade fish.
+    else
+        # Enable truecolor/24-bit support for select terminals
+        # Ignore Neovim (in 0.1.4 at least), Screen and emacs' ansi-term as they swallow the sequences, rendering the text white.
+        if not set -q NVIM_LISTEN_ADDRESS
+            and not set -q STY
+            and not string match -q -- 'eterm*' $TERM
+            and begin
+                set -q KONSOLE_PROFILE_NAME # KDE's konsole
+                or string match -q -- "*:*" $ITERM_SESSION_ID # Supporting versions of iTerm2 will include a colon here
+                or string match -q -- "st-*" $TERM # suckless' st
+                or test -n "$VTE_VERSION" -a "$VTE_VERSION" -ge 3600 # Should be all gtk3-vte-based terms after version 3.6.0.0
+                or test "$COLORTERM" = truecolor -o "$COLORTERM" = 24bit # slang expects this
+            end
+            # Only set it if it isn't to allow override by setting to 0
+            set -q fish_term24bit
+            or set -g fish_term24bit 1
+        end
+    end
 else
-	# Hook up the default as the principal command_not_found handler
-	# in case we are not interactive
-	function __fish_command_not_found_handler --on-event fish_command_not_found
-		__fish_default_command_not_found_handler $argv
-	end
+    # Hook up the default as the principal command_not_found handler
+    # in case we are not interactive
+    function __fish_command_not_found_handler --on-event fish_command_not_found
+        __fish_default_command_not_found_handler $argv
+    end
 end
 
 #
@@ -65,13 +66,13 @@ end
 set -l configdir ~/.config
 
 if set -q XDG_CONFIG_HOME
-	set configdir $XDG_CONFIG_HOME
+    set configdir $XDG_CONFIG_HOME
 end
 
 set -l userdatadir ~/.local/share
 
 if set -q XDG_DATA_HOME
-	set userdatadir $XDG_DATA_HOME
+    set userdatadir $XDG_DATA_HOME
 end
 
 # __fish_datadir, __fish_sysconfdir, __fish_help_dir, __fish_bin_dir
@@ -90,19 +91,19 @@ end
 # default functions/completions are included in the respective path.
 
 if not set -q fish_function_path
-	set fish_function_path $configdir/fish/functions $__fish_sysconfdir/functions $__extra_functionsdir $__fish_datadir/functions
+    set fish_function_path $configdir/fish/functions $__fish_sysconfdir/functions $__extra_functionsdir $__fish_datadir/functions
 end
 
 if not contains -- $__fish_datadir/functions $fish_function_path
-	set fish_function_path $fish_function_path $__fish_datadir/functions
+    set fish_function_path $fish_function_path $__fish_datadir/functions
 end
 
 if not set -q fish_complete_path
-	set fish_complete_path $configdir/fish/completions $__fish_sysconfdir/completions $__extra_completionsdir $__fish_datadir/completions $userdatadir/fish/generated_completions
+    set fish_complete_path $configdir/fish/completions $__fish_sysconfdir/completions $__extra_completionsdir $__fish_datadir/completions $userdatadir/fish/generated_completions
 end
 
 if not contains -- $__fish_datadir/completions $fish_complete_path
-	set fish_complete_path $fish_complete_path $__fish_datadir/completions
+    set fish_complete_path $fish_complete_path $__fish_datadir/completions
 end
 
 #
@@ -114,28 +115,31 @@ end
 #
 
 if test -d /usr/xpg4/bin
-	if not contains -- /usr/xpg4/bin $PATH
-		set PATH /usr/xpg4/bin $PATH
-	end
+    if not contains -- /usr/xpg4/bin $PATH
+        set PATH /usr/xpg4/bin $PATH
+    end
 end
 
 # OS X-ism: Load the path files out of /etc/paths and /etc/paths.d/*
 set -g __fish_tmp_path $PATH
 function __fish_load_path_helper_paths
-	# We want to rearrange the path to reflect this order. Delete that path component if it exists and then prepend it.
-	# Since we are prepending but want to preserve the order of the input file, we reverse the array, append, and then reverse it again
-	set __fish_tmp_path $__fish_tmp_path[-1..1]
-	while read -l new_path_comp
-		if test -d $new_path_comp
-			set -l where (contains -i -- $new_path_comp $__fish_tmp_path)
-			and set -e __fish_tmp_path[$where]
-			set __fish_tmp_path $new_path_comp $__fish_tmp_path
-		end
-	end
-	set __fish_tmp_path $__fish_tmp_path[-1..1]
+    # We want to rearrange the path to reflect this order. Delete that path component if it exists and then prepend it.
+    # Since we are prepending but want to preserve the order of the input file, we reverse the array, append, and then reverse it again
+    set __fish_tmp_path $__fish_tmp_path[-1..1]
+    while read -l new_path_comp
+        if test -d $new_path_comp
+            set -l where (contains -i -- $new_path_comp $__fish_tmp_path)
+            and set -e __fish_tmp_path[$where]
+            set __fish_tmp_path $new_path_comp $__fish_tmp_path
+        end
+    end
+    set __fish_tmp_path $__fish_tmp_path[-1..1]
+end
+test -r /etc/paths
+and __fish_load_path_helper_paths </etc/paths
+for pathfile in /etc/paths.d/*
+    __fish_load_path_helper_paths <$pathfile
 end
-test -r /etc/paths ; and __fish_load_path_helper_paths < /etc/paths
-for pathfile in /etc/paths.d/* ; __fish_load_path_helper_paths < $pathfile ; end
 set -xg PATH $__fish_tmp_path
 set -e __fish_tmp_path
 functions -e __fish_load_path_helper_paths
@@ -144,23 +148,23 @@ functions -e __fish_load_path_helper_paths
 # Add a handler for when fish_user_path changes, so we can apply the same changes to PATH
 # Invoke it immediately to apply the current value of fish_user_path
 function __fish_reconstruct_path -d "Update PATH when fish_user_paths changes" --on-variable fish_user_paths
-	set -l local_path $PATH
-	set -l x
-	for x in $__fish_added_user_paths
-		set -l idx (contains --index -- $x $local_path)
-		and set -e local_path[$idx]
-	end
+    set -l local_path $PATH
+    set -l x
+    for x in $__fish_added_user_paths
+        set -l idx (contains --index -- $x $local_path)
+        and set -e local_path[$idx]
+    end
 
-	set -e __fish_added_user_paths
-	for x in $fish_user_paths[-1..1]
-		if set -l idx (contains --index -- $x $local_path)
-			set -e local_path[$idx]
-		else
-			set -g __fish_added_user_paths $__fish_added_user_paths $x
-		end
-		set local_path $x $local_path
-	end
-	set -xg PATH $local_path
+    set -e __fish_added_user_paths
+    for x in $fish_user_paths[-1..1]
+        if set -l idx (contains --index -- $x $local_path)
+            set -e local_path[$idx]
+        else
+            set -g __fish_added_user_paths $__fish_added_user_paths $x
+        end
+        set local_path $x $local_path
+    end
+    set -xg PATH $local_path
 end
 __fish_reconstruct_path
 
@@ -168,7 +172,7 @@ __fish_reconstruct_path
 # Launch debugger on SIGTRAP
 #
 function fish_sigtrap_handler --on-signal TRAP --no-scope-shadowing --description "Signal handler for the TRAP signal. Launches a debug prompt."
-	breakpoint
+    breakpoint
 end
 
 #
@@ -177,22 +181,22 @@ end
 # This handler removes itself after it is first called.
 #
 function __fish_on_interactive --on-event fish_prompt
-	__fish_config_interactive
-	functions -e __fish_on_interactive
+    __fish_config_interactive
+    functions -e __fish_on_interactive
 end
 
 # "." command for compatibility with old fish versions.
 function . --description 'Evaluate contents of file (deprecated, see "source")' --no-scope-shadowing
-	if begin
-			test (count $argv) -eq 0
-			# Uses tty directly, as isatty depends on "."
-			and tty 0>&0 >/dev/null
-		end
-		echo "source: '.' command is deprecated, and doesn't work with STDIN anymore. Did you mean 'source' or './'?" >&2
-		return 1
-	else
-		source $argv
-	end
+    if begin
+            test (count $argv) -eq 0
+            # Uses tty directly, as isatty depends on "."
+            and tty 0>&0 >/dev/null
+        end
+        echo "source: '.' command is deprecated, and doesn't work with STDIN anymore. Did you mean 'source' or './'?" >&2
+        return 1
+    else
+        source $argv
+    end
 end
 
 # Set the locale if it isn't explicitly set. Allowing the lack of locale env vars to imply the
@@ -204,23 +208,25 @@ __fish_set_locale
 # Implement precedence (User > Admin > Extra (e.g. vendors) > Fish) by basically doing "basename"
 set -l sourcelist
 for file in $configdir/fish/conf.d/*.fish $__fish_sysconfdir/conf.d/*.fish $__extra_confdir/*.fish
-	set -l basename (string replace -r '^.*/' '' -- $file)
-	contains -- $basename $sourcelist; and continue
-	set sourcelist $sourcelist $basename
-	# Also skip non-files or unreadable files
-	# This allows one to use e.g. symlinks to /dev/null to "mask" something (like in systemd)
-	[ -f $file -a -r $file ]; and source $file
+    set -l basename (string replace -r '^.*/' '' -- $file)
+    contains -- $basename $sourcelist
+    and continue
+    set sourcelist $sourcelist $basename
+    # Also skip non-files or unreadable files
+    # This allows one to use e.g. symlinks to /dev/null to "mask" something (like in systemd)
+    [ -f $file -a -r $file ]
+    and source $file
 end
 
 # Upgrade pre-existing abbreviations from the old "key=value" to the new "key value" syntax
 # This needs to be in share/config.fish because __fish_config_interactive is called after 2sourcing config.fish, which might contain abbr calls
 if not set -q __fish_init_2_3_0
-	set -l fab
-	for abb in $fish_user_abbreviations
-		set fab $fab (string replace -r '^([^ =]+)=(.*)$' '$1 $2' -- $abb)
-	end
-	set fish_user_abbreviations $fab
-	set -U __fish_init_2_3_0
+    set -l fab
+    for abb in $fish_user_abbreviations
+        set fab $fab (string replace -r '^([^ =]+)=(.*)$' '$1 $2' -- $abb)
+    end
+    set fish_user_abbreviations $fab
+    set -U __fish_init_2_3_0
 end
 
 #
@@ -230,15 +236,15 @@ end
 
 if status --is-login
 
-	#
-	# Put linux consoles in unicode mode.
-	#
+    #
+    # Put linux consoles in unicode mode.
+    #
 
-	if test "$TERM" = linux
-		if string match -qir '\.UTF' -- $LANG
-			if command -s unicode_start >/dev/null
-				unicode_start
-			end
-		end
-	end
+    if test "$TERM" = linux
+        if string match -qir '\.UTF' -- $LANG
+            if command -s unicode_start >/dev/null
+                unicode_start
+            end
+        end
+    end
 end
diff --git a/share/functions/__fish_print_hostnames.fish b/share/functions/__fish_print_hostnames.fish
index 93d5e3e64..4bec16fb3 100644
--- a/share/functions/__fish_print_hostnames.fish
+++ b/share/functions/__fish_print_hostnames.fish
@@ -11,28 +11,28 @@ function __fish_print_hostnames -d "Print a list of known hostnames"
     else if test -r /etc/hosts
         # Ignore commented lines and functionally empty lines. Strip comments.
         string match -r -v '^\s*0.0.0.0|^\s*#|^\s*$' </etc/hosts | string replace -ra '#.*$' '' | string replace -r '[0-9.]*\s*' '' | string trim | string replace -ra '\s+' '\n'
-end
-
-# Print nfs servers from /etc/fstab
-if test -r /etc/fstab
-    string match -r '^\s*[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3]:|^[a-zA-Z\.]*:' </etc/fstab | string replace -r ':.*' ''
-end
-
-# Check hosts known to ssh
-set -l known_hosts ~/.ssh/known_hosts{,2} /etc/ssh/known_hosts{,2} # Yes, seriously - the default specifies both with and without "2"
-for file in /etc/ssh/ssh_config ~/.ssh/config
-    if test -r $file
-        # Print hosts from system wide ssh configuration file
-        # Note the non-capturing group to avoid printing "name"
-        string match -ri '\s*Host(?:name)?(?:\s+|\s*=\s*)\w.*' <$file | string replace -ri '^\s*Host(?:name)?\s*(\S+)' '$1' | string replace -r '\s+' ' ' | string split ' '
-        set known_hosts $known_hosts (string match -ri '^\s*UserKnownHostsFile|^\s*GlobalKnownHostsFile' < $file \
-				| string replace -ri '.*KnownHostsFile\s*' '')
     end
-end
-for file in $known_hosts
-    # Ignore hosts that are hashed, commented or have custom ports (like [localhost]:2200)
-    test -r $file
-    and string replace -ra '(\S+) .*' '$1' <$file | string match -r '^[^#|[=]+$' | string split ","
-end
-return 0
+
+    # Print nfs servers from /etc/fstab
+    if test -r /etc/fstab
+        string match -r '^\s*[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3]:|^[a-zA-Z\.]*:' </etc/fstab | string replace -r ':.*' ''
+    end
+
+    # Check hosts known to ssh
+    set -l known_hosts ~/.ssh/known_hosts{,2} /etc/ssh/known_hosts{,2} # Yes, seriously - the default specifies both with and without "2"
+    for file in /etc/ssh/ssh_config ~/.ssh/config
+        if test -r $file
+            # Print hosts from system wide ssh configuration file
+            # Note the non-capturing group to avoid printing "name"
+            string match -ri '\s*Host(?:name)?(?:\s+|\s*=\s*)\w.*' <$file | string replace -ri '^\s*Host(?:name)?\s*(\S+)' '$1' | string replace -r '\s+' ' ' | string split ' '
+            set known_hosts $known_hosts (string match -ri '^\s*UserKnownHostsFile|^\s*GlobalKnownHostsFile' < $file \
+				| string replace -ri '.*KnownHostsFile\s*' '')
+        end
+    end
+    for file in $known_hosts
+        # Ignore hosts that are hashed, commented or have custom ports (like [localhost]:2200)
+        test -r $file
+        and string replace -ra '(\S+) .*' '$1' <$file | string match -r '^[^#|[=]+$' | string split ","
+    end
+    return 0
 end