From 8dcc01d38be8c7c051a9ce7be14180232c277e71 Mon Sep 17 00:00:00 2001
From: candifloss <candifloss@candifloss.cc>
Date: Tue, 21 Jul 2026 15:07:08 +0530
Subject: [PATCH] Improve module loading

---
 .gitignore             | 24 +++++++++++++++---------
 conf.d/80_modules.fish |  8 --------
 conf.d/81_modules.fish | 15 +++++++++++++++
 3 files changed, 30 insertions(+), 17 deletions(-)
 delete mode 100644 conf.d/80_modules.fish
 create mode 100644 conf.d/81_modules.fish

diff --git a/.gitignore b/.gitignore
index 2da3780..d2f0e69 100644
--- a/.gitignore
+++ b/.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/
\ No newline at end of file
+
+# Scratchpad
+test/
\ No newline at end of file
diff --git a/conf.d/80_modules.fish b/conf.d/80_modules.fish
deleted file mode 100644
index a175ead..0000000
--- a/conf.d/80_modules.fish
+++ /dev/null
@@ -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
\ No newline at end of file
diff --git a/conf.d/81_modules.fish b/conf.d/81_modules.fish
new file mode 100644
index 0000000..e8e3ac5
--- /dev/null
+++ b/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
\ No newline at end of file