From f8e4e5344e78117f80a0c35d16910e9e51f7997b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= <lelgenio@disroot.org>
Date: Tue, 6 Jun 2023 10:04:14 -0300
Subject: [PATCH] extract xdg-dirs

---
 user/chat.nix           |  1 -
 user/home.nix           | 20 +-------------------
 user/waybar/default.nix |  2 +-
 user/xdg-dirs.nix       | 26 ++++++++++++++++++++++++++
 4 files changed, 28 insertions(+), 21 deletions(-)
 create mode 100644 user/xdg-dirs.nix

diff --git a/user/chat.nix b/user/chat.nix
index 94bad02..34ddd84 100644
--- a/user/chat.nix
+++ b/user/chat.nix
@@ -4,7 +4,6 @@
       exec thunderbird
       exec webcord
       exec telegram-desktop
-      exec element-desktop
     '';
   };
 
diff --git a/user/home.nix b/user/home.nix
index a764445..0c355e5 100644
--- a/user/home.nix
+++ b/user/home.nix
@@ -33,6 +33,7 @@
     ./sway
     ./gnome.nix
     ./thunar.nix
+    ./xdg-dirs.nix
     inputs.hyprland.homeManagerModules.default
     inputs.nix-index-database.hmModules.nix-index
   ];
@@ -162,25 +163,6 @@
     startInBackground = true;
   };
 
-
-  xdg.userDirs =
-    let
-      HOME = config.home.homeDirectory;
-    in
-    {
-      enable = true;
-      createDirectories = true;
-
-      desktop = "${HOME}/Área de trabalho";
-      documents = "${HOME}/Documentos";
-      download = "${HOME}/Downloads";
-      music = "${HOME}/Música";
-      pictures = "${HOME}/Imagens";
-      publicShare = "${HOME}/Público";
-      templates = "${HOME}/Modelos";
-      videos = "${HOME}/Vídeos";
-    };
-
   services.kdeconnect = {
     enable = true;
     indicator = true;
diff --git a/user/waybar/default.nix b/user/waybar/default.nix
index a54b0c0..9d1d1a4 100644
--- a/user/waybar/default.nix
+++ b/user/waybar/default.nix
@@ -17,7 +17,7 @@ in
           "sway/language"
           "mpd"
           "custom/playerctl"
-          "tray"
+          # "tray"
           "custom/caffeine"
           "pulseaudio"
           (lib.optional (osConfig.services.vpn.enable or false) "custom/vpn")
diff --git a/user/xdg-dirs.nix b/user/xdg-dirs.nix
new file mode 100644
index 0000000..d95d6de
--- /dev/null
+++ b/user/xdg-dirs.nix
@@ -0,0 +1,26 @@
+{ config, pkgs, lib, inputs, ... }:
+let
+  HOME = config.home.homeDirectory;
+in
+{
+  xdg = {
+    userDirs = {
+      enable = true;
+      createDirectories = true;
+
+      desktop = "${HOME}/Área de trabalho";
+      documents = "${HOME}/Documentos";
+      download = "${HOME}/Downloads";
+      music = "${HOME}/Música";
+      pictures = "${HOME}/Imagens";
+      publicShare = "${HOME}/Público";
+      templates = "${HOME}/Modelos";
+      videos = "${HOME}/Vídeos";
+    };
+  };
+
+  home.sessionVariables = {
+    CARGO_HOME = "${config.xdg.dataHome}/cargo";
+    RUSTUP_HOME = "${config.xdg.dataHome}/rustup";
+  };
+}