aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authora-kenji <aks.kenji@protonmail.com>2021-05-11 13:24:56 +0200
committerGitHub <noreply@github.com>2021-05-11 13:24:56 +0200
commit7d553bbeba944febd4b1a290e81593c90def1ecf (patch)
tree7db160127c346a20acf66a5a1573c23630588fc1
parentchore(version): bump development version (diff)
parentChange Ordering of the Default Config Directories (diff)
downloadsl0ppij-7d553bbeba944febd4b1a290e81593c90def1ecf.tar.gz
sl0ppij-7d553bbeba944febd4b1a290e81593c90def1ecf.tar.xz
sl0ppij-7d553bbeba944febd4b1a290e81593c90def1ecf.zip
Merge pull request #488 from a-kenji/darwin-config-dir
Change Ordering of the Default Config Directories
-rw-r--r--CHANGELOG.md1
-rw-r--r--src/common/setup.rs2
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2c47adf5..77287236 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -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/)
## [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
* Add more functionality to unbinding the default keybindings (https://github.com/zellij-org/zellij/pull/468)
diff --git a/src/common/setup.rs b/src/common/setup.rs
index eb3fdb8e..37bf02da 100644
--- a/src/common/setup.rs
+++ b/src/common/setup.rs
@@ -53,8 +53,8 @@ pub mod install {
#[cfg(not(test))]
pub fn find_default_config_dir() -> Option<PathBuf> {
vec![
- Some(xdg_config_dir()),
home_config_dir(),
+ Some(xdg_config_dir()),
Some(Path::new(SYSTEM_DEFAULT_CONFIG_DIR).to_path_buf()),
]
.into_iter()