From 51f58e4ff68ea27b7685bba7d0295cab4a5fe148 Mon Sep 17 00:00:00 2001
From: Vivianne Langdon <puttabutta@gmail.com>
Date: Mon, 4 Mar 2024 18:59:09 -0500
Subject: [PATCH] Reorganize to be more guixy, thanks takev

---
 .guix/modules/termenv-package.scm             | 51 -------------------
 .../packages/guile.scm                        | 40 ++++++++++++++-
 2 files changed, 39 insertions(+), 52 deletions(-)
 delete mode 100644 .guix/modules/termenv-package.scm
 rename .guix/modules/uniseg-package.scm => solarpunk/packages/guile.scm (57%)

diff --git a/.guix/modules/termenv-package.scm b/.guix/modules/termenv-package.scm
deleted file mode 100644
index 2ef9edb..0000000
--- a/.guix/modules/termenv-package.scm
+++ /dev/null
@@ -1,51 +0,0 @@
-(define-module (termenv-package)
-  #:use-module (gnu packages)
-  #:use-module (gnu packages autotools)
-  #:use-module (gnu packages guile)
-  #:use-module (gnu packages guile-xyz)
-  #:use-module (gnu packages pkg-config)
-  #:use-module (gnu packages texinfo)
-  #:use-module (guix build-system gnu)
-  #:use-module (guix git-download)
-  #:use-module (guix gexp)
-  #:use-module ((guix licenses) #:prefix license:)
-  #:use-module (guix packages)
-  #:use-module (srfi srfi-1))
-
-(define-public guile-termenv
-  (package
-   (name "guile-termenv")
-   (version "0.1")
-   (source
-    (origin
-     (method git-fetch)
-     (uri (git-reference
-           (url "https://git.solarpunk.moe/solarpunk-guile/guile-termenv.git")
-           (commit "v0.1")))
-     (sha256
-      (base32
-       "1cs5vs3inc2a43hijgw9krg0a10v060hmdynkmrzm4kbnig5qraw"))))
-   (build-system gnu-build-system)
-   (arguments
-    (list
-     #:make-flags
-     #~(list "GUILE_AUTO_COMPILE=0")
-     #:phases
-     #~(modify-phases %standard-phases
-                      (add-before 'bootstrap 'hall
-                                  (lambda _
-	                                  (system* "hall" "build" "-x")))
-	                    (replace 'bootstrap
-                               (lambda _
-	                               (system* "autoreconf" "-vif"))))))
-   (native-inputs (list autoconf
-			                  automake
-			                  guile-hall
-			                  pkg-config
-			                  texinfo))
-   (inputs (list guile-3.0))
-   (synopsis "Guile port of termenv")
-   (description
-    "A library to provide easy control of terminals from Guile using terminal control codes.")
-   (home-page "https://git.solarpunk.moe/solarpunk-guile/guile-termenv")
-   (license license:gpl3+)))
diff --git a/.guix/modules/uniseg-package.scm b/solarpunk/packages/guile.scm
similarity index 57%
rename from .guix/modules/uniseg-package.scm
rename to solarpunk/packages/guile.scm
index fe061a2..1f00d9b 100644
--- a/.guix/modules/uniseg-package.scm
+++ b/solarpunk/packages/guile.scm
@@ -1,4 +1,4 @@
-(define-module (uniseg-package)
+(define-module (solarpunk packages guile)
   #:use-module (gnu packages)
   #:use-module (gnu packages autotools)
   #:use-module (gnu packages guile)
@@ -12,6 +12,44 @@
   #:use-module (guix packages)
   #:use-module (srfi srfi-1))
 
+(define-public guile-termenv
+  (package
+   (name "s")
+   (version "0.1")
+   (source
+    (origin
+     (method git-fetch)
+     (uri (git-reference
+           (url "https://git.solarpunk.moe/solarpunk-guile/guile-termenv.git")
+           (commit "v0.1")))
+     (sha256
+      (base32
+       "1cs5vs3inc2a43hijgw9krg0a10v060hmdynkmrzm4kbnig5qraw"))))
+   (build-system gnu-build-system)
+   (arguments
+    (list
+     #:make-flags
+     #~(list "GUILE_AUTO_COMPILE=0")
+     #:phases
+     #~(modify-phases %standard-phases
+                      (add-before 'bootstrap 'hall
+                                  (lambda _
+	                                  (system* "hall" "build" "-x")))
+	                    (replace 'bootstrap
+                               (lambda _
+	                               (system* "autoreconf" "-vif"))))))
+   (native-inputs (list autoconf
+			                  automake
+			                  guile-hall
+			                  pkg-config
+			                  texinfo))
+   (inputs (list guile-3.0))
+   (synopsis "Guile port of termenv")
+   (description
+    "A library to provide easy control of terminals from Guile using terminal control codes.")
+   (home-page "https://git.solarpunk.moe/solarpunk-guile/guile-termenv")
+   (license license:gpl3+)))
+
 (define-public guile-uniseg
   (package
    (name "guile-uniseg")