aboutsummaryrefslogtreecommitdiff
path: root/src/utils
diff options
context:
space:
mode:
authorIvan Molodetskikh <yalterz@gmail.com>2025-09-27 11:20:43 +0300
committerIvan Molodetskikh <yalterz@gmail.com>2025-10-02 09:38:17 +0300
commitb3ae3adbb77c4111366cb59b80d757f361c70237 (patch)
treeaf60f8397ae9971b3ab2889c0925c705abe02a25 /src/utils
parent264289cd41069bd2c85c523a1b0c687eab0a89d7 (diff)
downloadniri-b3ae3adbb77c4111366cb59b80d757f361c70237.tar.gz
niri-b3ae3adbb77c4111366cb59b80d757f361c70237.tar.bz2
niri-b3ae3adbb77c4111366cb59b80d757f361c70237.zip
Partially implement config includes
Subsequent commits will add merging for all leftover sections.
Diffstat (limited to 'src/utils')
-rw-r--r--src/utils/mod.rs2
-rw-r--r--src/utils/watcher.rs2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/utils/mod.rs b/src/utils/mod.rs
index a96c1bfc..8efa8654 100644
--- a/src/utils/mod.rs
+++ b/src/utils/mod.rs
@@ -213,7 +213,7 @@ pub fn expand_home(path: &Path) -> anyhow::Result<Option<PathBuf>> {
}
pub fn make_screenshot_path(config: &Config) -> anyhow::Result<Option<PathBuf>> {
- let Some(path) = &config.screenshot_path else {
+ let Some(path) = &config.screenshot_path.0 else {
return Ok(None);
};
diff --git a/src/utils/watcher.rs b/src/utils/watcher.rs
index 034e963a..ecb9007b 100644
--- a/src/utils/watcher.rs
+++ b/src/utils/watcher.rs
@@ -128,7 +128,7 @@ pub fn setup(state: &mut State, config_path: &ConfigPath) {
// Parsing the config actually takes > 20 ms on my beefy machine, so let's do it on the
// watcher thread.
let process = |path: &ConfigPath| {
- path.load().map_err(|err| {
+ path.load().config.map_err(|err| {
warn!("{err:?}");
})
};