From 56e36665bbc2d12807a677ed3f7f55b3eec086f0 Mon Sep 17 00:00:00 2001
From: SoraTenshi <dream@neoncity.dev>
Date: Wed, 30 Oct 2024 20:49:28 +0100
Subject: [PATCH] fixed sbcl, now no more wonky symlinkJoin stuff

---
 home/development/common-lisp.nix | 29 +++++++++++------------------
 home/development/default.nix     |  4 ++--
 2 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/home/development/common-lisp.nix b/home/development/common-lisp.nix
index 1d3f188..376241d 100644
--- a/home/development/common-lisp.nix
+++ b/home/development/common-lisp.nix
@@ -1,28 +1,21 @@
 { pkgs, ... }: 
 let
-  sbcl-env = (pkgs.symlinkJoin {
-      name = "sbcl-env";
-      paths = with pkgs.sbclPackages; [
-        # CLI Parser
-        clingon
+  sbcl' = pkgs.sbcl.withPackages(ps: with ps; [
+    # CLI Parser
+    clingon
 
-        # CLI stuff
-        trivial-shell
+    # CLI stuff
+    trivial-shell cmd
 
-        # Coloured output!
-        cl-ansi-term
+    # Coloured output!
+    cl-ansi-term
 
-        # Strings & dependencies
-        str cl-ppcre cl-ppcre-unicode cl-ppcre-template cl-unicode
-        ];
-      });
+    # Strings & dependencies
+    str
+  ]);
 in
 {
   home.packages = [
-    sbcl-env
+    sbcl'
   ];
-
-  home.file = {
-    "common-lisp/sbcl-env".source = sbcl-env;
-  };
 }
diff --git a/home/development/default.nix b/home/development/default.nix
index b282f11..b1f79a8 100644
--- a/home/development/default.nix
+++ b/home/development/default.nix
@@ -33,8 +33,8 @@
     # cmake
     cmake gnumake
 
-    # LISP
-    sbcl asdf
+    # LISP pkg manager
+    asdf
 
     # Clojure like (for shell scripts)
     joker