3 files changed, 53 insertions, 4 deletions

diff --git a/README.md b/README.md
index 8a7b564..57922c3 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,27 @@
 
 ## Installing Guix
 
-### Instructions
+### New Instructions
+
+- Boot from Bootable media
+- Setup network and partitions with graphical installer
+- bail out before installation, go to terminal
+    - mount cow-store using `herd start cow-store /mnt`
+    - download latest personal config
+    - add authorization keys
+    - use guix time-machine with `env GUILE_LOAD_PATH='' GUILD_LOAD_COMPILED_PATH='' ...` to init system
+    - place copy of config in /mnt to copy over later. MAKE SURE TO INCLUDE .git FOLDER!!
+    - reboot into new system
+- assign root and ryan pw
+- login to ryan
+    - place config into ~/.config/guix
+    - run `guix pull -C ~/.config/guix/channels.scm`
+    - run `sudo -E guix system -L ~/.config/guix/modules reconfigure ...`
+    - run `guix home -L ~/.config/guix/modules reconfigure ...`
+    - run `nix run --no-write-lock-file github:nix-community/home-manager/ -- --flake ".#$USER" switch`
+- you may have a system now
+
+### Instructions (old, for reference)
 
 - Create USB with Guix installation image
 - Boot and create partitions using graphical installer
@@ -10,7 +30,7 @@
     - Mount cow-store using herd start cow-store /mnt
     - Download latest version of configuration using `curl -o main.tar.gz --insecure --follow https://git.ryanserver.home.arpa/ryan77627/guix-config/archive/main.tar.gz` and unpack using tar
     - Authorize nonguix channel using `curl -o signkey.pub https://substitutes.nonguix.org/signing-key.pub and guix archive --authorize < signkey.pub`
-    - Modify/add system config for system and initialize using `env GUILE_LOAD_PATH='' GUILE_LOAD_COMPILED_PATH='' guix time-machine -C channels.scm -- system -L modules/ --substitute-urls='https://bordeaux.guix.gnu.org https://ci.guix.gnu.org https://substitutes.nonguix.org' init system.scm /mnt`
+    - Modify/add system config for system and initialize using `guix time-machine -C channels.scm -- system -L modules/ --substitute-urls='https://bordeaux.guix.gnu.org https://ci.guix.gnu.org https://substitutes.nonguix.org' init system.scm /mnt`
     - When installed, proceed
 - Reboot into system, assign root and ryan user a password
 - Setup system completely
diff --git a/SmallLaptop.scm b/SmallLaptop.scm
new file mode 100644
index 0000000..d277afe
--- /dev/null
+++ b/SmallLaptop.scm
@@ -0,0 +1,29 @@
+(use-modules (ryan-config base-system)
+             (ryan-bootloader uki)
+             (gnu))
+
+(operating-system
+  (inherit base-operating-system)
+  (host-name "SmallLaptop")
+  (mapped-devices (list (mapped-device
+                          (source (uuid
+                                   "b22d6f2b-44ce-4b56-9833-dde593d19d75"))
+                          (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 "B70B-1F33"
+                                       'fat32))
+                         (type "vfat")) %base-file-systems))
+  (bootloader (bootloader-configuration
+                (bootloader uefi-uki-bootloader)
+                (targets (list "/boot/efi"))
+                (keyboard-layout (keyboard-layout "us"))))
+  (swap-devices
+    (list
+      (swap-space (target (uuid "3d4b8192-e86f-4579-9285-29f7cd11d136"))))))
diff --git a/home-config/home-configuration.scm b/home-config/home-configuration.scm
index df3a779..5740b26 100644
--- a/home-config/home-configuration.scm
+++ b/home-config/home-configuration.scm
@@ -183,13 +183,13 @@
                   `((".local/share/nvim/site/autoload/plug.vim" ,(local-file "nvim/plugin-manager/plug.vim"))
                     (".ssh/config" ,(local-file "ssh/config"))
                     (".icons" ,(local-file "icons" #:recursive? #t))
-                    (".mozilla/native-messaging-hosts/gpgmejson.json" ,(local-file "mailvelope/gpgmejson.json"))
+                    ;(".mozilla/native-messaging-hosts/gpgmejson.json" ,(local-file "mailvelope/gpgmejson.json"))
                     (".local/share/mailvelope" ,(local-file "mailvelope" #:recursive? #t))
                     (".mozilla/native-messaging-hosts/tridactyl.json" ,(local-file "tridactyl/tridactyl.json"))
                     (".local/share/tridactyl" ,(local-file "tridactyl" #:recursive? #t))
                     ;(".gnupg/sshcontrol" ,(local-file "gnupg/sshcontrol"))
                     ;(".gnupg/gpg-agent.conf" ,(local-file "gnupg/gpg-agent.conf"))
-                    (".gnupg/gpg.conf" ,(local-file "gnupg/gpg.conf"))
+                    ;(".gnupg/gpg.conf" ,(local-file "gnupg/gpg.conf"))
                     (".local/share/fonts" ,(local-file "fonts" #:recursive? #t))
                     (".gitconfig" ,(local-file "gitconfig"))
                     (".docker/cli-plugins" ,(local-file "docker/cli-plugins" #:recursive? #t))