WIP: Move scripts out of README.org into public/nixos/setup.sh

2 files changed, 38 insertions, 36 deletions

diff --git a/README.org b/README.org
index b1ce6c8..10d6840 100644
--- a/README.org
+++ b/README.org
@@ -36,10 +36,7 @@ Now open up Firefox and login back to it! That's all!
 :PROPERTIES:
 :CUSTOM_ID: exporting-gpg-key-pairs
 :END:
-** Instructions - setting up a new installation (NixOS)
-*** 1. Download NixOS image from [[https://nixos.org/][the website]].
-*** 2. Follow USB ISO installation steps in =nixos/os-installation.sh=
-*** 3. Put =private.gpg= and =public.gpg= files in UTCLOUD (the actual HD drive)
+Put =private.gpg= and =public.gpg= files in UTCLOUD (the actual HD drive)
 #+BEGIN_SRC shell
   gpg --export -a EuAndreh > public.gpg
   gpg --export-secret-keys -a EuAndreh > private
@@ -50,36 +47,7 @@ Now open up Firefox and login back to it! That's all!
   mv private.gpg ~/UTCLOUD/private.gpg
   cp $DOTFILES/encrypted/password-hash.txt ~/UTCLOUD/password-hash.txt
 #+END_SRC
-*** 4. Import GPG keys in new OS
-#+BEGIN_SRC shell
-  gpg -o private -d private.gpg
-  gpg --import public.gpg
-  gpg --import private
-  gpg --edit-key EuAndreh
-
-  # Inside GPG prompt
-  trust
-  5
-  quit
-
-  # end of GPG prompt
-  shred private
-  shred private.gpg
-  rm private
-  rm private.gpg
-  rm public.gpg
-#+END_SRC
-*** 5. Clone annex repo from HD and setup remotes
-#+BEGIN_SRC shell
-git clone gcrypt::/media/andreh/UTCLOUD/annex.git
-cd annex
-git annex describe here "repo description"
-git annex enableremote hd
-git annex enableremote gitlab
-git annex enableremote rsyncnet
-git annex enableremote s3
-#+END_SRC
-** Paperkey
+*** Paperkey
 Paperkey generate using:
 #+BEGIN_SRC shell
 cat <<EOF
diff --git a/public/nixos/setup.sh b/public/nixos/setup.sh
index c1a797a..cfa88b5 100644
--- a/public/nixos/setup.sh
+++ b/public/nixos/setup.sh
@@ -4,7 +4,10 @@
 set -Eeuo pipefail
 
 # import GPG key pair
-# download git annex
+# download git annex from Nextcloud
+# wait for Nextcloud to finish sync
+# git annex enable
+# git annex describe
 # get annex &
 # download dotfiles
 # mr checkout &
@@ -14,4 +17,35 @@ set -Eeuo pipefail
 # restore newsboat from backup
 # restore archive from backup
 # open emacs # eval x
-# open Nextcloud
+# sudo create symlink for /etc/nixos/configuration.nix and /etc/nixos/local-configuration.nix
+
+
+# *** 4. Import GPG keys in new OS
+# #+BEGIN_SRC shell
+# gpg -o private -d private.gpg
+# gpg --import public.gpg
+# gpg --import private
+# gpg --edit-key EuAndreh
+
+# # Inside GPG prompt
+# trust
+# 5
+# quit
+
+# # end of GPG prompt
+# shred private
+# shred private.gpg
+# rm private
+# rm private.gpg
+# rm public.gpg
+# #+END_SRC
+# *** 5. Clone annex repo from HD and setup remotes
+# #+BEGIN_SRC shell
+# git clone gcrypt::/media/andreh/UTCLOUD/annex.git
+# cd annex
+# git annex describe here "repo description"
+# git annex enableremote hd
+# git annex enableremote gitlab
+# git annex enableremote rsyncnet
+# git annex enableremote s3
+# #+END_SRC