From eb8f8ad08da8409621a981524e9213f87f55ae6a Mon Sep 17 00:00:00 2001
From: MaxVerevkin <maxxverrr@gmail.com>
Date: Sun, 26 Mar 2023 00:26:07 +0200
Subject: remove dirs_next dependency

---
 Cargo.lock    | 53 -----------------------------------------------------
 Cargo.toml    |  1 -
 src/config.rs | 10 ++++++++--
 3 files changed, 8 insertions(+), 56 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 01e27ef..c318d0f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -75,27 +75,6 @@ dependencies = [
  "unicode-segmentation",
 ]
 
-[[package]]
-name = "dirs-next"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1"
-dependencies = [
- "cfg-if",
- "dirs-sys-next",
-]
-
-[[package]]
-name = "dirs-sys-next"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d"
-dependencies = [
- "libc",
- "redox_users",
- "winapi",
-]
-
 [[package]]
 name = "futures"
 version = "0.3.27"
@@ -185,17 +164,6 @@ dependencies = [
  "slab",
 ]
 
-[[package]]
-name = "getrandom"
-version = "0.2.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31"
-dependencies = [
- "cfg-if",
- "libc",
- "wasi",
-]
-
 [[package]]
 name = "gio"
 version = "0.17.4"
@@ -305,7 +273,6 @@ name = "i3bar-river"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "dirs-next",
  "futures",
  "memchr",
  "pangocairo",
@@ -555,26 +522,6 @@ dependencies = [
  "proc-macro2",
 ]
 
-[[package]]
-name = "redox_syscall"
-version = "0.2.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
-dependencies = [
- "bitflags",
-]
-
-[[package]]
-name = "redox_users"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b"
-dependencies = [
- "getrandom",
- "redox_syscall",
- "thiserror",
-]
-
 [[package]]
 name = "ryu"
 version = "1.0.13"
diff --git a/Cargo.toml b/Cargo.toml
index 7a14024..c7ee81a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -5,7 +5,6 @@ edition = "2021"
 
 [dependencies]
 anyhow = "1"
-dirs-next = "2"
 toml = "0.7"
 pangocairo = "0.17"
 serde = { version = "1", features = ["derive"] }
diff --git a/src/config.rs b/src/config.rs
index 3ce06a2..487f05b 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -1,12 +1,12 @@
 use crate::color::Color;
 use crate::protocol::zwlr_layer_surface_v1;
 use anyhow::{Context, Result};
-use dirs_next::config_dir;
 use pangocairo::pango::FontDescription;
 use serde::{de, Deserialize};
-use std::fmt;
 use std::fs::read_to_string;
 use std::ops::Deref;
+use std::path::PathBuf;
+use std::{env, fmt};
 
 #[derive(Deserialize, Debug)]
 #[serde(deny_unknown_fields, default)]
@@ -103,6 +103,12 @@ impl Config {
     }
 }
 
+fn config_dir() -> Option<PathBuf> {
+    env::var_os("XDG_CONFIG_HOME")
+        .map(PathBuf::from)
+        .or_else(|| Some(PathBuf::from(env::var_os("HOME")?).join("config")))
+}
+
 #[derive(Deserialize, Debug, Clone, Copy, PartialEq, Eq)]
 #[serde(rename_all = "lowercase")]
 pub enum Position {
-- 
cgit v1.3.1