From c64cb49aa4da4f458ce40274a627d7b2f56d506b Mon Sep 17 00:00:00 2001
From: iFargle <albert@sysctl.io>
Date: Fri, 22 Sep 2023 21:09:37 +0900
Subject: [PATCH] test

---
 README.md       |  8 --------
 docs/setup.sh   | 40 ++++++++++++++--------------------------
 lib/default.nix |  2 +-
 shell.nix       |  1 +
 4 files changed, 16 insertions(+), 35 deletions(-)

diff --git a/README.md b/README.md
index 911b1c05..b5a83a37 100644
--- a/README.md
+++ b/README.md
@@ -5,14 +5,6 @@
 * Installing a system from the ISO:
 ```
 nixos-install <Hostname> [<Username>]
-
-HOSTNAME='YourHostnameHere'
-curl https://git.sysctl.io/albert/nix/raw/branch/main/nixos/hosts/${HOSTNAME}/disks.nix >> /tmp/disks.nix
-echo 'LUKSEncryptionKeyHere' >> /tmp/secret.key
-nix run github:nix-community/disko -- --mode disko /tmp/disks.nix
-mkdir -p /mnt/etc/nixos/
-git clone https://git.sysctl.io/albert/nix /etc/nixos/git
-nixos-install --flake /etc/nixos/git#${HOSTNAME} -v --show-trace --no-root-password
 ```
 
 ![Gruv'd Hyprland](./screenshot.png "Hyprland with a Gruvboxy theme")
diff --git a/docs/setup.sh b/docs/setup.sh
index 9bbe1e0b..36cc1634 100755
--- a/docs/setup.sh
+++ b/docs/setup.sh
@@ -1,23 +1,9 @@
 #!env /bin/bash
-# First setup:
 
-user=albert
-read -p "Hostname:  " hostname;
-
-# run as root:
-# eIf on the raspberry pi image:
-# sudo nix-channel --add https://nixos.org/channels/nixpkgs-unstable
-# sudo nix-channel --update
-sudo nix-shell -p git --run  git clone https://git.sysctl.io/albert/nix /etc/nixos/git
-sudo git clone https://git.sysctl.io/albert/nix /etc/nixos/git
-sudo ln -s /etc/nixos/git/flake.nix /etc/nixos/flake.nix
-sudo chown -R $user:root /etc/nixos/git
-sudo nixos-rebuild switch --flake '/etc/nixos#$host'
-sudo mkdir /nix/var/nix/profiles/per-user/$user
-echo "Host setup complete."
-
-# as $user:
-home-manager switch -b backup --flake /etc/nixos/git
+sudo mkdir /nix/var/nix/profiles/per-user/albert
+pushd /etc/nixos/git
+nix develop
+home-manager switch -b backup --flake .
 source ~/.bashrc
 
 # Import and trust the GPG key
@@ -26,21 +12,23 @@ gpg --import $gpgKey
 echo -e "5\ny\n" |  gpg --command-fd 0 --expert --edit-key 64F6C4EB46C4543A trust
 
 # Setup SOPS
-sudo nix-shell -p ssh-to-pgp --run "ssh-to-pgp -i /etc/ssh/ssh_host_rsa_key -o /etc/nixos/git/keys/hosts/$(hostname).asc"
+ssh-to-pgp -i /etc/ssh/ssh_host_rsa_key -o /etc/nixos/git/keys/hosts/$(hostname).asc
 # Update your .sops.yaml with this key
-cd /etc/nixos/git
-nix-shell
 sops-update secrets/secrets.yaml
+for i in $(ls secrets/): 
 
 # Set up ssh keys
 ssh-keygen -t rsa -b 8192 -f ~/.ssh/id_rsa  -N ""
-echo "" >> /etc/nixos/git/keys/ssh/keys.txt
-echo "# `whoami`@`hostname`" >> /etc/nixos/git/keys/ssh/keys.txt
-cat /home/albert/.ssh/id_rsa.pub >> /etc/nixos/git/keys/ssh/keys.txt
+echo "" >> ./keys/ssh/keys.txt
+echo "# `whoami`@`hostname`" >> ./keys/ssh/keys.txt
+cat /home/albert/.ssh/id_rsa.pub >> ./keys/ssh/keys.txt
 
 # Add all changes to git and and push
 git add keys/hosts/`hostname`.asc
-git commit -am "Setup of: `whoami`@`hostname`"
+git commit -am "Setup: `whoami`@`hostname`"
 git push
 
-echo "Complete.  Reboot to complete the config"
\ No newline at end of file
+popd
+echo
+echo
+echo "Complete."
\ No newline at end of file
diff --git a/lib/default.nix b/lib/default.nix
index 3f1cd641..84aaf415 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -59,7 +59,7 @@
     ];
   };
 
-  # Combines mkHost and mkHome for image building - Uses minimal to make a smaller image
+  # Combines mkHost and mkHome for image building
   mkMinImage = {
     hostname  , 
     username  ? "albert",
diff --git a/shell.nix b/shell.nix
index 47b9f5bf..1a9042b5 100644
--- a/shell.nix
+++ b/shell.nix
@@ -20,6 +20,7 @@
       pkgs.vim
       pkgs.alejandra
       pkgs.nixfmt
+      pkgs.ssh-to-pgp
       (pkgs.callPackage sops-nix {}).sops-import-keys-hook
     ];
   };