From d2d750b2d33cd8e1e595d36e2e2d1e4bd18f0469 Mon Sep 17 00:00:00 2001
From: Adam Mohammed <admohammed@equinix.com>
Date: Tue, 11 Feb 2025 14:51:15 -0500
Subject: [PATCH] Update packages

---
 base.scm           | 20 ++++++++++++--------
 emacs-manifest.scm |  6 +++---
 install.sh         | 30 ++++++++++++++++--------------
 3 files changed, 31 insertions(+), 25 deletions(-)
 mode change 100644 => 100755 install.sh

diff --git a/base.scm b/base.scm
index 55c76d5..c5f59df 100644
--- a/base.scm
+++ b/base.scm
@@ -1,10 +1,14 @@
 (specifications->manifest
  (list "aspell"
-	"xsel"
-	"util-linux"
-	"tmux"
-	"nss-certs"
-	"nordic-theme"
-	"fzf"
-	"direnv"
-	"glibc-locales"))
+       "aspell-dict-en"
+       "direnv"
+       "direnv"
+       "fzf"
+       "git"
+       "glibc-locales"
+       "nordic-theme"
+       "nss-certs"
+       "st"
+       "tmux"
+       "util-linux"
+       "xsel"))
diff --git a/emacs-manifest.scm b/emacs-manifest.scm
index 91830ea..6bbd3f5 100644
--- a/emacs-manifest.scm
+++ b/emacs-manifest.scm
@@ -40,6 +40,6 @@
        "emacs-guix"
        "emacs-loop"
        "emacs-caddyfile-mode"
-       "emacs-rufo"
-       "emacs-zig-mode"
-       "tree-sitter-rust"))
+       "emacs-vterm"
+       "emacs-gptel"
+       "emacs-rufo"))
diff --git a/install.sh b/install.sh
old mode 100644
new mode 100755
index 8a5c386..e6f2f42
--- a/install.sh
+++ b/install.sh
@@ -1,25 +1,27 @@
 
 export GUIX_EXTRA_PROFILES="$HOME/.guix-extra-profiles"
 
-mkdir -p $GUIX_EXTRA_PROFILES/emacs-lib
-
-guix install -m base.scm
-
-guix package -m $PWD/emacs-manifest.scm --profile=$GUIX_EXTRA_PROFILES/emacs-lib/emacs-lib
+maybe_mkdir $GUIX_EXTRA_PROFILES/emacs-libs
+maybe_mkdir -p $GUIX_EXTRA_PROFILES/emacs-libs
+maybe_mkdir -p $GUIX_EXTRA_PROFILES/java-libs
+maybe_mkdir -p $GUIX_EXTRA_PROFILES/go-development-libs
 
+guix package -m base.scm
+guix package -m $PWD/emacs-manifest.scm --profile=$GUIX_EXTRA_PROFILES/emacs-libs/emacs-libs
+guix package -m $PWD/java.scm --profile=$GUIX_EXTRA_PROFILES/java-libs/java-libs
+guix package -m $PWD/golang.scm --profile=$GUIX_EXTRA_PROFILES/go-development/go-development
 
 cat <<EOF
 # Add this to the bashrc to source the emacs profile
 
-for i in "\${GUIX_EXTRA_PROFILES}/emacs-lib" do
-    profile="\${i}/\$(basename \$i)"
-
-    # guix /etc/profiles expect GUIX_PROFILE to be set properly
-    GUIX_PROFILE=\$profile
-    . \$GUIX_PROFILE/etc/profile
-
-    unset profile
-end
+for i in "$GUIX_EXTRA_PROFILES"/emacs-libs "$GUIX_EXTRA_PROFILES"/go-development; do
+  profile=$i/$(basename "$i")
+  if [ -f "$profile"/etc/profile ]; then
+    GUIX_PROFILE="$profile"
+    . "$GUIX_PROFILE"/etc/profile
+  fi
+  unset profile
+done
 
 # Restore default profile
 GUIX_PROFILE="\$HOME/.guix-profile"