Use Roswell to manage Lisp instead of manual installation

2 files changed, 6 insertions, 10 deletions

diff --git a/home/.sbclrc b/home/.sbclrc
index 6dd45fd..2c2bd8a 100644
--- a/home/.sbclrc
+++ b/home/.sbclrc
@@ -5,7 +5,7 @@
 
 ;; Use Quicklisp
 #-quicklisp
-(let ((quicklisp-init (merge-pathnames "lisp/quicklisp/setup.lisp"
+(let ((quicklisp-init (merge-pathnames ".roswell/lisp/quicklisp/setup.lisp"
                                        (user-homedir-pathname))))
   (when (probe-file quicklisp-init)
     (load quicklisp-init)))
diff --git a/new-user-setup.sh b/new-user-setup.sh
index e9b2e59..b925b1b 100755
--- a/new-user-setup.sh
+++ b/new-user-setup.sh
@@ -87,16 +87,12 @@ while
                                      x11/arandr \
                                      x11-fonts/nerd-fonts \
                                      x11/xorg
-            # Install Quicklisp
-            if [[ ! -d $HOME/lisp/quicklisp ]]; then
-                curl -o /tmp/ql.lisp http://beta.quicklisp.org/quicklisp.lisp
-                sbcl --no-sysinit --no-userinit --load /tmp/ql.lisp \
-                     --eval '(quicklisp-quickstart:install :path "~/lisp/quicklisp")' \
-                     --quit \
-                     > /dev/null # minimize output
-                echo -e "${GREEN}INFO   : Installed Quicklisp${ENDCOLOR}"
+            # Setup Lisp
+            if command -v ros &> /dev/null; then
+                ros &> /dev/null
+                echo -e "${GREEN}INFO   : Roswell setup complete.${ENDCOLOR}"
             else
-                echo -e "${YELLOW}Skipped: Quicklisp. Already installed${ENDCOLOR}"
+                echo -e "${YELLOW}Skipped: Roswell not installed.${ENDCOLOR}"
             fi
 
             echo "INFO   : Packages installed and updated."