From 251c4b09ed8f141db2cdea744e3b4f38bc177306 Mon Sep 17 00:00:00 2001
From: Solomon Laing <solomonlaing@protonmail.com>
Date: Sun, 29 Aug 2021 21:53:53 +0930
Subject: [PATCH] minor changes

---
 README.md        | 62 +++++++++++++++++++++++++++++++-----------------
 default-programs |  4 ++++
 2 files changed, 44 insertions(+), 22 deletions(-)

diff --git a/README.md b/README.md
index 2718e0a..c03869a 100644
--- a/README.md
+++ b/README.md
@@ -6,46 +6,64 @@
 
 > 1.0.0 - current
 
-
 This project is an effort to create a easy to use system to install a fresh version of my desktop environment (Xmonad on Arch). The idea is that this system can be used on a fresh install of Arch and will get everything that I currently use setup and ready in a safe manner.
 
+NOTE! This is a very basic set of scripts, it has been tested to work but I have no guarantees that it'll work for you so use with caution please.
 
-# TODO
+# Usage
 
-I want this to be able to be used on a fresh arch install with 0 dependencies, so, I will need to make sure that the user has set up internet, or that an existing connection exists.
-
-I also need to make sure that all required programs are then successfully installed, and that some configs are written.
-
-> Ill need to do this for lightdm and lightdm webkit3 greeter currently.
-> will also need to set shell, if they install my default programs, to fish.
-
-review xmonad.sh for default programs / dependencies
+Usage is:
+setup \<option> -- to start system setup from option
+setup \<option> only -- to only setup the specified option
+Options (in order of execution):
+yay : Install yay AUR helper
+deps : Install the dependencies for my scripts and window manager
+defaults : Install my chosen default programs
+misc : Install my collection of misc - nice to have - programs
+scripts : Install my scirpts
+dmenu : Install my customised version of dmenu
+dotfiles : Install my dotfiles to the system
+configure : configure certain system files - BETA
 
+Note: it is expected that the initial run of this script lets each stage complete successfully.
 
 # Steps
 
-I currently envision the following steps being used:
-
-1. install minimal arch with no extra programs
+1. install minimal arch with no extra programs (use archinstall script that comes with ISO)
 2. access tty manually install git and clone https://gitlab.inkletblot.com/inkletblot/ink-os.git
 3. cd into ink-os
 4. run setup.sh
 
-setup.sh will then...
+setup.sh then...
 
-1. do a general system check
-    1. make sure that there is an internet connection (user may have installed git in chroot and not setup network yet)
-    2. make sure sudo is installed and user is part of sudo or wheel group
-    3. request user for their password, put it in temp file (I can't think of a better way of doing this yet)
+1. does a general system check
+    1. makes sure that there is an internet connection (user may have installed git in chroot and not setup network yet)
+    2. makes sure sudo is installed and user is part of sudo or wheel group
+    3. makes sure the user is not root
 2. update and upgrade system fully
 3. install yay specifically
-4. install my dmenu
-5. install all required dependencies/programs
+4. install all required dependencies/programs
     1. install system dependencies and all required dependencies for my xmonad config and my scripts (NOT INCLUDING: myStartupHook, myManagedHook or bitwarden)
     2. ask user if they want to install my default programs (browser, shell, term, etc)
         1. warn user that they will need to install their own if they don't
     3. ask user if they want to install my misc programs (all the rest of my defaults that I like having)
-6. install my scripts
+5. install my scripts
     1. copy inks-scrips to /usr/local/bin as it should be in path by default
+6. install my dmenu
 7. install my config
-    1. warn user that if they didn't install default programs, they'll need to edit xmonad.hs
+8. attempt to configure the main system programs so after a reboot the sysetm is usable
+    1. set shell to fish
+    2. configure lightdm and greeter
+    3. enable bluetooth
+    4. enable NetworkManager
+    5. warn user that if they didn't install default programs, they'll need to edit xmonad.hs
+    6. warn user about multilib and steam
+    7. ... more.
+
+
+# MISC
+
+To list all installed programs for updating `default-programs` use `yay -Qe | awk '{print $1}'  > all-packages`.
+
+# TODO
+review xmonad.sh for default programs / dependencies
diff --git a/default-programs b/default-programs
index cec0889..f052a5e 100644
--- a/default-programs
+++ b/default-programs
@@ -48,6 +48,7 @@ flameshot
 simple-mtpfs
 micro
 mpv
+arandr
 DEPENDENCIES_END
 
 DEPENDENCIES_LAPTOP_START
@@ -99,4 +100,7 @@ barrier
 todoist-electron
 virt-manager
 teams
+cowsay
+neofetch
+sxiv
 MISC_END
\ No newline at end of file