Merge pull request #2 from JaKooLit/development

waybar simple 2 layout addition and cleaned up helpfile

2 files changed, 25 insertions, 21 deletions

diff --git a/config/hypr/HelpFile.md b/config/hypr/HelpFile.md
index 7d0e096c..abec965e 100644
--- a/config/hypr/HelpFile.md
+++ b/config/hypr/HelpFile.md
@@ -25,7 +25,6 @@
   - right click on update   waybar module  *wallpaper cycle using swaybg* (no animations)
   
   - To change permanently the wallpaper edit the file in *~/.config/hypr/configs/Execs.conf*
-  - For a persistent wallpaper after dark-light mode, edit your Execs.conf. Either delete or put # before exec-once=swww query | swww init and delete the # before exec-once = swww init (Lines 6 and 7 on Execs.conf )
   
   - for the wallpaper styles and configurations, you can watch my video about it *https://youtu.be/6ZGzOjMJBe4*
   
@@ -64,12 +63,12 @@
   Super   Tab             *cycle through workspaces*
 
 # waybar customizations
-  - waybar font too big or too small. Edit the font-size in waybar styles located in ~/.config/hypr/waybar/styles/ . By default, it is set to 100%. After adjusting the GTK font scaling to your liking, edit all the waybar styles. Reduce or increase according to your needs. NOTE that its on percent %. You can also change to px whichever suits you.
+  - waybar font too big or too small. Edit the font-size in waybar styles located in ~/.config/waybar/styles/ . By default, it is set to 100%. After adjusting the GTK font scaling to your liking, edit all the waybar styles. Reduce or increase according to your needs. NOTE that its on percent %. You can also change to px whichever suits you.
 
-  - if you want 12h format instead of 24H format, edit the ~/.config/hypr/waybar/modules look for clock. delete the // and add // or delete the previous one
+  - if you want 12h format instead of 24H format, edit the ~/.config/waybar/modules look for clock. delete the // and add // or delete the previous one
 
   - CPU Temperature:
-    - a.) to change from deg C to deg F , edit the ~/.config/hypr/waybar/modules look for "temperature". Change the format to "format": "{temperatureF}°F {icon}",
+    - a.) to change from deg C to deg F , edit the ~/.config/waybar/modules look for "temperature". Change the format to "format": "{temperatureF}°F {icon}",
     - b.) to fix the temperature if not showing correctly, comment "thermal zone": 0 by putting // before. Delete the // on the "hwmon path". Refresh waybar by pressing CTRL SHIFT w. If still not showing correctly, navigate to /sys/class/hwmon/ and open each hwmon. Look for k10temp for amd. Not sure about intel cpu. and edit accordingly the hwmon path in the "temperature" waybar module.
     - b.1) use this function to easily identify the hwmon path. Ran this in your terminal    ``` for i in /sys/class/hwmon/hwmon*/temp*_input; do echo "$(<$(dirname $i)/name): $(cat ${i%_*}_label 2>/dev/null || echo $(basename ${i%_*})) $(readlink -f $i)"; done ```
   
diff --git a/config/hypr/scripts/ChangeLayoutMenu.sh b/config/hypr/scripts/ChangeLayoutMenu.sh
index a1ca30c7..4c04c153 100755
--- a/config/hypr/scripts/ChangeLayoutMenu.sh
+++ b/config/hypr/scripts/ChangeLayoutMenu.sh
@@ -31,15 +31,16 @@ printf "1. default\n"
 printf "2. plasma-style\n" 
 printf "3. gnome-style\n"
 printf "4. simple panel\n"
-printf "5. top & bot panel\n"
-printf "6. left panel\n"
-printf "7. right panel\n"
-printf "8. top & left panel\n"
-printf "9. top & right panel\n"
-printf "10. bottom & left panel\n"
-printf "11. bottom & right panel\n"
-printf "12. all sides\n"
-printf "13. no panel" 
+printf "5. simple 2 panel\n"
+printf "6. top & bot panel\n"
+printf "7. left panel\n"
+printf "8. right panel\n"
+printf "9. top & left panel\n"
+printf "10. top & right panel\n"
+printf "11. bottom & left panel\n"
+printf "12. bottom & right panel\n"
+printf "13. all sides\n"
+printf "14. no panel" 
 }
 
 main() {
@@ -62,38 +63,42 @@ main() {
         ln -sf "$WOFICONFIGS/config-default" "$WOFICONFIG"
         ;;
     5)
-        ln -sf "$CONFIG/config-dual" "$WCONFIG"
+        ln -sf "$CONFIG/config-simple2" "$WCONFIG"
         ln -sf "$WOFICONFIGS/config-default" "$WOFICONFIG"
         ;;
     6)
-        ln -sf "$CONFIG/config-left" "$WCONFIG"
+        ln -sf "$CONFIG/config-dual" "$WCONFIG"
         ln -sf "$WOFICONFIGS/config-default" "$WOFICONFIG"
         ;;
     7)
-        ln -sf "$CONFIG/config-right" "$WCONFIG"
+        ln -sf "$CONFIG/config-left" "$WCONFIG"
         ln -sf "$WOFICONFIGS/config-default" "$WOFICONFIG"
         ;;
     8)
-        ln -sf "$CONFIG/config-dual-TL" "$WCONFIG"
+        ln -sf "$CONFIG/config-right" "$WCONFIG"
         ln -sf "$WOFICONFIGS/config-default" "$WOFICONFIG"
         ;;
     9)
-        ln -sf "$CONFIG/config-dual-TR" "$WCONFIG"
+        ln -sf "$CONFIG/config-dual-TL" "$WCONFIG"
         ln -sf "$WOFICONFIGS/config-default" "$WOFICONFIG"
         ;;
     10)
-        ln -sf "$CONFIG/config-dual-BL" "$WCONFIG"
+        ln -sf "$CONFIG/config-dual-TR" "$WCONFIG"
         ln -sf "$WOFICONFIGS/config-default" "$WOFICONFIG"
         ;;
     11)
-        ln -sf "$CONFIG/config-dual-BR" "$WCONFIG"
+        ln -sf "$CONFIG/config-dual-BL" "$WCONFIG"
         ln -sf "$WOFICONFIGS/config-default" "$WOFICONFIG"
         ;;
     12)
+        ln -sf "$CONFIG/config-dual-BR" "$WCONFIG"
+        ln -sf "$WOFICONFIGS/config-default" "$WOFICONFIG"
+        ;;
+    13)
         ln -sf "$CONFIG/config-all" "$WCONFIG"
         ln -sf "$WOFICONFIGS/config-default" "$WOFICONFIG"
         ;;
-	13)
+	14)
         if pgrep -x "waybar" >/dev/null; then
         killall waybar
         exit