Improved defaults and local overrides

.gitignore

@@ -2,10 +2,11 @@
 fish_variables
 
 # Ignore machine-specific configs
+conf.d/21_overrides.fish
 conf.d/49_aliases_local.fish
 conf.d/59_abbr_local.fish
 conf.d/80_modules_local.fish
-conf.d/90_local.fish
+conf.d/90_misc_local.fish
 conf.d/local.d/
 functions/local/
 completions/local/

conf.d/25_prompt_theme.fish

@@ -6,10 +6,13 @@
 # To print the active prompt theme name:
 # Use function `fish_theme`
 
-# Set the theme name.
+# Set the theme name in `conf.d/21_overrides.fish`.
+# Example:
+# 	set -g FISH_PROMPT_THEME minimaline
 # Default: "default"
 # The theme name must match the theme directory name.
-set -g FISH_PROMPT_THEME default
+set -q FISH_PROMPT_THEME
+or set -g FISH_PROMPT_THEME default
 
 # Load theme
 fish_load_theme $FISH_PROMPT_THEME

conf.d/35_package_manager.fish

@@ -1,13 +1,26 @@
 # Package manager
-
+#
+# Set the package manager name in `conf.d/21_overrides.fish`.
+# Example:
+# 	set -g FISH_PACKAGE_MANAGER dnf
+# Default: "apt"
+# The theme name must match the theme directory name.
+#
 # Supported:
-#	☑ apt
+#	+---+-----------------+---------------------+
-#	☑ dnf
+#	|   | Package Manager |         OS          |
-#	☑ pacman
+#	+---+-----------------+---------------------+
-#	☐ zypper
+#	| ☑ | apt             | (Debian-based)      |
-#	☐ apk
+#	| ☑ | dnf             | (RHEL/Fedora-based) |
-#	☐ xbps
+#	| ☑ | pacman          | (Arch-based)        |
+#	| ☐ | zypper          | (SUSE)              |
+#	| ☐ | apk             | (Alpine)            |
+#	| ☐ | xbps            | (Void)              |
+#	| ☐ | pkg_bsd         | (FreeBSD)           |
+#	| ☐ | pkg_redox       | (RedoxOS)           |
+#	+---+-----------------+---------------------+
 
-set -g FISH_PACKAGE_MANAGER apt
+set -q FISH_PACKAGE_MANAGER
+or set -g FISH_PACKAGE_MANAGER apt
 
 fish_load_package_manager $FISH_PACKAGE_MANAGER

conf.d/80_modules.fish

@@ -1,6 +1,6 @@
 # Load enabled modules
 
-# Specify the list of modules to load in `conf.d/80_modules_local.fish`
+# Specify the list of modules to load in `conf.d/21_overrides.fish`
 # Example:
 # set -g FISH_MODULES \
 #     login_x11 \