Trying new things all around

README.md

@@ -29,6 +29,8 @@ ZaneyOS is a simple way of reproducing my configuration on any NixOS system. Thi
 
 #### 🖥️ Multi Host & User Configuration
 - You can now define separate settings for different host machines and users!
+- Easily specify extra packages for your users in the users/users.nix file.
+- Easy to understand file structure where each host just has its generated hardware.nix file and option.nix file in a folder with the hostname as its title.
 
 <div align="center">
 
@@ -41,6 +43,7 @@ Please do yourself a favor and [read the wiki](https://zaney.org/zaneyos/).
 #### 📦 How To Install Packages?
 - You can search the [Nix Packages](https://search.nixos.org/packages?) & [Options](https://search.nixos.org/options?) pages for what a package may be named or if it has options available that take care of configuration hurdles you may face.
 - To add a package there are the packages.nix files located in config/system and config/home folders. One is for programs available system wide and the other for your users environment only.
+- You also have the option of easily adding packages to the option in the users/users.nix file for a specific user.
 
 #### 🙋 Having Issues / Questions?
 - Please feel free to raise an issue on the repo, please label a feature request with the title beginning with [feature request], thank you!

config/scripts/themechange.nix

@@ -8,7 +8,7 @@ pkgs.writeShellScriptBin "themechange" ''
     echo "No Theme Given"
   else
     replacement="$1"
-    sed -i "/^\s*theme[[:space:]]*=[[:space:]]*\"/s/\"\(.*\)\"/\"$replacement\"/" ${flakeDir}/options.nix
+    sed -i "/^\s*theme[[:space:]]*=[[:space:]]*\"/s/\"\(.*\)\"/\"$replacement\"/" ${flakeDir}/hosts/${host}/options.nix
     kitty -e pkexec nixos-rebuild switch --flake ${flakeDir}
   fi
 ''

hosts/hyprnix/options.nix

@@ -22,7 +22,7 @@ in {
   gitEmail = "tylerzanekelley@gmail.com";
 
   # Base16 Theme
-  theme = "atelier-cave";
+  theme = "gruvbox-light-hard";
 
   # Hyprland Settings
   borderAnim = true; # Enable / Disable Hyprland Border Animation

install-zaneyos.sh

@@ -132,138 +132,82 @@ sed -i "/^\s*theTimezone[[:space:]]*=[[:space:]]*\"/s#\"\(.*\)\"#\"$escaped_time
 
 echo "-----"
 
+echo "Must be true or false."
+echo "Please check spelling before pressing Enter!"
 read -p "Set 24 Hour Clock: [ false ] " clockFormat
 if [ -z "$clockFormat" ]; then
   clockFormat="false"
 fi
-user_input_lower=$(echo "$clockFormat" | tr '[:upper:]' '[:lower:]')
-case $user_input_lower in
-  y|yes|true|t|enable)
-    clockFormat="true"
-    ;;
-  *)
-    clockFormat="false"
-    ;;
-esac
 sed -i "/^\s*clock24h[[:space:]]*=[[:space:]]*\"/s/\"\(.*\)\"/\"$clockFormat\"/" ./hosts/$hostName/options.nix
 
 echo "-----"
 
+echo "Must be true or false."
+echo "Please check spelling before pressing Enter!"
 read -p "Enable Animated Borders: [ false ] " animBorder
 if [ -z "$animBorder" ]; then
   animBorder="false"
 fi
-user_input_lower=$(echo "$animBorder" | tr '[:upper:]' '[:lower:]')
-case $user_input_lower in
-  y|yes|true|t|enable)
-    animBorder="true"
-    ;;
-  *)
-    animBorder="false"
-    ;;
-esac
 sed -i "/^\s*borderAnim[[:space:]]*=[[:space:]]*\"/s/\"\(.*\)\"/\"$animBorder\"/" ./hosts/$hostName/options.nix
 
 echo "-----"
 
+echo "Must be true or false."
+echo "Please check spelling before pressing Enter!"
 read -p "Extra Logitech Device Support: [ false ] " logitechSupport
 if [ -z "$logitechSupport" ]; then
   logitechSupport="false"
 fi
-user_input_lower=$(echo "$logitechSupport" | tr '[:upper:]' '[:lower:]')
-case $user_input_lower in
-  y|yes|true|t|enable)
-    logitechSupport="true"
-    ;;
-  *)
-    logitechSupport="false"
-    ;;
-esac
 sed -i "/^\s*logitech[[:space:]]*=[[:space:]]*\"/s/\"\(.*\)\"/\"$logitechSupport\"/" ./hosts/$hostName/options.nix
 
 echo "-----"
 
+echo "Must be true or false."
+echo "Please check spelling before pressing Enter!"
 read -p "Install Kdenlive: [ false ] " kdenlive
 if [ -z "$kdenlive" ]; then
   kdenlive="false"
 fi
-user_input_lower=$(echo "$kdenlive" | tr '[:upper:]' '[:lower:]')
-case $user_input_lower in
-  y|yes|true|t|enable)
-    kdenlive="true"
-    ;;
-  *)
-    kdenlive="false"
-    ;;
-esac
 sed -i "/^\s*kdenlive[[:space:]]*=[[:space:]]*\"/s/\"\(.*\)\"/\"$kdenlive\"/" ./hosts/$hostName/options.nix
 
 echo "-----"
 
+echo "Must be true or false."
+echo "Please check spelling before pressing Enter!"
 read -p "Install Zero AD Game: [ false ] " enableZeroAD
 if [ -z "$enableZeroAD" ]; then
   enableZeroAD="false"
 fi
-user_input_lower=$(echo "$enableZeroAD" | tr '[:upper:]' '[:lower:]')
-case $user_input_lower in
-  y|yes|true|t|enable)
-    zeroad="true"
-    ;;
-  *)
-    zeroad="false"
-    ;;
-esac
-sed -i "/^\s*enableZeroAD[[:space:]]*=[[:space:]]*\"/s/\"\(.*\)\"/\"$zeroad\"/" ./hosts/$hostName/options.nix
+sed -i "/^\s*enableZeroAD[[:space:]]*=[[:space:]]*\"/s/\"\(.*\)\"/\"$enableZeroAD\"/" ./hosts/$hostName/options.nix
 
 echo "-----"
 
+echo "Must be true or false."
+echo "Please check spelling before pressing Enter!"
 read -p "Install Syncthing: [ false ] " enableSyncthing
 if [ -z "$enableSyncthing" ]; then
   enableSyncthing="false"
 fi
-user_input_lower=$(echo "$enableSyncthing" | tr '[:upper:]' '[:lower:]')
-case $user_input_lower in
-  y|yes|true|t|enable)
-    enableSyncthing="true"
-    ;;
-  *)
-    enableSyncthing="false"
-    ;;
-esac
 sed -i "/^\s*syncthing[[:space:]]*=[[:space:]]*\"/s/\"\(.*\)\"/\"$enableSyncthing\"/" ./hosts/$hostName/options.nix
 
 echo "-----"
 
+echo "Must be true or false."
+echo "Please check spelling before pressing Enter!"
 read -p "Enable Printer Support: [ false ] " printers
 if [ -z "$printers" ]; then
   printers="false"
 fi
-user_input_lower=$(echo "$printers" | tr '[:upper:]' '[:lower:]')
-case $user_input_lower in
-  y|yes|true|t|enable)
-    printers="true"
-    ;;
-  *)
-    printers="false"
-    ;;
-esac
 sed -i "/^\s*printer[[:space:]]*=[[:space:]]*\"/s/\"\(.*\)\"/\"$printers\"/" ./hosts/$hostName/options.nix
 
 echo "-----"
 
+echo "Must be true or false."
+echo "Please check spelling before pressing Enter!"
 read -p "Enable Flatpak Support: [ false ] " flatpaks
 if [ -z "$flatpaks" ]; then
   flatpaks="false"
 fi
-user_input_lower=$(echo "$printers" | tr '[:upper:]' '[:lower:]')
-case $user_input_lower in
-  y|yes|true|t|enable)
-    printers="true"
-    ;;
-  *)
-    printers="false"
-    ;;
-esac
 sed -i "/^\s*flatpak[[:space:]]*=[[:space:]]*\"/s/\"\(.*\)\"/\"$flatpaks\"/" ./hosts/$hostName/options.nix
 
 echo "-----"