From 856895b5f049125efd04ad6a0a43682c4c775890 Mon Sep 17 00:00:00 2001
From: Luis Guilherme Coelho <lgcoelho@disroot.org>
Date: Sun, 6 Oct 2024 09:06:20 -0300
Subject: [PATCH] operating-systems: buer: Use bash as system and root shells

---
 operating-systems/buer.scm       | 7 +++----
 operating-systems/buer/users.scm | 4 ++--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/operating-systems/buer.scm b/operating-systems/buer.scm
index 6078f77..eecfa7f 100644
--- a/operating-systems/buer.scm
+++ b/operating-systems/buer.scm
@@ -6,6 +6,7 @@
   #|GNU packages|#
   #|A|# #:use-module (gnu packages admin)
   #|B|# #:use-module (gnu packages base)
+  #|S|# #:use-module (gnu packages bash)
   #|C|# #:use-module (gnu packages certs)
         #:use-module (gnu packages compression)
   #|G|# #:use-module (gnu packages gawk)
@@ -16,7 +17,6 @@
   #|M|# #:use-module (gnu packages man)
   #|P|# #:use-module (gnu packages package-management)
         #:use-module (gnu packages pciutils)
-  #|S|# #:use-module (gnu packages shells)
   #|T|# #:use-module (gnu packages texinfo)
   #|V|# #:use-module (gnu packages vpn)
 
@@ -60,7 +60,6 @@
   #|Radix packages|#
   #|A|# #:use-module (radix packages admin)
   #|L|# #:use-module (radix packages linux)
-  #|S|# #:use-module (radix packages shells)
   #|T|# #:use-module (radix packages text-editors)
 
   #|Radix services|#
@@ -147,6 +146,7 @@
    (packages
     (list #|admin       |# btop inetutils isc-dhcp shadow zzz
           #|base        |# coreutils diffutils findutils grep patch sed tar which
+          #|bash        |# bash bash-completion
           #|certs       |# nss-certs
           #|compression |# gzip xz zstd
           #|gawk        |# gawk
@@ -156,7 +156,6 @@
                            util-linux
           #|man         |# man-db man-pages
           #|pciutils    |# pciutils
-          #|shells      |# dash-next
           #|texinfo     |# info-reader
           #|text-editors|# kakoune
           #|vpn         |# wireguard-tools))
@@ -309,7 +308,7 @@
 
           #|Special file services|#
           (service special-files-service-type
-                   `(("/bin/sh"      ,(file-append dash-next "/bin/dash"))
+                   `(("/bin/sh" ,(file-append bash "/bin/bash"))
                      ("/usr/bin/env" ,(file-append coreutils "/bin/env"))))
 
           #|Sysctl services|#
diff --git a/operating-systems/buer/users.scm b/operating-systems/buer/users.scm
index ee14e5f..6f0da24 100644
--- a/operating-systems/buer/users.scm
+++ b/operating-systems/buer/users.scm
@@ -1,7 +1,7 @@
 (define-module (buer users)
   #:use-module (buer secrets)
+  #:use-module (gnu packages bash)
   #:use-module (gnu packages shells)
-  #:use-module (radix packages shells)
   #:use-module (gnu system accounts)
   #:use-module (guix gexp)
 
@@ -24,4 +24,4 @@
    (home-directory "/root")
    (uid 0)
    (group "root")
-   (shell (file-append dash-next "/bin/dash"))))
+   (shell (file-append bash "/bin/bash"))))