From bc4e54c0c45abbbb5fe9ac3278361d0b4e5774ba Mon Sep 17 00:00:00 2001
From: Blaž Hrastnik
Date: Wed, 7 Apr 2021 23:56:20 +0900
Subject: Load config files from ~/.config/helix, fallback to defaults.

---
 helix-term/src/main.rs | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'helix-term/src')

diff --git a/helix-term/src/main.rs b/helix-term/src/main.rs
index a2ea5993..612f8cf0 100644
--- a/helix-term/src/main.rs
+++ b/helix-term/src/main.rs
@@ -74,10 +74,17 @@ fn main() {
     setup_logging(verbosity).expect("failed to initialize logging.");
 
     // initialize language registry
+    use helix_core::config_dir;
     use helix_core::syntax::{Loader, LOADER};
-    let toml = include_str!("../../languages.toml");
+
+    // load $HOME/.config/helix/languages.toml, fallback to default config
+    let config = std::fs::read(config_dir().join("languages.toml"));
+    let toml = config
+        .as_deref()
+        .unwrap_or(include_bytes!("../../languages.toml"));
+
     LOADER.get_or_init(|| {
-        let config = toml::from_str(toml).expect("Could not parse languages.toml");
+        let config = toml::from_slice(toml).expect("Could not parse languages.toml");
         Loader::new(config)
     });
 
-- 
cgit v1.2.3-70-g09d2