From d592171434735b93fcfd32a1fd9baff6be97d886 Mon Sep 17 00:00:00 2001
From: Luis Guilherme Coelho <lgcoelho@disroot.org>
Date: Mon, 1 Jan 2024 16:18:53 -0300
Subject: [PATCH] home-environments: radio: Set relevant variables on login
 shell

---
 home-environments/radio.scm | 45 ++++++++++++++++++++-----------------
 1 file changed, 25 insertions(+), 20 deletions(-)

diff --git a/home-environments/radio.scm b/home-environments/radio.scm
index e69f1c3..3764136 100644
--- a/home-environments/radio.scm
+++ b/home-environments/radio.scm
@@ -83,6 +83,8 @@
 
   #:export (home-environment))
 
+(@@ (radix combinators) partial)
+
 (define home-environment
   (user-home-environment
    (packages
@@ -226,22 +228,6 @@
                      `(#|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~@{:~a/share/guile/site/3.0~}"
-                                      "$HOME/areas/code/scm"
-                                      "$HOME/areas/code/scm/radix/modules"
-                                      "$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")
-
                        #|Remind|#
                        ("DOTREMINDERS" . "$XDG_DATA_HOME/reminders")
 
@@ -464,10 +450,29 @@
 
           (simple-service 'environment-variables-service
                           home-environment-variables-service-type
-                          `(("PATH"     . "$HOME/.local/bin:$PATH")
-                            ("ENV"      . "$XDG_CONFIG_HOME/dash/init.sh")
-                            ("XINITRC"  . "$XDG_CONFIG_HOME/x11/xinitrc")
-                            ("INPUTRC"  . "$XDG_CONFIG_HOME/readline/inputrc")
+                          `(#|Shells|#
+                            ("PATH"    . "$HOME/.local/bin:$PATH")
+                            ("ENV"     . "$XDG_CONFIG_HOME/dash/init.sh")
+                            ("INPUTRC" . "$XDG_CONFIG_HOME/readline/inputrc")
+                            ("XINITRC" . "$XDG_CONFIG_HOME/x11/xinitrc")
+
+                            #|Guile|#
+                            ("GUILE_WARN_DEPRECATED" . "detailed")
+                            ("GUILE_HISTORY" . "$XDG_CACHE_HOME/guile/history")
+                            ("GUILE_LOAD_PATH"
+                             . ,(format #f "~a:~a~@{:~a/share/guile/site/3.0~}"
+                                           "$HOME/areas/code/scm"
+                                           "$HOME/areas/code/scm/radix/modules"
+                                           "$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")