mirrors/helix
1
0
Fork 0
mirror of https://github.com/helix-editor/helix.git synced 2025-04-05 20:07:44 +03:00
Code Issues Projects Releases Packages Wiki Activity

Load config files from ~/.config/helix, fallback to defaults.

Browse source
This commit is contained in:
Blaž Hrastnik 2021-04-07 23:56:20 +09:00
parent f0d49d3ca4
commit bc4e54c0c4
5 changed files with 32 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Cargo.lock generated
View file

@ -496,6 +496,7 @@ dependencies = [
"tree-sitter", "tree-sitter",
"unicode-segmentation", "unicode-segmentation",
"unicode-width", "unicode-width",
"xdg",
] ]
[[package]] [[package]]
@ -1390,3 +1391,9 @@ name = "winapi-x86_64-pc-windows-gnu"
version = "0.4.0" version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
[[package]]
name = "xdg"
version = "2.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d089681aa106a86fade1b0128fb5daf07d5867a509ab036d99988dec80429a57"

2
helix-core/Cargo.toml
View file

@ -21,3 +21,5 @@ once_cell = "1.4"
regex = "1" regex = "1"
serde = { version = "1.0", features = ["derive"] } serde = { version = "1.0", features = ["derive"] }
xdg = "2.0"

7
helix-core/src/lib.rs
View file

@ -44,6 +44,13 @@ pub(crate) fn find_first_non_whitespace_char(text: RopeSlice, line_num: usize) -
None None
} }
pub fn config_dir() -> std::path::PathBuf {
// TODO: allow env var override
let xdg_dirs =
xdg::BaseDirectories::with_prefix("helix").expect("Unable to find XDG directories!");
xdg_dirs.get_config_home()
}
pub use ropey::{Rope, RopeSlice}; pub use ropey::{Rope, RopeSlice};
pub use tendril::StrTendril as Tendril; pub use tendril::StrTendril as Tendril;

11
helix-term/src/main.rs
View file

@ -74,10 +74,17 @@ fn main() {
setup_logging(verbosity).expect("failed to initialize logging."); setup_logging(verbosity).expect("failed to initialize logging.");
// initialize language registry // initialize language registry
use helix_core::config_dir;
use helix_core::syntax::{Loader, LOADER}; 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(|| { 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) Loader::new(config)
}); });

10
helix-view/src/editor.rs
View file

@ -25,9 +25,13 @@ pub enum Action {
impl Editor { impl Editor {
pub fn new(executor: &'static smol::Executor<'static>, mut area: tui::layout::Rect) -> Self { pub fn new(executor: &'static smol::Executor<'static>, mut area: tui::layout::Rect) -> Self {
// TODO: load from config dir use helix_core::config_dir;
let toml = include_str!("../../theme.toml"); let config = std::fs::read(config_dir().join("theme.toml"));
let theme: Theme = toml::from_str(&toml).expect("failed to parse theme.toml"); // load $HOME/.config/helix/theme.toml, fallback to default config
let toml = config
.as_deref()
.unwrap_or(include_bytes!("../../theme.toml"));
let theme: Theme = toml::from_slice(&toml).expect("failed to parse theme.toml");
let language_servers = helix_lsp::Registry::new(); let language_servers = helix_lsp::Registry::new();