From ff00d6c94b6e3d7d45351c095521f18fa5a5ea6c Mon Sep 17 00:00:00 2001
From: Ray Miller <ray@1729.org.uk>
Date: Sat, 30 Nov 2024 11:25:29 +0000
Subject: [PATCH] Simplify bash configuration

There's no need for the custom .bashrc and .bash_login files that were
created by the initial guix home import, as the same content is created
by the guix default setting.
---
 .bash_profile          |  2 --
 .bashrc                | 45 ------------------------------------------
 home-configuration.scm | 21 ++++++++++----------
 3 files changed, 10 insertions(+), 58 deletions(-)
 delete mode 100644 .bash_profile
 delete mode 100644 .bashrc

diff --git a/.bash_profile b/.bash_profile
deleted file mode 100644
index 37ea25c..0000000
--- a/.bash_profile
+++ /dev/null
@@ -1,2 +0,0 @@
-# Honor per-interactive-shell startup file
-if [ -f ~/.bashrc ]; then . ~/.bashrc; fi
diff --git a/.bashrc b/.bashrc
deleted file mode 100644
index fa33b68..0000000
--- a/.bashrc
+++ /dev/null
@@ -1,45 +0,0 @@
-# Bash initialization for interactive non-login shells and
-# for remote shells (info "(bash) Bash Startup Files").
-
-# Export 'SHELL' to child processes.  Programs such as 'screen'
-# honor it and otherwise use /bin/sh.
-export SHELL
-
-if [[ $- != *i* ]]
-then
-    # We are being invoked from a non-interactive shell.  If this
-    # is an SSH session (as in "ssh host command"), source
-    # /etc/profile so we get PATH and other essential variables.
-    [[ -n "$SSH_CLIENT" ]] && source /etc/profile
-
-    # Don't do anything else.
-    return
-fi
-
-# Source the system-wide file.
-source /etc/bashrc
-
-# Adjust the prompt depending on whether we're in 'guix environment'.
-if [ -n "$GUIX_ENVIRONMENT" ]
-then
-    PS1='\u@\h \w [env]\$ '
-else
-    PS1='\u@\h \w\$ '
-fi
-alias ls='ls -p --color=auto'
-alias ll='ls -l'
-alias grep='grep --color=auto'
-
-# Configure TTY for pinentry
-GPG_TTY=$(tty)
-export GPG_TTY
-
-# Editor setup
-export ALTERNATE_EDITOR=""
-export EDITOR="emacsclient --tty"
-export VISUAL="emacsclient"
-
-# Ensure user shepherd is running
-if [[ ! -S ${XDG_RUNTIME_DIR-$HOME/.local/run}/shepherd/socket ]]; then
-    shepherd
-fi
diff --git a/home-configuration.scm b/home-configuration.scm
index a789b6e..b98f788 100644
--- a/home-configuration.scm
+++ b/home-configuration.scm
@@ -11,7 +11,8 @@
              (guix gexp)
              (gnu home services shells)
              (gnu home services dotfiles)
-             (gnu home services gnupg))
+             (gnu home services gnupg)
+             (gnu home services shepherd))
 
 (home-environment
  ;; Below is the list of packages that will show up in your
@@ -60,17 +61,15 @@
   (list (service home-bash-service-type
                  (home-bash-configuration
                   (guix-defaults? #t)
-                  (environment-variables '(("XDG_RUNTIME_DIR" . "/home/ray/.local/run")))
-                  (aliases '(("grep" . "grep --color=auto") ("ll" . "ls -l")
-                             ("ls" . "ls -p --color=auto")))
-                  (bashrc (list (local-file
-                                 "/home/ray/Workspace/guix-config/.bashrc"
-                                 "bashrc")))
-                  (bash-profile (list (local-file
-                                       "/home/ray/Workspace/guix-config/.bash_profile"
-                                       "bash_profile")))))
+                  (environment-variables '(("GPG_TTY" . "$(tty)")
+                                           ("ALTERNATE_EDITOR" . "")
+                                           ("EDITOR" . "emacsclient --tty")
+                                           ("VISUAL" . "emacsclient")))
+                  (aliases '(("grep" . "grep --color=auto")
+                             ("ls" . "ls -p --color=auto")))))
         (service home-dotfiles-service-type
                  (home-dotfiles-configuration
                   (directories '("./dotfiles"))
                   (layout 'stow)))
-        (service home-gpg-agent-service-type))))
+        (service home-gpg-agent-service-type)
+        (service home-shepherd-service-type))))