From f0908b43f5f2ac469d16a394b57da10f5b901f6c Mon Sep 17 00:00:00 2001 From: Ray Miller Date: Fri, 29 Nov 2024 18:24:32 +0000 Subject: [PATCH 1/2] Ensure shepherd is started Install ispell --- .bashrc | 5 +++++ home-configuration.scm | 1 + 2 files changed, 6 insertions(+) diff --git a/.bashrc b/.bashrc index cd801cc..fa33b68 100644 --- a/.bashrc +++ b/.bashrc @@ -38,3 +38,8 @@ export GPG_TTY 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 e127a33..e8328bf 100644 --- a/home-configuration.scm +++ b/home-configuration.scm @@ -47,6 +47,7 @@ "guile-srfi-235" "guile-ssh" "guile-tap" + "ispell" "nss-certs" "pass-git-helper" "password-store" From 11c6b37e7d142d0b2025180f70c2646acc3f647e Mon Sep 17 00:00:00 2001 From: Ray Miller Date: Fri, 29 Nov 2024 18:46:38 +0000 Subject: [PATCH 2/2] Untabify, don't use emacs pinentry. --- home-configuration.scm | 41 +++++++++++++++++++---------------------- 1 file changed, 19 insertions(+), 22 deletions(-) diff --git a/home-configuration.scm b/home-configuration.scm index e8328bf..a789b6e 100644 --- a/home-configuration.scm +++ b/home-configuration.scm @@ -10,19 +10,19 @@ (gnu services) (guix gexp) (gnu home services shells) - (gnu home services dotfiles) - (gnu home services gnupg)) + (gnu home services dotfiles) + (gnu home services gnupg)) (home-environment ;; Below is the list of packages that will show up in your ;; Home profile, under ~/.guix-home/profile. (packages (specifications->packages (list "emacs-no-x" - "git" - "git-crypt" - "git-lfs" - "glibc-locales" - "gnupg" - ;;"go@1.23.2" + "git" + "git-crypt" + "git-lfs" + "glibc-locales" + "gnupg" + ;;"go@1.23.2" "guile" "guile-algorithms" "guile-config" @@ -48,19 +48,19 @@ "guile-ssh" "guile-tap" "ispell" - "nss-certs" - "pass-git-helper" - "password-store" + "nss-certs" + "pass-git-helper" + "password-store" "pinentry-emacs" - "recutils"))) + "recutils"))) ;; Below is the list of Home services. To search for available ;; services, run 'guix home search KEYWORD' in a terminal. (services (list (service home-bash-service-type (home-bash-configuration - (guix-defaults? #t) - (environment-variables '(("XDG_RUNTIME_DIR" . "/home/ray/.local/run"))) + (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 @@ -69,11 +69,8 @@ (bash-profile (list (local-file "/home/ray/Workspace/guix-config/.bash_profile" "bash_profile"))))) - (service home-dotfiles-service-type - (home-dotfiles-configuration - (directories '("./dotfiles")) - (layout 'stow))) - (service home-gpg-agent-service-type - (home-gpg-agent-configuration - (pinentry-program - (file-append pinentry-emacs "/bin/pinentry-emacs"))))))) + (service home-dotfiles-service-type + (home-dotfiles-configuration + (directories '("./dotfiles")) + (layout 'stow))) + (service home-gpg-agent-service-type))))