Improve module loading

.gitignore

@@ -1,12 +1,18 @@
+# Machine-specific, dynamic, generated
 fish_variables
-test/
+
+# Ignore machine-specific configs
+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/local.d/
+functions/local/
+completions/local/
+
+# Must be moved later
 completions/alacritty.fish
 completions/adu.fish
-conf.d/49_aliases_mycompany.fish
-conf.d/48_aliases_desktop.fish
-conf.d/90_local.fish
-conf.d/90_desktop_startx.fish
-functions/desktop/
-functions/work/
-completions/desktop/
-completions/work/
+
+# Scratchpad
+test/

conf.d/80_modules.fish

@@ -1,8 +0,0 @@
-# List of modules to load 
-
-set -g FISH_MODULES \
-    login_x11 
-
-for module in $FISH_MODULES
-    fish_enable_module $module
-end

conf.d/81_modules.fish

@@ -0,0 +1,15 @@
+# Load enabled modules
+
+# Specify the list of modules to load in `conf.d/80_modules_local.fish`
+# Example:
+# set -g FISH_MODULES \
+#     login_x11 \
+#     media \
+#     proxy_mycompany
+
+set -q FISH_MODULES
+or return
+
+for module in $FISH_MODULES
+    fish_enable_module $module
+end