From e1bffd15be86777c07f45ea2283c8f24989baff9 Mon Sep 17 00:00:00 2001
From: Luis Guilherme Coelho <lgcoelho@disroot.org>
Date: Sat, 30 Dec 2023 23:59:29 -0300
Subject: [PATCH] home-environments: radio: Set environment variables in their
 proper context

---
 home-environments/radio.scm | 77 +++++++++++++++++--------------------
 1 file changed, 36 insertions(+), 41 deletions(-)

diff --git a/home-environments/radio.scm b/home-environments/radio.scm
index edb3fa8..f4b9d85 100644
--- a/home-environments/radio.scm
+++ b/home-environments/radio.scm
@@ -221,13 +221,45 @@
                    (home-fish-configuration
                     (config (list file:fish-custom-functions))
                     (environment-variables
-                     `(("GPG_TTY" . "(tty)")
+                     `(#|GNU Privacy Guard|#
+                       ("GPG_TTY" . "(tty)")
+
+                       #|Guile|#
+                       ("GUILE_WARN_DEPRECATED" . "detailed")
+                       ("GUILE_HISTORY" . "$XDG_CACHE_HOME/guile/history")
                        ("GUILE_LOAD_PATH"
                         . ,(format #f "~a~@{:~a/share/guile/site/3.0~}"
                                       "$HOME/areas/code/scm/radix"
                                       "$HOME/.guix-home/profile"
                                       "$XDG_CONFIG_HOME/guix/current"
                                       "/run/current-system/profile"))
+
+                       #|Language|#
+                       ("LANG"       . "en_US.UTF-8")
+                       ("LANGUAGE"   . "en_US.UTF-8")
+                       ("LC_COLLATE" . "C")
+
+                       #|Default applications|#
+                       ("BROWSER"  . "icecat")
+                       ("EDITOR"   . "kak")
+                       ("FCEDIT"   . "kak")
+                       ("PAGER"    . "less")
+                       ("READER"   . "zathura")
+                       ("SHELL"    . "fish")
+                       ("TERMINAL" . "xst")
+                       ("VISUAL"   . "kak")
+                       ("WM"       . "awesome")
+
+                       #|Remind|#
+                       ("DOTREMINDERS" . "$XDG_DATA_HOME/reminders")
+
+                       #|GTK|#
+                       ("GTK_RC_FILES" . "$XDG_CONFIG_HOME/gtk-2.0/gtkrc")
+
+                       #|Ncurses|#
+                       ("TERMINFO" . "$XDG_DATA_HOME/terminfo")
+
+                       #|Fish completion|#
                        ("fish_complete_path"
                         . ,(format #f "$fish_complete_path~@{ ~a/fish/completions}"
                                       "$HOME/.guix-home/profile/share"))))
@@ -440,47 +472,10 @@
 
           (simple-service 'environment-variables-service
                           home-environment-variables-service-type
-                          `(#|Shells|#
-                            ("PATH" . "$HOME/.local/bin:$PATH")
-                            ("ENV"  . "$XDG_CONFIG_HOME/dash/init.sh")
-
-                            #|Language|#
-                            ("LANG"       . "en_US.UTF-8")
-                            ("LANGUAGE"   . "en_US.UTF-8")
-                            ("LC_COLLATE" . "C")
-
-                            #|Default applications|#
-                            ("BROWSER"  . "icecat")
-                            ("EDITOR"   . "kak")
-                            ("FCEDIT"   . "kak")
-                            ("PAGER"    . "less")
-                            ("READER"   . "zathura")
-                            ("SHELL"    . "fish")
-                            ("TERMINAL" . "xst")
-                            ("VISUAL"   . "kak")
-                            ("WM"       . "awesome")
-
-                            #|Xorg|#
+                          `(("PATH"    . "$HOME/.local/bin:$PATH")
+                            ("ENV"     . "$XDG_CONFIG_HOME/dash/init.sh")
                             ("XINITRC" . "$XDG_CONFIG_HOME/x11/xinitrc")
-
-                            #|Readline|#
-                            ("INPUTRC" . "$XDG_CONFIG_HOME/readline/inputrc")
-
-                            #|GTK|#
-                            ("GTK_RC_FILES" . "$XDG_CONFIG_HOME/gtk-2.0/gtkrc")
-
-                            #|Guile|#
-                            ("GUILE_WARN_DEPRECATED" . "detailed")
-                            ("GUILE_HISTORY" . "$XDG_CACHE_HOME/guile/history")
-
-                            #|Guix|#
-                            ("GUIX_PROFILE" . "$XDG_CONFIG_HOME/guix/current")
-
-                            #|Terminfo|#
-                            ("TERMINFO"     . "$XDG_DATA_HOME/terminfo")
-
-                            #|Remind|#
-                            ("DOTREMINDERS" . "$XDG_DATA_HOME/reminders")))
+                            ("INPUTRC" . "$XDG_CONFIG_HOME/readline/inputrc")))
 
           (service home-openssh-service-type
                    (home-openssh-configuration