init push

Finished configuring the init/shell commands Updated readme Fixed issue with missing /boot/efi directory Added new config module for setting/retrieving vm configs Updated machine setup Fixed issue with missing files added config to docs section added x86_64 support fixed issue with x86_64 update and updated README Added some content to README Added markdown export of org file Updated readme to reflect the need for guile-next Removed guile from install example exported changes to md Updated README fixed issue with sed compatibility (bsd/gnu) regenerated readme markdown Removed readme markdown file for org alternative Updated project license updated autocompile to include for now updated script updated script updated script updated msg script updated license updated to test testing testing testing testing testing testing testing testing testing testing testing
2023-11-20 09:05:07 -07:00 · 2023-11-20 09:05:07 -07:00 · eb89fc8fbb
commit eb89fc8fbb
22 changed files with 1023 additions and 0 deletions
--- a/.gitignore
+++ b/.gitignore
@ -0,0 +1,65 @@
+*.eps
+*.go
+*.log
+*.pdf
+*.png
+*.tar.xz
+*.tar.gz
+*.tmp
+*~
+.#*
+\#*\#
+,*
+/ABOUT-NLS
+/INSTALL
+/aclocal.m4
+/autom4te.cache
+/build-aux/ar-lib
+/build-aux/compile
+/build-aux/config.guess
+/build-aux/config.rpath
+/build-aux/config.sub
+/build-aux/depcomp
+/build-aux/install-sh
+/build-aux/mdate-sh
+/build-aux/missing
+/build-aux/test-driver
+/build-aux/texinfo.tex
+/config.status
+/configure
+/doc/*.1
+/doc/.dirstamp
+/doc/contributing.*.texi
+/doc/*.aux
+/doc/*.cp
+/doc/*.cps
+/doc/*.fn
+/doc/*.fns
+/doc/*.html
+/doc/*.info
+/doc/*.info-[0-9]
+/doc/*.ky
+/doc/*.pg
+/doc/*.toc
+/doc/*.t2p
+/doc/*.tp
+/doc/*.vr
+/doc/*.vrs
+/doc/stamp-vti
+/doc/version.texi
+/doc/version-*.texi
+/m4/*
+/pre-inst-env
+/test-env
+/test-tmp
+/tests/*.trs
+GPATH
+GRTAGS
+GTAGS
+Makefile
+Makefile.in
+config.cache
+stamp-h[0-9]
+tmp
+/.version
+/doc/stamp-[0-9]
--- a/3
+++ b/3
@ -0,0 +1,3 @@
+Contributors to Msg 0.1:
+
+    Chad Nelson <>
--- a/3
+++ b/3
@ -0,0 +1,3 @@
+This project's license is GPL 3+.
+
+You can read the full license at https://www.gnu.org/licenses/gpl.html.
--- a/1
+++ b/1
@ -0,0 +1 @@
+For a complete log, please see the Git commit log at </PATH/TO/LOG>.
--- a/54
+++ b/54
@ -0,0 +1,54 @@
+# -*- mode: org; coding: utf-8; -*-
+
+#+TITLE: Hacking msg
+
+* Contributing
+
+By far the easiest way to hack on msg is to develop using Guix:
+
+#+BEGIN_SRC bash
+  # Obtain the source code
+  cd /path/to/source-code
+  guix shell -Df guix.scm
+  # In the new shell, run:
+  hall build --execute && autoreconf -vif && ./configure && make check
+#+END_SRC
+
+You may also want to set your directory as an authorized directory for
+`guix shell' so it works without arguments. To do that, simply run
+
+#+BEGIN_SRC bash
+  echo $(pwd) >> $HOME/.config/guix/shell-authorized-directories
+#+END_SRC
+
+You can now hack this project's files to your heart's content, whilst
+testing them from your `guix shell' shell.
+
+To try out any scripts in the project you can now use
+
+#+BEGIN_SRC bash
+  ./pre-inst-env scripts/${script-name}
+#+END_SRC
+
+If you'd like to tidy the project again, but retain the ability to test the
+project from the commandline, simply run:
+
+#+BEGIN_SRC bash
+  ./hall clean --skip "scripts/${script-name},pre-inst-env" --execute
+#+END_SRC
+
+** Manual Installation
+
+If you do not yet use  Guix, you will have to install this project's
+dependencies manually:
+  - autoconf
+  - automake
+  - pkg-config
+  - texinfo
+  - guile-hall
+
+Once those dependencies are installed you can run:
+
+#+BEGIN_SRC bash
+  hall build -x && autoreconf -vif && ./configure && make check
+#+END_SRC
--- a/Makefile.am
+++ b/Makefile.am
@ -0,0 +1,76 @@
+bin_SCRIPTS = scripts/msg
+
+nodist_noinst_SCRIPTS = pre-inst-env
+
+GOBJECTS = $(SOURCES:%.scm=%.go)
+
+moddir=$(prefix)/share/guile/site/$(GUILE_EFFECTIVE_VERSION)
+godir=$(libdir)/guile/$(GUILE_EFFECTIVE_VERSION)/site-ccache
+ccachedir=$(libdir)/guile/$(GUILE_EFFECTIVE_VERSION)/site-ccache
+
+nobase_dist_mod_DATA = $(SOURCES) $(NOCOMP_SOURCES)
+nobase_go_DATA = $(GOBJECTS)
+
+# Make sure source files are installed first, so that the mtime of
+# installed compiled files is greater than that of installed source
+# files.  See
+# <http://lists.gnu.org/archive/html/guile-devel/2010-07/msg00125.html>
+# for details.
+guile_install_go_files = install-nobase_goDATA
+$(guile_install_go_files): install-nobase_dist_modDATA
+
+GUILE_WARNINGS = -Wunbound-variable -Warity-mismatch -Wformat
+SUFFIXES = .scm .go
+.scm.go:
+	$(AM_V_GEN)$(top_builddir)/pre-inst-env $(GUILE_TOOLS) compile $(GUILE_TARGET) $(GUILE_WARNINGS) -o "$@" "$<"
+
+SOURCES = msg/config.scm \
+          msg/machine.scm \
+          msg/hconfig.scm \
+          msg/shell.scm \
+          msg/helpers.scm
+
+TESTS = 
+
+TEST_EXTENSIONS = .scm
+SCM_LOG_DRIVER =                                \
+  $(top_builddir)/pre-inst-env                  \
+  $(GUILE) --no-auto-compile -e main            \
+      $(top_srcdir)/build-aux/test-driver.scm
+
+# Tell 'build-aux/test-driver.scm' to display only source file names,
+# not indivdual test names.
+AM_SCM_LOG_DRIVER_FLAGS = --brief=yes
+
+AM_SCM_LOG_FLAGS = --no-auto-compile -L "$(top_srcdir)"
+
+AM_TESTS_ENVIRONMENT = abs_top_srcdir="$(abs_top_srcdir)"
+
+info_TEXINFOS = doc/msg.texi
+
+EXTRA_DIST = README.org \
+             README \
+             HACKING \
+             COPYING \
+             doc/config.scm \
+             NEWS \
+             AUTHORS \
+             ChangeLog \
+             guix.scm \
+             .gitignore \
+             hall.scm \
+             build-aux/test-driver.scm \
+             $(TESTS)
+
+ACLOCAL_AMFLAGS = -I m4
+
+AM_DISTCHECK_DVI_TARGET = info # Disable DVI as part of distcheck
+
+clean-go:
+	-$(RM) $(GOBJECTS)
+.PHONY: clean-go
+
+CLEANFILES =					\
+  $(BUILT_SOURCES)				\
+  $(GOBJECTS)					\
+  $(TESTS:tests/%.scm=%.log)
--- a/14
+++ b/14
@ -0,0 +1,14 @@
+# -*- mode: org; coding: utf-8; -*-
+
+#+TITLE: Msg NEWS – history of user-visible changes
+#+STARTUP: content hidestars
+
+Copyright © (2023) Chad Nelson <>
+
+  Copying and distribution of this file, with or without modification,
+  are permitted in any medium without royalty provided the copyright
+  notice and this notice are preserved.
+
+Please send Msg bug reports to .
+
+* Publication at 0.1
--- a/1
+++ b/1
@ -0,0 +1 @@
+README.org
--- a/README.org
+++ b/README.org
@ -0,0 +1,64 @@
+# -*- mode: org; coding: utf-8; -*-
+
+#+TITLE: MacOS Subsystem for Guix
+
+
+* Overview
+MSG is an attempt to create a native-like experience for Guix on MacOS, using methods inspired by others like Podman/Docker/Lima. It uses Qemu with a prebuilt installer image to create a customized local Guix instance (supported on Intel and Apple Silicon based Macs). The base image is pretty barebones and is meant to be customized to your liking. To get a good idea of whats included you can reference the /etc/config.scm file within the built image.
+
+* F.A.Q
+- Q: Why does the cli generate the image locally instead of downloading a complete pre-built image like Podman?
+  - A: This is due to the final image requiring the admin account to be setup with the same UID as the host MacOS user. Podman accomplishes this by passing configuration values in it's ignition file, which are used to initialize the CoreOS image with the correct values on it's first run. Guix doesn't currently support a similar initialization method, so the image must be regenerated after the config has been updated with the correct values (UID, etc...). This is unlikely to change in the near future, unless Guix ends up adding some sort of similar functionality.
+    
+- Q: What are the long term goals of this project?
+  - A: I would like for this project to accomplish a few goals.
+    1. Be able to fully replace docker/podman desktop on MacOS
+    2. Give users a way to manage their MacOS dotfiles using Guix Home
+    3. Improve GUI application performance with X11/Xquartz
+    4. Introduce a MSG Desktop GUI to accompany the cli
+
+* Requirements
+- wget
+- qemu
+- autotools
+- guile-next
+  - You can get guile-next from the following homebrew tap: https://github.com/aconchillo/homebrew-guile
+- texinfo
+
+These can be installed by running:
+#+begin_src sh
+brew install autoconf automake libtool wget qemu texinfo guile-next
+#+end_src
+
+* Installation
+1. First clone this repository with:
+   #+begin_src sh
+   git clone https://pagure.io/MSG/msg-cli.git msg
+   cd msg
+   #+end_src
+
+2. Build and install the cli using:
+   #+begin_src sh
+   autoreconf -vif && ./configure && make && sudo make install
+   #+end_src
+
+3. Make sure to add the correct env vars set for guile-next/msg.
+   #+begin_src sh
+   export GUILE_LOAD_PATH=/opt/homebrew/share/guile/site/3.0
+   export GUILE_LOAD_COMPILED_PATH=/opt/homebrew/lib/guile/3.0/site-ccache
+   export GUILE_SYSTEM_EXTENSIONS_PATH=/opt/homebrew/lib/guile/3.0/extensions
+
+   export GUILE_LOAD_PATH=$GUILE_LOAD_PATH:/usr/local/share/guile/site/3.0/
+   export GUILE_LOAD_COMPILED_PATH=$GUILE_LOAD_COMPILED_PATH:/usr/local/lib/guile/3.0/site-ccache/
+   export GUILE_SYSTEM_EXTENSIONS_PATH=$GUILE_SYSTEM_EXTENSIONS_PATH:/usr/local/lib/guile/3.0/extensions
+   export PATH=/usr/local/bin:$PATH
+   #+end_src
+   
+* Usage
+- msg machine (command)
+  - init: initializes a new MSG instance
+  - reinit: reinitializes an MSG instance (is destructive!)
+  - start: starts the initialized MSG instance
+  - stop: stops the running instance
+- msg shell
+  - Creates an ssh connection to the running instance
--- a/build-aux/test-driver.scm
+++ b/build-aux/test-driver.scm
@ -0,0 +1,179 @@
+;;;; test-driver.scm - Guile test driver for Automake testsuite harness
+
+(define script-version "2019-01-15.13") ;UTC
+
+;;; Copyright © 2015, 2016 Mathieu Lirzin <mthl@gnu.org>
+;;; Copyright © 2019 Alex Sassmannshausen <alex@pompo.co>
+;;;
+;;; This program is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; This program is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+;;;; Commentary:
+;;;
+;;; This script provides a Guile test driver using the SRFI-64 Scheme API for
+;;; test suites.  SRFI-64 is distributed with Guile since version 2.0.9.
+;;;
+;;; This script is a lightly modified version of the orignal written by
+;;; Matthieu Lirzin.  The changes make it suitable for use as part of the
+;;; guile-hall infrastructure.
+;;;
+;;;; Code:
+
+(use-modules (ice-9 getopt-long)
+             (ice-9 pretty-print)
+             (srfi srfi-26)
+             (srfi srfi-64))
+
+(define (show-help)
+  (display "Usage:
+                         test-driver --test-name=NAME --log-file=PATH --trs-file=PATH
+                         [--expect-failure={yes|no}] [--color-tests={yes|no}]
+                         [--enable-hard-errors={yes|no}] [--brief={yes|no}}] [--]
+               TEST-SCRIPT [TEST-SCRIPT-ARGUMENTS]
+The '--test-name', '--log-file' and '--trs-file' options are mandatory.
+"))
+
+(define %options
+  '((test-name                  (value #t))
+    (log-file                   (value #t))
+    (trs-file                   (value #t))
+    (color-tests                (value #t))
+    (expect-failure             (value #t)) ;XXX: not implemented yet
+    (enable-hard-errors         (value #t)) ;not implemented in SRFI-64
+    (brief                      (value #t))
+    (help    (single-char #\h) (value #f))
+    (version (single-char #\V) (value #f))))
+
+(define (option->boolean options key)
+  "Return #t if the value associated with KEY in OPTIONS is 'yes'."
+  (and=> (option-ref options key #f) (cut string=? <> "yes")))
+
+(define* (test-display field value  #:optional (port (current-output-port))
+                       #:key pretty?)
+  "Display 'FIELD: VALUE\n' on PORT."
+  (if pretty?
+      (begin
+        (format port "~A:~%" field)
+        (pretty-print value port #:per-line-prefix "+ "))
+      (format port "~A: ~S~%" field value)))
+
+(define* (result->string symbol #:key colorize?)
+  "Return SYMBOL as an upper case string.  Use colors when COLORIZE is #t."
+  (let ((result (string-upcase (symbol->string symbol))))
+    (if colorize?
+        (string-append (case symbol
+                         ((pass)       "[0;32m")  ;green
+                         ((xfail)      "[1;32m")  ;light green
+                         ((skip)       "[1;34m")  ;blue
+                         ((fail xpass) "[0;31m")  ;red
+                         ((error)      "[0;35m")) ;magenta
+                       result
+                       "[m")          ;no color
+        result)))
+
+(define* (test-runner-gnu test-name #:key color? brief? out-port trs-port)
+  "Return an custom SRFI-64 test runner.  TEST-NAME is a string specifying the
+file name of the current the test.  COLOR? specifies whether to use colors,
+and BRIEF?, well, you know.  OUT-PORT and TRS-PORT must be output ports.  The
+current output port is supposed to be redirected to a '.log' file."
+
+  (define (test-on-test-begin-gnu runner)
+    ;; Procedure called at the start of an individual test case, before the
+    ;; test expression (and expected value) are evaluated.
+    (let ((result (cute assq-ref (test-result-alist runner) <>)))
+      (format #t "test-name: ~A~%" (result 'test-name))
+      (format #t "location: ~A~%"
+              (string-append (result 'source-file) ":"
+                             (number->string (result 'source-line))))
+      (test-display "source" (result 'source-form) #:pretty? #t)))
+
+  (define (test-on-test-end-gnu runner)
+    ;; Procedure called at the end of an individual test case, when the result
+    ;; of the test is available.
+    (let* ((results (test-result-alist runner))
+           (result? (cut assq <> results))
+           (result  (cut assq-ref results <>)))
+      (unless brief?
+        ;; Display the result of each test case on the console.
+        (format out-port "~A: ~A - ~A~%"
+                (result->string (test-result-kind runner) #:colorize? color?)
+                test-name (test-runner-test-name runner)))
+      (when (result? 'expected-value)
+        (test-display "expected-value" (result 'expected-value)))
+      (when (result? 'expected-error)
+        (test-display "expected-error" (result 'expected-error) #:pretty? #t))
+      (when (result? 'actual-value)
+        (test-display "actual-value" (result 'actual-value)))
+      (when (result? 'actual-error)
+        (test-display "actual-error" (result 'actual-error) #:pretty? #t))
+      (format #t "result: ~a~%" (result->string (result 'result-kind)))
+      (newline)
+      (format trs-port ":test-result: ~A ~A~%"
+              (result->string (test-result-kind runner))
+              (test-runner-test-name runner))))
+
+  (define (test-on-group-end-gnu runner)
+    ;; Procedure called by a 'test-end', including at the end of a test-group.
+    (let ((fail (or (positive? (test-runner-fail-count runner))
+                    (positive? (test-runner-xpass-count runner))))
+          (skip (or (positive? (test-runner-skip-count runner))
+                    (positive? (test-runner-xfail-count runner)))))
+      ;; XXX: The global results need some refinements for XPASS.
+      (format trs-port ":global-test-result: ~A~%"
+              (if fail "FAIL" (if skip "SKIP" "PASS")))
+      (format trs-port ":recheck: ~A~%"
+              (if fail "yes" "no"))
+      (format trs-port ":copy-in-global-log: ~A~%"
+              (if (or fail skip) "yes" "no"))
+      (when brief?
+        ;; Display the global test group result on the console.
+        (format out-port "~A: ~A~%"
+                (result->string (if fail 'fail (if skip 'skip 'pass))
+                                #:colorize? color?)
+                test-name))
+      #f))
+
+  (let ((runner (test-runner-null)))
+    (test-runner-on-test-begin! runner test-on-test-begin-gnu)
+    (test-runner-on-test-end! runner test-on-test-end-gnu)
+    (test-runner-on-group-end! runner test-on-group-end-gnu)
+    (test-runner-on-bad-end-name! runner test-on-bad-end-name-simple)
+    runner))
+
+;;;
+;;; Entry point.
+;;;
+
+(define (main . args)
+  (let* ((opts   (getopt-long (command-line) %options))
+         (option (cut option-ref opts <> <>)))
+    (cond
+     ((option 'help #f)    (show-help))
+     ((option 'version #f) (format #t "test-driver.scm ~A" script-version))
+     (else
+      (let ((log (open-file (option 'log-file "") "w0"))
+            (trs (open-file (option 'trs-file "") "wl"))
+            (out (duplicate-port (current-output-port) "wl")))
+        (redirect-port log (current-output-port))
+        (redirect-port log (current-warning-port))
+        (redirect-port log (current-error-port))
+        (test-with-runner
+            (test-runner-gnu (option 'test-name #f)
+                             #:color? (option->boolean opts 'color-tests)
+                             #:brief? (option->boolean opts 'brief)
+                             #:out-port out #:trs-port trs)
+          (load-from-path (option 'test-name #f)))
+        (close-port log)
+        (close-port trs)
+        (close-port out))))
+    (exit 0)))
--- a/configure.ac
+++ b/configure.ac
@ -0,0 +1,39 @@
+dnl -*- Autoconf -*-
+
+AC_INIT(msg, 0.1)
+AC_SUBST(HVERSION, "\"0.1\"")
+AC_SUBST(AUTHOR, "\"Chad Nelson\"")
+AC_SUBST(COPYRIGHT, "'(2023)")
+AC_SUBST(LICENSE, agpl3+)
+AC_CONFIG_SRCDIR(scripts)
+AC_CONFIG_AUX_DIR([build-aux])
+AM_INIT_AUTOMAKE([1.12 gnu silent-rules subdir-objects  color-tests parallel-tests -Woverride -Wno-portability])
+AM_SILENT_RULES([yes])
+
+AC_CONFIG_FILES([Makefile])
+AC_CONFIG_FILES([pre-inst-env], [chmod +x pre-inst-env])
+AC_CONFIG_FILES([scripts/msg],[chmod +x scripts/msg])
+dnl Search for 'guile' and 'guild'.  This macro defines
+dnl 'GUILE_EFFECTIVE_VERSION'.
+GUILE_PKG([3.0 2.2 2.0])
+GUILE_PROGS
+GUILE_SITE_DIR
+if test "x$GUILD" = "x"; then
+   AC_MSG_ERROR(['guild' binary not found; please check your guile-2.x installation.])
+fi
+
+if test "$cross_compiling" != no; then
+   GUILE_TARGET="--target=$host_alias"
+   AC_SUBST([GUILE_TARGET])
+fi
+
+dnl Hall auto-generated guile-module dependencies
+
+
+dnl Installation directories for .scm and .go files.
+guilemoduledir="${datarootdir}/guile/site/$GUILE_EFFECTIVE_VERSION"
+guileobjectdir="${libdir}/guile/$GUILE_EFFECTIVE_VERSION/site-ccache"
+AC_SUBST([guilemoduledir])
+AC_SUBST([guileobjectdir])
+
+AC_OUTPUT
--- a/doc/config.scm
+++ b/doc/config.scm
@ -0,0 +1 @@
+((cpu . 4) (mem . 4))
--- a/doc/msg.texi
+++ b/doc/msg.texi
@ -0,0 +1,60 @@
+\input texinfo
+@c -*-texinfo-*-
+
+@c %**start of header
+@setfilename msg.info
+@documentencoding UTF-8
+@settitle Msg Reference Manual
+@c %**end of header
+
+@include version.texi
+
+@copying
+Copyright @copyright{} 2023 Chad Nelson
+
+Permission is granted to copy, distribute and/or modify this document
+under the terms of the GNU Free Documentation License, Version 1.3 or
+any later version published by the Free Software Foundation; with no
+Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.  A
+copy of the license is included in the section entitled ``GNU Free
+Documentation License''.
+@end copying
+
+@dircategory The Algorithmic Language Scheme
+@direntry
+* Msg: (msg).   
+@end direntry
+
+@titlepage
+@title The Msg Manual
+@author Chad Nelson
+
+@page
+@vskip 0pt plus 1filll
+Edition @value{EDITION} @*
+@value{UPDATED} @*
+
+@insertcopying
+@end titlepage
+
+@contents
+
+@c *********************************************************************
+@node Top
+@top Msg
+
+This document describes Msg version @value{VERSION}.
+
+@menu
+* Introduction::                Why Msg?
+@end menu
+
+@c *********************************************************************
+@node Introduction
+@chapter Introduction
+
+INTRODUCTION HERE
+
+This documentation is a stub.
+
+@bye
--- a/guix.scm
+++ b/guix.scm
@ -0,0 +1,74 @@
+(use-modules
+ (gnu packages)
+ (gnu packages autotools)
+ (gnu packages guile)
+ (gnu packages guile-xyz)
+ (gnu packages pkg-config)
+ (gnu packages texinfo)
+ (guix build-system gnu)
+ (guix download)
+ (guix gexp)
+ ((guix licenses) #:prefix license:)
+ (guix packages)
+ (srfi srfi-1))
+
+(package
+ (name "msg")
+ (version "0.1")
+ (source
+  (local-file
+   (dirname (current-filename))
+   #:recursive?
+   #t
+   #:select?
+   (lambda (file stat)
+     (not (any (lambda (my-string) (string-contains file my-string))
+               (list ".git" ".dir-locals.el" "guix.scm"))))))
+ (build-system gnu-build-system)
+ (arguments
+  (list #:modules
+        `(((guix build guile-build-system)
+           #:select
+           (target-guile-effective-version))
+          ,@%gnu-build-system-modules)
+        #:phases
+        (with-imported-modules
+         `((guix build guile-build-system) ,@%gnu-build-system-modules)
+         (gexp (modify-phases
+                %standard-phases
+                (add-after
+                 'install
+                 'hall-wrap-binaries
+                 (lambda* (#:key inputs #:allow-other-keys)
+                   (let* ((version (target-guile-effective-version))
+                          (site-ccache
+                           (string-append "/lib/guile/" version "/site-ccache"))
+                          (site (string-append "/share/guile/site/" version))
+                          (dep-path
+                           (lambda (env path)
+                             (list env
+                                   ":"
+                                   'prefix
+                                   (cons (string-append (ungexp output) path)
+                                         (map (lambda (input)
+                                                (string-append
+                                                 (assoc-ref inputs input)
+                                                 path))
+                                              (list))))))
+                          (bin (string-append (ungexp output) "/bin/")))
+                     (for-each
+                      (lambda (file)
+                        (wrap-program
+                         (string-append bin file)
+                         (dep-path "GUILE_LOAD_PATH" site)
+                         (dep-path "GUILE_LOAD_COMPILED_PATH" site-ccache)
+                         (dep-path "GUILE_EXTENSIONS_PATH" "/lib")))
+                      (list "msg"))))))))))
+ (native-inputs (list autoconf automake pkg-config texinfo))
+ (inputs (list guile-3.0))
+ (propagated-inputs (list))
+ (synopsis "")
+ (description "")
+ (home-page "")
+ (license license:agpl3+))
+
--- a/hall.scm
+++ b/hall.scm
@ -0,0 +1,39 @@
+(hall-description
+ (name "msg")
+ (prefix "")
+ (version "0.1")
+ (author "Chad Nelson")
+ (email "")
+ (copyright (2023))
+ (synopsis "")
+ (description "")
+ (home-page "")
+ (license agpl3+)
+ (dependencies `())
+ (skip ())
+ (features
+  ((guix #f)
+   (use-guix-specs-for-dependencies #f)
+   (native-language-support #f)
+   (licensing #f)))
+ (files (libraries
+         ((directory
+           "msg"
+           ((scheme-file "config")
+            (scheme-file "machine")
+            (scheme-file "hconfig")
+            (scheme-file "shell")
+            (scheme-file "helpers")))))
+        (tests ())
+        (programs ((directory "scripts" ((in-file "msg")))))
+        (documentation
+         ((org-file "README")
+          (symlink "README" "README.org")
+          (text-file "HACKING")
+          (text-file "COPYING")
+          (directory "doc" ((texi-file "msg") (scheme-file "config")))
+          (text-file "NEWS")
+          (text-file "AUTHORS")
+          (text-file "ChangeLog")))
+        (infrastructure
+         ((scheme-file "guix") (text-file ".gitignore") (scheme-file "hall")))))
--- a/msg/config.scm
+++ b/msg/config.scm
@ -0,0 +1,51 @@
+(define-module (msg config)
+  #:use-module (ice-9 ftw)
+  #:use-module (ice-9 rdelim)
+  #:declarative? #f
+  #:export (manage-config))
+(define config-data #f)
+
+;;; Function to load a config file
+(define (load-config config-file)
+  (if (file-exists? config-file)
+      (call-with-input-file config-file
+        (lambda (port)
+          (read port)))
+      (begin
+        (display "Config file not found, creating default config")
+        (newline)
+        ;; Return a default value (in this case, #f)
+        (values #f))))
+
+;;; Function to save a config file
+(define (save-config filename config)
+  (with-output-to-file filename
+    (lambda ()
+      (display (format #f "~A" config)))))
+
+;;; Function to create a default config
+(define (create-default-config )
+  '( ;; Default configuration values
+    (cpu . "4")
+    (mem . "4")
+    ;; Add more default key-value pairs as needed
+    ))
+
+(define (manage-config filename)
+  (let* ((config (load-config filename))
+         (default-config (create-default-config)))
+    (cond
+      ((eq? config #f)
+       (begin
+         (display "Creating default config...\n")
+         (save-config filename default-config)
+         (set! config default-config)
+         (values config)))
+      ((unspecified? config)
+       (begin
+         (display "Invalid config file. Reverting to default config...\n")
+         (save-config filename default-config)
+         (set! config default-config)
+         (values config)))
+      (else
+       (values config)))))
--- a/msg/hconfig.scm
+++ b/msg/hconfig.scm
@ -0,0 +1,33 @@
+(define-module
+ (msg hconfig)
+ #:use-module
+ (srfi srfi-26)
+ #:export
+ (%version
+  %author
+  %license
+  %copyright
+  %gettext-domain
+  G_
+  N_
+  init-nls
+  init-locale))
+
+(define %version "0.1")
+
+(define %author "Chad Nelson")
+
+(define %license 'agpl3+)
+
+(define %copyright '(2023))
+
+(define %gettext-domain "msg")
+
+(define G_ identity)
+
+(define N_ identity)
+
+(define (init-nls) "Dummy as no NLS is used" #t)
+
+(define (init-locale) "Dummy as no NLS is used" #t)
+
--- a/msg/helpers.scm
+++ b/msg/helpers.scm
@ -0,0 +1,20 @@
+(define-module (msg helpers)
+  #:use-module (ice-9 ftw)
+  #:use-module (ice-9 popen)
+  #:use-module (ice-9 rdelim)
+  #:use-module (system foreign)
+  #:export (directory-exists?
+	    run-shell-command))
+
+(define (directory-exists? path)
+  (catch 'system-error
+    (lambda ()
+      (stat path))
+    (lambda args #f)))
+
+(define (run-shell-command command)
+  (let* ((port (open-input-pipe command))
+	 (str (read-line port)))
+    (close-pipe port)
+    str))
+
--- a/msg/machine.scm
+++ b/msg/machine.scm
@ -0,0 +1,204 @@
+(define-module (msg machine)
+  #:use-module (ice-9 match)
+  #:use-module (ice-9 rdelim)
+  #:use-module (ice-9 textual-ports)
+  #:use-module (system foreign)
+  #:use-module (msg helpers)
+  #:use-module (msg config)
+  #:export (machine))
+
+
+(define home-path (getenv "HOME"))
+(define arch (run-shell-command "uname -m"))
+
+
+(define cpu-conf #f)
+(define mem-conf #f)
+
+(define* (load-config #:optional args)
+  (define config-file (format #f "~a/.guix/qemu/config.scm" home-path))
+  (define loaded-config (manage-config config-file))
+  (if (not (null? loaded-config))
+      (begin
+        (set! cpu-conf (cdr (assoc 'cpu loaded-config)))
+        (set! mem-conf (cdr (assoc 'mem loaded-config)))
+        #t)
+      #f))
+
+
+(define* (machine #:optional (args (command-line)))
+  ;;(define clean-args (cdr args))
+  (match args
+    (("-h")
+     (help))
+    (("init" rest ...)
+     (init rest))
+    (("reinit")
+     (stop)
+     (clear-install)
+     (init))
+    (("start" rest ...)
+     (start rest))
+    (("stop")
+     (stop))
+    (("rm")
+     (stop)
+     (clear-install))
+    (_
+     (display "Please enter a valid command or -h for help.\n"))))
+
+
+
+
+(define* (help)
+  (display "\nHere are the available commands:\n\n")
+  (display "start: Start the MSG envrionment.\n"))
+
+(define* (clear-install)
+  (let loop ()
+    (display "This is a destructive command and will remove your entire Guix instance. Proceed? (y/n)\n")
+    (define response (read-line))
+    (cond
+      ((string=? response "y")
+       (system "rm -r ~/.guix")
+       )
+      ((string=? response "n")
+       (display "Operation canceled.\n")
+       (exit 0))
+      (else
+       (display "Please enter a valid response.\n")
+       (loop)))))
+
+(define* (start #:optional args)
+  (define config (load-config))
+  (if (not (directory-exists? (format #f "~a/.guix" home-path)))
+      (begin
+	(display "MSG not initialized. Please run `msg machine init` to continue. If you already tried to install and are receiving this message, try running `msg machine reinit`")
+	(exit 0)))
+  (cond
+   ((string=? arch "arm64")
+    (system (format #f "/opt/homebrew/bin/qemu-system-aarch64 \
+             -machine virt,highmem=on \
+             -accel hvf \
+             -cpu host \
+             -smp ~a \
+             -display none \
+             -hda $HOME/.guix/qemu/guix-user.qcow2 \
+             -m ~aG \
+             -virtfs local,path=/Users,security_model=mapped,mount_tag=macos \
+             -bios /opt/homebrew/opt/qemu/share/qemu/edk2-aarch64-code.fd \
+             -device virtio-net,netdev=vmnic \
+             -netdev user,id=vmnic,hostfwd=tcp:127.0.0.1:9001-:22 &" cpu-conf mem-conf)))      
+   ((string=? arch "x86_64")
+    (system (format #f "/usr/local/bin/qemu-system-x86_64 \
+             -machine type=q35,accel=hvf \
+             -smp ~a \
+             -hda $HOME/.guix/qemu/guix-user.qcow2 \
+             -m ~aG \
+             -display none \
+             -cpu Nehalem \
+             -virtfs local,path=/Users,security_model=mapped,mount_tag=macos \
+             -device virtio-net,netdev=vmnic \
+             -netdev user,id=vmnic,hostfwd=tcp:127.0.0.1:9001-:22 &" cpu-conf mem-conf))))
+  (display "MSG has been started")
+  )
+
+(define* (stop)
+  (system "ssh -o StrictHostKeyChecking=no  -i $HOME/.guix/ssh-cert/msg_rsa admin@127.0.0.1 -p 9001 'sudo shutdown'"))
+
+
+(define* (init #:optional args)
+
+  (if (not (directory-exists? (format #f "~a/.guix" home-path)))
+      (begin
+	;; Grab ssh cert for installer
+	(system "mkdir -p $HOME/.guix/qemu $HOME/.guix/home $HOME/.guix/ssh-cert")
+	(system "ssh-keygen -R \"[127.0.0.1]:9001\"")
+	;; Download system image and and start vm
+	(cond
+	 ((string=? arch "arm64")
+	  (system "/opt/homebrew/bin/wget https://objectstorage.us-phoenix-1.oraclecloud.com/n/axfgkze2xif1/b/guix-system/o/msg-system-aarch64guix-installer.qcow2.tar.gz -O $HOME/.guix/qemu/guix.qcow2.tar.gz")
+	  (system "tar -xvzf $HOME/.guix/qemu/guix.qcow2.tar.gz -C $HOME/.guix/qemu/")
+	  (system "/opt/homebrew/bin/wget https://objectstorage.us-phoenix-1.oraclecloud.com/n/axfgkze2xif1/b/guix-system/o/msg-system-aarch64config.scm -O $HOME/.guix/home/config.scm")
+	  ;; Get msg ssh-key
+	  (system "/opt/homebrew/bin/wget https://objectstorage.us-phoenix-1.oraclecloud.com/n/axfgkze2xif1/b/guix-system/o/msg_rsa -O $HOME/.guix/ssh-cert/msg_rsa")
+	  (system "chmod 400 ~/.guix/ssh-cert/msg_rsa ")
+	  (system "/opt/homebrew/bin/qemu-system-aarch64 \
+             -machine virt,highmem=on \
+             -accel hvf \
+             -cpu host \
+             -smp 4 \
+             -display none \
+             -hda $HOME/.guix/qemu/guix-user.qcow2 \
+             -m 4G \
+             -virtfs local,path=$HOME/.guix/home,security_model=mapped,mount_tag=macos \
+             -bios /opt/homebrew/opt/qemu/share/qemu/edk2-aarch64-code.fd \
+             -device virtio-net,netdev=vmnic \
+             -netdev user,id=vmnic,hostfwd=tcp:127.0.0.1:9001-:22 &")
+	  (sleep 5)
+	  (update-uid)
+
+	  (build-msg)
+
+	  (system "ssh -o StrictHostKeyChecking=no  -i $HOME/.guix/ssh-cert/msg_rsa root@127.0.0.1 -p 9001 'shutdown'")
+	  (system "ssh-keygen -R \"[127.0.0.1]:9001\"")
+	  (sleep 30)
+	  (system "rm ~/.guix/qemu/guix-user.qcow2")
+	  (system "mv ~/.guix/home/guix-user.qcow2 ~/.guix/qemu/")
+	  (start)
+	  (sleep 15)
+	  (system "ssh -o StrictHostKeyChecking=no  -i $HOME/.guix/ssh-cert/msg_rsa admin@127.0.0.1 -p 9001 'sudo mkdir /Users /boot/efi'")
+	  (system "ssh -o StrictHostKeyChecking=no  -i $HOME/.guix/ssh-cert/msg_rsa admin@127.0.0.1 -p 9001 'sudo mount /dev/vda1 /boot/efi'"))      
+	 ((string=? arch "x86_64")
+	  (system "/usr/local/bin/wget https://objectstorage.us-phoenix-1.oraclecloud.com/n/axfgkze2xif1/b/guix-system/o/msg-system-x86_64guix-installer.qcow2.tar.gz -O $HOME/.guix/qemu/guix.qcow2.tar.gz")
+	  (system "tar -xvzf $HOME/.guix/qemu/guix.qcow2.tar.gz -C $HOME/.guix/qemu/")
+	  (system "/usr/local/bin/wget https://objectstorage.us-phoenix-1.oraclecloud.com/n/axfgkze2xif1/b/guix-system/o/msg-system-x86_64config.scm -O $HOME/.guix/home/config.scm")
+	  ;; Get msg ssh-key
+	  (system "/usr/local/bin/wget https://objectstorage.us-phoenix-1.oraclecloud.com/n/axfgkze2xif1/b/guix-system/o/msg_rsa -O $HOME/.guix/ssh-cert/msg_rsa")
+	  (system "chmod 400 ~/.guix/ssh-cert/msg_rsa ")
+	  (system "/usr/local/bin/qemu-system-x86_64 \
+             -machine type=q35,accel=hvf \
+             -smp 4 \
+             -hda $HOME/.guix/qemu/guix-installer.qcow2 \
+             -m 4G \
+             -display none \
+             -cpu Nehalem \
+             -virtfs local,path=$HOME/.guix/home,security_model=mapped,mount_tag=macos \
+             -device virtio-net,netdev=vmnic \
+             -netdev user,id=vmnic,hostfwd=tcp:127.0.0.1:9001-:22 &")
+	  (sleep 5)
+	  (update-uid)
+
+	  (build-msg)
+
+	  (system "ssh -o StrictHostKeyChecking=no  -i $HOME/.guix/ssh-cert/msg_rsa root@127.0.0.1 -p 9001 'shutdown'")
+	  (system "ssh-keygen -R \"[127.0.0.1]:9001\"")
+	  (sleep 30)
+	  (system "rm ~/.guix/qemu/guix-installer.qcow2")
+	  (system "mv ~/.guix/home/guix-user.qcow2 ~/.guix/qemu/")
+	  (start)
+	  (sleep 15)
+	  (system "ssh -o StrictHostKeyChecking=no  -i $HOME/.guix/ssh-cert/msg_rsa admin@127.0.0.1 -p 9001 'sudo mkdir /Users'"))
+	 )
+	
+
+
+	(newline)
+	(display "Reconfiguring MSG, this may take a few minutes...")
+	(system "ssh -o StrictHostKeyChecking=no  -i $HOME/.guix/ssh-cert/msg_rsa admin@127.0.0.1 -p 9001 'sudo guix system reconfigure --allow-downgrades /etc/config.scm'")
+	(system "ssh -o StrictHostKeyChecking=no  -i $HOME/.guix/ssh-cert/msg_rsa admin@127.0.0.1 -p 9001 'sudo shutdown'")
+	(display "\nMSG is ready to be started. Run 'msg machine start' to begin.\n"))
+      (display "MSG already initialized. Please run `msg machine reinit` if you would like to recreate it."))
+
+
+  )
+
+(define (build-msg)
+  ;; Build MSG
+  (define* filename (run-shell-command "ssh -o StrictHostKeyChecking=no  -i $HOME/.guix/ssh-cert/msg_rsa root@127.0.0.1 -p 9001 'guix system image -t qcow2 --save-provenance --image-size=100G /etc/config.scm'"))
+  (system (format #f "ssh -o StrictHostKeyChecking=no  -i $HOME/.guix/ssh-cert/msg_rsa root@127.0.0.1 -p 9001 'cp ~a /mnt/macos/guix-user.qcow2'" filename)))
+
+(define (update-uid)
+  ;; Update UID for msg image
+  (system "sed -i.bak \"s/\\$UID/$(id -u)/g\" ~/.guix/home/config.scm && rm ~/.guix/home/config.scm.bak")
+  (system "ssh -o StrictHostKeyChecking=no  -i $HOME/.guix/ssh-cert/msg_rsa root@127.0.0.1 -p 9001 'cp /mnt/macos/config.scm /etc/config.scm'"))
--- a/msg/shell.scm
+++ b/msg/shell.scm
@ -0,0 +1,5 @@
+(define-module (msg shell)
+  #:export (shell))
+
+(define* (shell)
+  (system "ssh -o StrictHostKeyChecking=no -X -i $HOME/.guix/ssh-cert/msg_rsa admin@127.0.0.1 -p 9001"))
--- a/pre-inst-env.in
+++ b/pre-inst-env.in
@ -0,0 +1,13 @@
+#!/bin/sh
+
+abs_top_srcdir="`cd "@abs_top_srcdir@" > /dev/null; pwd`"
+abs_top_builddir="`cd "@abs_top_builddir@" > /dev/null; pwd`"
+
+GUILE_LOAD_COMPILED_PATH="$abs_top_builddir${GUILE_LOAD_COMPILED_PATH:+:}$GUILE_LOAD_COMPILED_PATH"
+GUILE_LOAD_PATH="$abs_top_builddir:$abs_top_srcdir${GUILE_LOAD_PATH:+:}:$GUILE_LOAD_PATH"
+export GUILE_LOAD_COMPILED_PATH GUILE_LOAD_PATH
+
+PATH="$abs_top_builddir/scripts:$PATH"
+export PATH
+
+exec "$@"
--- a/scripts/msg.in
+++ b/scripts/msg.in
@ -0,0 +1,24 @@
+#!@GUILE@ \
+--no-auto-compile -e main -s
+!#
+
+(use-modules (msg machine)
+	     (msg shell)
+	     (ice-9 match))
+
+(define* (main #:optional (args (command-line)))
+  (define clean-args (cdr args))
+  
+  (match clean-args
+    (("machine" rest ...)
+     (machine rest))
+    (("shell" rest ...)
+     (shell))
+    (("-h")
+     (help))
+    (_
+     (display "Please enter a valid command or -h for help.\n"))))
+
+(define* (help)
+  (display "\nHere are the available commands:\n\n")
+  (display "machine: interact with the vm environment for MSG.\n"))
				`@ -0,0 +1 @@`
				`For a complete log, please see the Git commit log at </PATH/TO/LOG>.`