From a3a44f9054c186ed519bd01bcf184094fa6aa139 Mon Sep 17 00:00:00 2001
From: Ryan Schanzenbacher <ryan@rschanz.org>
Date: Fri, 15 Sep 2023 17:00:17 -0400
Subject: some deploy.sh changes

---
 deploy.sh                                          | 11 ++++++++++
 home-config/deploy-flag                            |  0
 modules/ryan-config/deploy-templates/HostTemplate  | 19 +++++++++++++++++
 .../ryan-config/deploy-templates/HostTemplate.scm  | 19 -----------------
 .../deploy-templates/HostTemplateEncrypted         | 24 ++++++++++++++++++++++
 .../deploy-templates/HostTemplateEncrypted.scm     | 24 ----------------------
 6 files changed, 54 insertions(+), 43 deletions(-)
 create mode 100644 home-config/deploy-flag
 create mode 100644 modules/ryan-config/deploy-templates/HostTemplate
 delete mode 100644 modules/ryan-config/deploy-templates/HostTemplate.scm
 create mode 100644 modules/ryan-config/deploy-templates/HostTemplateEncrypted
 delete mode 100644 modules/ryan-config/deploy-templates/HostTemplateEncrypted.scm

diff --git a/deploy.sh b/deploy.sh
index 80bd40f..7f14eff 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -79,8 +79,19 @@ install_user_env() {
     mount --rbind /dev /mnt/dev
 
     # chroot into system and run commands
+    # First copy the file
+    cp ~/guix-dotfiles/$install_hostname /mnt/$install_hostname.scm
     USER=ryan
     chroot /mnt <<EOT
+    
+    # Activate commands
+    source /var/guix/profiles/system/profile/etc/profile
+    /var/guix/profiles/system/activate
+    guix-daemon --build-users-group=guixbuild --disable-chroot &
+
+    guix shell git -- git clone https://git.stationery.faith/ryan77627/guix-dotfiles /home/$USER/.config/guix
+
+    mv /$install_hostname.scm /home/$USER/.config/guix/$install_hostname.scm
 
     EOT
 
diff --git a/home-config/deploy-flag b/home-config/deploy-flag
new file mode 100644
index 0000000..e69de29
diff --git a/modules/ryan-config/deploy-templates/HostTemplate b/modules/ryan-config/deploy-templates/HostTemplate
new file mode 100644
index 0000000..9718c51
--- /dev/null
+++ b/modules/ryan-config/deploy-templates/HostTemplate
@@ -0,0 +1,19 @@
+(use-modules (ryan-config base-system)
+             (gnu))
+
+(operating-system
+  (inherit base-operating-system)
+  (host-name "ChangeMe_HOST")
+  (file-systems (cons* (file-system
+                         (mount-point "/")
+                         (device (uuid "ChangeMe_ROOT"
+                                       'ext4))
+                         (type "ext4"))
+                       (file-system
+                         (mount-point "/boot/efi")
+                         (device (uuid "ChangeMe_BOOTEFI"
+                                       'fat32))
+                         (type "vfat")) %base-file-systems))
+  (swap-devices
+    (list
+      (swap-space (target (uuid "ChangeMe_SWAP"))))))
diff --git a/modules/ryan-config/deploy-templates/HostTemplate.scm b/modules/ryan-config/deploy-templates/HostTemplate.scm
deleted file mode 100644
index 9718c51..0000000
--- a/modules/ryan-config/deploy-templates/HostTemplate.scm
+++ /dev/null
@@ -1,19 +0,0 @@
-(use-modules (ryan-config base-system)
-             (gnu))
-
-(operating-system
-  (inherit base-operating-system)
-  (host-name "ChangeMe_HOST")
-  (file-systems (cons* (file-system
-                         (mount-point "/")
-                         (device (uuid "ChangeMe_ROOT"
-                                       'ext4))
-                         (type "ext4"))
-                       (file-system
-                         (mount-point "/boot/efi")
-                         (device (uuid "ChangeMe_BOOTEFI"
-                                       'fat32))
-                         (type "vfat")) %base-file-systems))
-  (swap-devices
-    (list
-      (swap-space (target (uuid "ChangeMe_SWAP"))))))
diff --git a/modules/ryan-config/deploy-templates/HostTemplateEncrypted b/modules/ryan-config/deploy-templates/HostTemplateEncrypted
new file mode 100644
index 0000000..5d74aaa
--- /dev/null
+++ b/modules/ryan-config/deploy-templates/HostTemplateEncrypted
@@ -0,0 +1,24 @@
+(use-modules (ryan-config base-system)
+             (gnu))
+
+(operating-system
+  (inherit base-operating-system)
+  (host-name "ChangeMe_HOST")
+  (mapped-devices (list (mapped-device
+                          (source (uuid
+                                   "ChangeMe_ROOT"))
+                          (target "sysroot")
+                          (type luks-device-mapping))))
+  (file-systems (cons* (file-system
+                         (mount-point "/")
+                         (device "/dev/mapper/sysroot")
+                         (type "ext4")
+                         (dependencies mapped-devices))
+                       (file-system
+                         (mount-point "/boot/efi")
+                         (device (uuid "ChangeMe_BOOTEFI"
+                                       'fat32))
+                         (type "vfat")) %base-file-systems))
+  (swap-devices
+    (list
+      (swap-space (target (uuid "ChangeMe_SWAP"))))))
diff --git a/modules/ryan-config/deploy-templates/HostTemplateEncrypted.scm b/modules/ryan-config/deploy-templates/HostTemplateEncrypted.scm
deleted file mode 100644
index 5d74aaa..0000000
--- a/modules/ryan-config/deploy-templates/HostTemplateEncrypted.scm
+++ /dev/null
@@ -1,24 +0,0 @@
-(use-modules (ryan-config base-system)
-             (gnu))
-
-(operating-system
-  (inherit base-operating-system)
-  (host-name "ChangeMe_HOST")
-  (mapped-devices (list (mapped-device
-                          (source (uuid
-                                   "ChangeMe_ROOT"))
-                          (target "sysroot")
-                          (type luks-device-mapping))))
-  (file-systems (cons* (file-system
-                         (mount-point "/")
-                         (device "/dev/mapper/sysroot")
-                         (type "ext4")
-                         (dependencies mapped-devices))
-                       (file-system
-                         (mount-point "/boot/efi")
-                         (device (uuid "ChangeMe_BOOTEFI"
-                                       'fat32))
-                         (type "vfat")) %base-file-systems))
-  (swap-devices
-    (list
-      (swap-space (target (uuid "ChangeMe_SWAP"))))))
-- 
cgit v1.2.3