diff options
| author | mBornand <dev.mbornand@systemb.ch> | 2025-07-07 23:44:55 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-07-07 21:44:55 +0000 |
| commit | f440cd4d6d503f0e2ac619b2e1b129254857955b (patch) | |
| tree | 68f4a0a3916d424f285a4b848ccce9c79d99a862 | |
| parent | fad5360bf0740f6e2f01e22472a9eb161cda7069 (diff) | |
| download | r-alacritty-f440cd4d6d503f0e2ac619b2e1b129254857955b.tar.gz r-alacritty-f440cd4d6d503f0e2ac619b2e1b129254857955b.tar.bz2 r-alacritty-f440cd4d6d503f0e2ac619b2e1b129254857955b.zip | |
Add global config fallback
Co-authored-by: Christian Duerr <contact@christianduerr.com>
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | README.md | 1 | ||||
| -rw-r--r-- | alacritty/src/config/mod.rs | 5 | ||||
| -rw-r--r-- | extra/man/alacritty.1.scd | 1 | ||||
| -rw-r--r-- | extra/man/alacritty.5.scd | 1 |
5 files changed, 8 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index c3e08c43..db7053fa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,6 +20,7 @@ Notable changes to the `alacritty_terminal` crate are documented in its - IPC config retrieval using `alacritty msg get-config` - Multi-sequence touch zoom sequences - Vi action `Y` keybind, yank to the end of line +- Add `/etc/alacritty/alacritty.toml` fallback for system wide configuration ### Changed @@ -68,6 +68,7 @@ following locations: 2. `$XDG_CONFIG_HOME/alacritty.toml` 3. `$HOME/.config/alacritty/alacritty.toml` 4. `$HOME/.alacritty.toml` +5. `/etc/alacritty/alacritty.toml` On Windows, the config file will be looked for in: diff --git a/alacritty/src/config/mod.rs b/alacritty/src/config/mod.rs index db57c102..5d35c2e0 100644 --- a/alacritty/src/config/mod.rs +++ b/alacritty/src/config/mod.rs @@ -368,6 +368,7 @@ fn prune_yaml_nulls(value: &mut serde_yaml::Value, warn_pruned: bool) { /// 2. $XDG_CONFIG_HOME/alacritty.toml /// 3. $HOME/.config/alacritty/alacritty.toml /// 4. $HOME/.alacritty.toml +/// 5. /etc/alacritty/alacritty.toml #[cfg(not(windows))] pub fn installed_config(suffix: &str) -> Option<PathBuf> { let file_name = format!("alacritty.{suffix}"); @@ -390,7 +391,9 @@ pub fn installed_config(suffix: &str) -> Option<PathBuf> { return Some(fallback); } } - None + + let fallback = PathBuf::from("/etc/alacritty").join(&file_name); + fallback.exists().then_some(fallback) }) } diff --git a/extra/man/alacritty.1.scd b/extra/man/alacritty.1.scd index 86630a65..96745033 100644 --- a/extra/man/alacritty.1.scd +++ b/extra/man/alacritty.1.scd @@ -72,6 +72,7 @@ set of features with high performance. . _$XDG_CONFIG_HOME/alacritty.toml_ . _$HOME/.config/alacritty/alacritty.toml_ . _$HOME/.alacritty.toml_ + . _/etc/alacritty/alacritty.toml_ On Windows, the config file will be looked for in: diff --git a/extra/man/alacritty.5.scd b/extra/man/alacritty.5.scd index ef6e4f19..af4a79fa 100644 --- a/extra/man/alacritty.5.scd +++ b/extra/man/alacritty.5.scd @@ -18,6 +18,7 @@ following locations on UNIX systems: . _$XDG_CONFIG_HOME/alacritty.toml_ . _$HOME/.config/alacritty/alacritty.toml_ . _$HOME/.alacritty.toml_ +. _/etc/alacritty/alacritty.toml_ On Windows, the config file will be looked for in: |