From 5f9272f0193b0a3184737302317db13e42d42927 Mon Sep 17 00:00:00 2001
From: Casper <me@skylarcloud.xyz>
Date: Thu, 19 Dec 2024 11:09:39 -0700
Subject: worked on readme

---
 README.org | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 56 insertions(+), 4 deletions(-)

(limited to 'README.org')

diff --git a/README.org b/README.org
index 8177d78..1e01395 100644
--- a/README.org
+++ b/README.org
@@ -1,11 +1,63 @@
 #+title: README
 #+OPTIONS: num:nil toc:nil
 * Installation
-1. Setup salt user-dirs
-2. Clone my repo
-3. Move it to dom0
-4. Change your username
+** Setup salt user-dirs
+  #+begin_src bash
+# In dom0
+sudo qubesctl state.sls qubes.user-dirs
+  #+end_src
+
+   I sometimes run into the issue described here on a new install: https://github.com/QubesOS/qubes-issues/issues/8491. The solution that works consistantly for me is:
+
+   #+begin_src bash
+# In dom0
+ln -s /srv/salt/qubes/user-dirs.top /srv/salt/_tops/base/user-dirs.top
+#+end_src
+** Clone my repo
+Open a terminal in some networked app qube (with git installed!), and clone my repository:
+
+#+begin_src bash
+# In dispXXXX
+git clone https://git.skylarcloud.xyz/salt-repo.git
+#+end_src
+** Move it to dom0
+First, we'll turn the repo into an archive with tar:
+
+#+begin_src bash
+# In dispXXXX
+tar -cf /tmp/salt-archive.tar salt-repo
+#+end_src
+
+Then, in dom0:
+
+#+begin_src bash
+# in dom0
+# Pulls the content of the archive from dispXXXX to dom0
+sudo qvm-run --pass-io dispXXXX 'cat /tmp/salt-archive.tar' > /tmp/salt-archive.tar
+
+# Unpack the archive
+sudo cd /tmp && tar -xf salt-archive.tar
+
+# Delete the default /srv/user_salt directory
+# Make sure you haven't put anything important there
+sudo rm -fr /srv/user_salt
+
+# Move the repo to /srv/user_salt
+sudo mv /tmp/salt-repo /srv/user_salt
+#+end_src
+** Change your username
    There's a variable in //wm/wm-setup.sls/ that you should change to match your username. That file needs to write files to your home directory in dom0, and needs the username for those paths.
+** Apply the configuration
+There are many directories with .sls and .top files inside of them. You can enable a feature and apply it with just a couple commands:
+
+#+begin_src bash
+# In dom0
+sudo qubesctl top.enable wm.wm-setup # This enables the top file at /srv/user_salt/wm/wm-setup.top
+sudo qubesctl state.apply # Applies dom0 states
+sudo qubesctl --targets=tmpl-XXXX # Applies dom0 states and states for tmpl-XXXX
+#+end_src
+
+The first topfile you should enable is 3isec, some networked qubes will be configured to use sys-mullvad
 * Features
 ** 3isec
 Sets up the 3isec repository and graphical installer. I use this for sys-mullvad.
-- 
cgit v1.2.3