pogmommy/zellij
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #488 from a-kenji/darwin-config-dir

Browse source 
Change Ordering of the Default Config Directories
This commit is contained in:
a-kenji 2021-05-11 13:24:56 +02:00 • committed by GitHub
commit 7d553bbeba
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -5,6 +5,7 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
## [Unreleased] ## [Unreleased]
* Change Switch default config loading order of `HOME` and system (https://github.com/zellij-org/zellij/pull/488)
## [0.9.0] - 2021-05-11 ## [0.9.0] - 2021-05-11
* Add more functionality to unbinding the default keybindings (https://github.com/zellij-org/zellij/pull/468) * Add more functionality to unbinding the default keybindings (https://github.com/zellij-org/zellij/pull/468)

2
src/common/setup.rs
View file

@ -53,8 +53,8 @@ pub mod install {
#[cfg(not(test))] #[cfg(not(test))]
pub fn find_default_config_dir() -> Option<PathBuf> { pub fn find_default_config_dir() -> Option<PathBuf> {
vec![ vec![
Some(xdg_config_dir()),
home_config_dir(), home_config_dir(),
Some(xdg_config_dir()),
Some(Path::new(SYSTEM_DEFAULT_CONFIG_DIR).to_path_buf()), Some(Path::new(SYSTEM_DEFAULT_CONFIG_DIR).to_path_buf()),
] ]
.into_iter() .into_iter()