diff --git a/assets/default/fish-config/.gitignore b/assets/default/fish-config/.gitignore
new file mode 100644
index 0000000..80bc646
--- /dev/null
+++ b/assets/default/fish-config/.gitignore
@@ -0,0 +1 @@
+*.local.fish
diff --git a/assets/default/fish-config/init.fish b/assets/default/fish-config/init.fish
index 30cb265..f579972 100644
--- a/assets/default/fish-config/init.fish
+++ b/assets/default/fish-config/init.fish
@@ -1,2 +1,14 @@
-source $OMF_CONFIG/paths.fish
-source $OMF_CONFIG/alias.fish
+function source_config
+    # Sources a config file and corresponding local config file if it exists
+    set shared_config "$OMF_CONFIG/$argv[1].fish"
+    set local_config "$OMF_CONFIG/$argv[1].local.fish"
+    if test -f "$shared_config"
+        source "$shared_config"
+    end
+    if test -f "$local_config"
+        source "$local_config"
+    end
+end
+
+source_config paths
+source_config alias