From 18d691800b0273bf3122d5d3cb79a58ea6a906f7 Mon Sep 17 00:00:00 2001
From: Tom Willemse <tom@ryuslash.org>
Date: Mon, 14 Nov 2022 00:01:14 -0800
Subject: [PATCH] Add manifest.scm for easy dev environment with Guix

---
 README.org   | 24 ++++++++++++++++++------
 manifest.scm |  6 ++++++
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/README.org b/README.org
index 58e2946..ce072c7 100644
--- a/README.org
+++ b/README.org
@@ -1,12 +1,24 @@
 #+TITLE: ryuslash.org README
 #+STARTUP: showall
 
-This is the source project of my website [[https://ryuslash.org]]. It
-doesn't contain much for now, but eventually this will be where all my
-stuff lives.
+This is the source project of my website [[https://ryuslash.org]]. It doesn't contain much for now, but eventually this will be where all my stuff lives.
 
 * Compiling
 
-  To compile a local copy from Org-mode files into HTML, use the
-  command ~make~. This will generate a local copy in the ~public_html~
-  directory.
+To work on this project it's recommended that you use Guix Shell.
+
+If you first add the directory containing this project into your =~/.config/guix/shell-authorized-directories=, when you run ~guix shell~ it'll automatically install the necessary dependencies to make sure you can compile and deploy this project:
+
+#+begin_src shell
+  echo "$(pwd)" >> ~/.config/guix/shell-authorized-directories
+#+end_src
+
+And then just run this command to start working:
+
+: guix shell
+
+If you didn't add this directory to your =shell-authorized-directories=, you can accomplish the same thing with:
+
+: guix shell --manifest manifest.scm
+
+To compile a local copy from Org-mode files into HTML, use the command ~make publish~. This will generate a local copy in the ~public_html~ directory. You can also run ~make~ without any arguments to see what available other commands there are.
diff --git a/manifest.scm b/manifest.scm
index 9888bad..b16155c 100644
--- a/manifest.scm
+++ b/manifest.scm
@@ -1 +1,7 @@
+<<<<<<< HEAD
 (specifications->manifest '("emacs-eldev"))
+=======
+(packages->manifest
+ (list
+  (specification->package "emacs-eldev")))
+>>>>>>> d9c1ac7 (Add manifest.scm for easy dev environment with Guix)