From ab0aef570b1565c57d59698822977c1bf9a55d54 Mon Sep 17 00:00:00 2001
From: Luis Guilherme Coelho <lgcoelho@disroot.org>
Date: Sun, 10 Dec 2023 12:32:14 -0300
Subject: [PATCH] home-services: shells: Remove from redundant functionality

---
 modules/radix/home/services/shells.scm | 31 +++-----------------------
 1 file changed, 3 insertions(+), 28 deletions(-)

diff --git a/modules/radix/home/services/shells.scm b/modules/radix/home/services/shells.scm
index f56d10c..059e16c 100644
--- a/modules/radix/home/services/shells.scm
+++ b/modules/radix/home/services/shells.scm
@@ -120,43 +120,18 @@ typed in the shell, will automatically expand to the full text."
      ,(mixed-text-file
        "fish-config.fish"
        #~(string-append "\
-set --prepend fish_function_path " #$fish-foreign-env "/share/fish/functions
 # if we haven't sourced the login config, do it
 status --is-login; and not set -q __fish_login_config_sourced
 and begin
 
+  set --prepend fish_function_path "
+                        #$fish-foreign-env
+                        "/share/fish/functions
   fenv source $HOME/.profile
   set -e fish_function_path[1]
 
   set -g __fish_login_config_sourced 1
 
-end
-
-if test -e $HOME/.config/user-dirs.dirs
-    set -gx XDG_DESKTOP_DIR \
-            (fenv \"source $HOME/.config/user-dirs.dirs \\
-                  echo $XDG_DESKTOP_DIR\" 2>/dev/null)
-    set -gx XDG_DOCUMENTS_DIR \
-            (fenv \"source $HOME/.config/user-dirs.dirs \\
-                  echo $XDG_DOCUMENTS_DIR\" 2>/dev/null)
-    set -gx XDG_DOWNLOAD_DIR \
-            (fenv \"source $HOME/.config/user-dirs.dirs \\
-                  echo $XDG_DOWNLOAD_DIR\" 2>/dev/null)
-    set -gx XDG_MUSIC_DIR \
-            (fenv \"source $HOME/.config/user-dirs.dirs \\
-                  echo $XDG_MUSIC_DIR\" 2>/dev/null)
-    set -gx XDG_PICTURES_DIR \
-            (fenv \"source $HOME/.config/user-dirs.dirs \\
-                  echo $XDG_PICTURES_DIR\" 2>/dev/null)
-    set -gx XDG_PUBLICSHARE_DIR \
-            (fenv \"source $HOME/.config/user-dirs.dirs \\
-                  echo $XDG_PUBLICSHARE_DIR\" 2>/dev/null)
-    set -gx XDG_TEMPLATES_DIR \
-            (fenv \"source $HOME/.config/user-dirs.dirs \\
-                  echo $XDG_TEMPLATES_DIR\" 2>/dev/null)
-    set -gx XDG_VIDEOS_DIR \
-            (fenv \"source $HOME/.config/user-dirs.dirs \\
-                  echo $XDG_VIDEOS_DIR\" 2>/dev/null)
 end\n\n")
        (serialize-configuration
         config