Merge pull request #101 from JaKooLit/Development

Development

README.md

@@ -1,13 +1,13 @@
 <div align="center">
 
-# 💌 ** JaKooLit Hyprland Dot Files ** 💌
+## 💌 ** JaKooLit Hyprland Dot Files ** 💌
 
 ![GitHub Repo stars](https://img.shields.io/github/stars/JaKooLit/Hyprland-Dots?style=for-the-badge&color=cba6f7) ![GitHub last commit](https://img.shields.io/github/last-commit/JaKooLit/Hyprland-Dots?style=for-the-badge&color=b4befe) ![GitHub repo size](https://img.shields.io/github/repo-size/JaKooLit/Hyprland-Dots?style=for-the-badge&color=cba6f7)
 
 <br/>
 </div>
 
-### Some preview
+#### Some preview
 https://github.com/JaKooLit/Hyprland-Dots/assets/85185940/4bebe592-ca43-4962-9b5c-38f16d63a9fa
 
 ## 👁️‍🗨️ My Hyprland install Scripts 👁️‍🗨️
@@ -23,31 +23,31 @@ https://github.com/JaKooLit/Hyprland-Dots/assets/85185940/4bebe592-ca43-4962-9b5
 
 - refer to install scripts what packages needed to install... but atleast, Hyprland packages is needed 😏😏😏 duh!!
 
-## 👀 Screenshots 👀
+### 👀 Screenshots 👀
 - All screenshots are collected here [Screenshots](https://github.com/JaKooLit/screenshots/tree/main/Hyprland-ScreenShots)
 
-### 📦 Whats new?
+#### 📦 Whats new?
 - To easily track changes, I will be updating the changelogs. [CHANGELOGS](https://github.com/JaKooLit/Hyprland-Dots/wiki/7.-CHANGELOGS)  Screenshots will be included if worth it!
 
-### 📹 A video walkthroughs
+#### 📹 A video walkthroughs
 - [Walkthough](https://youtu.be/fO-RBHvVEcc)
 
 - [V1-Changes](https://youtu.be/upDl1ns05eg)
 
 - [v2-Changes](https://youtu.be/yaVurRoXc-s)
 
-### 📽️ A video coverage by other users. Pls watch and subscribe to their channel
+#### 📽️ A video coverage by other users. Pls watch and subscribe to their channel
 - [`Link`](https://github.com/JaKooLit/Hyprland-Dots/wiki/8.-Videos-and-Reviews)
 
 
-## 💥 Copying / Installation / Update instructions 💥
+### 💥 Copying / Installation / Update instructions 💥
 - [`MORE INFO HERE`](https://github.com/JaKooLit/Hyprland-Dots/wiki/2.-Install-&-update) 
-- Note! The auto copy script will create backups of intended folders to be copied. However, still a good idea to manually backup just incase script failed to backup!
+> [!Note] The auto copy script will create backups of intended folders to be copied. However, still a good idea to manually backup just incase script failed to backup!
 - ~/.config (btop cava dunst hypr kitty rofi swappy swaylock waybar wlogout) - These are folders to be copied.
 - ~/Pictures/wallpapers - Will be backed up
 - clone this repo by using git. Change directory, make executable and run the script
 ```bash
-git clone https://github.com/JaKooLit/Hyprland-Dots.git
+git clone --depth=1 https://github.com/JaKooLit/Hyprland-Dots.git
 cd Hyprland-Dots
 ```
 - to copy/install/update from upstream (possible bugs)
@@ -61,11 +61,11 @@ chmod +x release.sh
 ./release.sh
 ```
 
-### 🛎️ a small note on wallpapers
+#### 🛎️ a small note on wallpapers
 - by default, only few wallpapers will be copied (1 each dark and light plus 2 more). You will be offered to download more wallpapers. You can preview/check the additional wallpapers on [`THIS`](https://github.com/JaKooLit/Wallpaper-Bank/tree/main/wallpapers) Link
 
 
-### ⚠️⚠️⚠️ A MUST! after copying  / Installing these dots
+#### ⚠️⚠️⚠️ A MUST! after copying  / Installing these dots
 
 + By default I have not set a wallpaper. Press SUPER W and set a wallpaper. This is also to initiate pywal for waybar, kitty (tty) and rofi themes. If you use the copy.sh script, you wont need to do this.
 
@@ -73,32 +73,34 @@ chmod +x release.sh
 
 + If you have already set your own keybinds, monitors, etc.... Just copy over from backup created before log-out or reboot. (recommended)
 
-### 📖 Known issues and possible solutions
+#### 📖 Known issues and possible solutions
 - check out this page [FAQ](https://github.com/JaKooLit/Hyprland-Dots/wiki/4.-FAQ) and [UNSOLVED ISSUES](https://github.com/JaKooLit/Hyprland-Dots/wiki/6.-Known-Issues)
 
 
-### 🙋 QUESTIONS ?!?! ⁉️
+#### 🙋 QUESTIONS ?!?! ⁉️
 - FAQ! Yes you can use these dotfiles to other distro! Just ensure to install proper packages first! If it makes you feel better, I use same config on my Gentoo and NixOS :)
 - QUICK HINT! Click the HINT! Waybar module (note only available in Waybar default and Simple-L [TOP] layout). Can be launched by Keybind SUPER H
 - More question? click here [WIKI](https://github.com/JaKooLit/Hyprland-Dots/wiki/)
 
-### 🙏 Special request
+#### 🙏 Special request
 - If you have improvements on the dotfiles or configuration, feel free to submit a PR for improvement. I always welcome improvements as I am also just learning just like you guys!
 - Waybar styles (all those new panel styles require some tweaking) - I kindly request assistance 🙏
 
-### 🤷‍♂️ TO DO!
+#### 🤷‍♂️ TO DO!
 - [ ] Tweak waybar layouts and Themes - in constant progress
 - [ ] Tweak rofi layouts and Themes in constant progress
 - ~~[ ] Quite possibly switch to starship? Although starship has limited themes compared to oh-my-zsh.~~ no plans for now
 
-### 🔮 Discord Server
+#### 🔮 Discord Server
 - kindly join my [Discord](https://discord.gg/V2SJ92vbEN)
 
-## 💖 Support
+### 💖 Support
 - a Star on my Github repos would be nice 🌟
 
 - Subscribe to my Youtube Channel [YouTube](https://www.youtube.com/@Ja.KooLit) 
 
-- You can also buy me Coffee Through ko-fi.com 🤩
+- You can also buy me Coffee Through ko-fi.com or Coffee.com 🤩
 
 <a href='https://ko-fi.com/jakoolit' target='_blank'><img height='35' style='border:0px;height:46px;' src='https://az743702.vo.msecnd.net/cdn/kofi3.png?v=0' border='0' alt='Buy Me a Coffee at ko-fi.com' />
+
+[!["Buy Me A Coffee"](https://www.buymeacoffee.com/assets/img/custom_images/orange_img.png)](https://www.buymeacoffee.com/JaKooLit)

config/hypr/configs/Execs.conf

@@ -6,6 +6,9 @@ $lock = $scriptsDir/LockScreen.sh
 $SwwwRandom = $scriptsDir/WallpaperRandom.sh
 $WallpaperPath = $HOME/Pictures/wallpapers
 
+# Initial boot script to start Pywal and Set wallpaper. This line and corresponding script can be safely deleted once logged in
+exec-once = $HOME/.config/hypr/initial-boot.sh
+
 # wallpaper stuff / More wallpaper options below
 exec-once = swww query || swww init
 exec-once = $SwwwRandom $WallpaperPath # random wallpaper switcher every 30 minutes 
@@ -31,9 +34,6 @@ exec-once = wl-paste --type image --watch cliphist store
 # Rainbow borders
 exec-once = $scriptsDir/RainbowBorders.sh
 
-# Initial boot script to start Pywal and Set wallpaper. This line and corresponding script can be safely deleted once logged in
-exec-once = $HOME/.config/hypr/initial-boot.sh
-
 # sway-idle with lock only
 exec-once = swayidle -w timeout 900 '$lock'
 # sway-idle with lock and sleep

config/hypr/initial-boot.sh

@@ -24,17 +24,11 @@ if [ ! -f ~/.config/hypr/.initial_startup_done ]; then
     # Initial symlink for Pywal Dark and Light for Rofi Themes
     ln -sf "$HOME/.cache/wal/colors-rofi-dark.rasi" "$HOME/.config/rofi/pywal-color/pywal-theme.rasi"
 
-    # Initial waybar style
-    ln -sf "$waybar_style" "$HOME/.config/waybar/style.css"
-
     # Initial scripts to load in order to have a proper wallpaper waybar and pywal themes
-    swww query || swww init && $swww "$wallpaper" $effect
-
-    # Refreshing waybar, dunst, rofi etc. 
-    "$scriptsDir/PywalSwww.sh" > /dev/null 2>&1 &
-    "$scriptsDir/Refresh.sh" > /dev/null 2>&1 &
+   	swww init && $swww "$wallpaper" $effect
     
     # initiate GTK dark mode and apply icon and cursor theme
+    gsettings set org.gnome.desktop.interface color-scheme prefer-dark > /dev/null 2>&1 &
     gsettings set org.gnome.desktop.interface gtk-theme Tokyonight-Dark-BL-LB > /dev/null 2>&1 &
     gsettings set org.gnome.desktop.interface icon-theme Tokyonight-Dark > /dev/null 2>&1 &
     gsettings set org.gnome.desktop.interface cursor-theme Bibata-Modern-Ice > /dev/null 2>&1 &
@@ -46,6 +40,13 @@ if [ ! -f ~/.config/hypr/.initial_startup_done ]; then
     # initiate the kb_layout (for some reason) waybar cant launch it
     "$scriptsDir/SwitchKeyboardLayout.sh" > /dev/null 2>&1 &
 
+    # Initial waybar style
+    ln -sf "$waybar_style" "$HOME/.config/waybar/style.css"
+	
+	# Refreshing waybar, dunst, rofi etc. 
+    "$scriptsDir/PywalSwww.sh" > /dev/null 2>&1 &
+    "$scriptsDir/Refresh.sh" > /dev/null 2>&1 &
+
     # Create a marker file to indicate that the script has been executed.
     touch ~/.config/hypr/.initial_startup_done
 

config/hypr/scripts/DarkLight.sh

@@ -108,13 +108,16 @@ set_custom_gtk_theme() {
     mode=$1
     gtk_themes_directory="$HOME/.themes"
     icon_directory="$HOME/.icons"
+    color_setting="org.gnome.desktop.interface color-scheme"
     theme_setting="org.gnome.desktop.interface gtk-theme"
     icon_setting="org.gnome.desktop.interface icon-theme"
 
     if [ "$mode" == "Light" ]; then
         search_keywords="*Light*"
+        gsettings set $color_setting 'prefer-light'
     elif [ "$mode" == "Dark" ]; then
         search_keywords="*Dark*"
+        gsettings set $color_setting 'prefer-dark'
     else
         echo "Invalid mode provided."
         return 1
@@ -139,6 +142,11 @@ set_custom_gtk_theme() {
         fi
         echo "Selected GTK theme for $mode mode: $selected_theme"
         gsettings set $theme_setting "$selected_theme"
+
+        # Flatpak GTK apps
+        if command -v flatpak &> /dev/null; then
+            flatpak --user override --env=GTK_THEME="$selected_theme"
+        fi
     else
         echo "No $mode GTK theme found"
     fi
@@ -152,15 +160,19 @@ set_custom_gtk_theme() {
         echo "Selected icon theme for $mode mode: $selected_icon"
         gsettings set $icon_setting "$selected_icon"
         
-		## QT5ct icon_theme
-		sed -i "s|^icon_theme=.*$|icon_theme=$selected_icon|" "$HOME/.config/qt5ct/qt5ct.conf"
-		sed -i "s|^icon_theme=.*$|icon_theme=$selected_icon|" "$HOME/.config/qt6ct/qt6ct.conf"
+        ## QT5ct icon_theme
+        sed -i "s|^icon_theme=.*$|icon_theme=$selected_icon|" "$HOME/.config/qt5ct/qt5ct.conf"
+        sed -i "s|^icon_theme=.*$|icon_theme=$selected_icon|" "$HOME/.config/qt6ct/qt6ct.conf"
+
+        # Flatpak GTK apps
+        if command -v flatpak &> /dev/null; then
+            flatpak --user override --env=ICON_THEME="$selected_icon"
+        fi
     else
         echo "No $mode icon theme found"
     fi
 }
 
-
 # Call the function to set GTK theme and icon theme based on mode
 set_custom_gtk_theme "$next_mode"
 
@@ -168,7 +180,6 @@ set_custom_gtk_theme "$next_mode"
 update_theme_mode
 
 sleep 0.5
-
 # Run remaining scripts
 ${SCRIPTSDIR}/PywalSwww.sh
 sleep 1

config/qt5ct/qt5ct.conf

@@ -7,7 +7,7 @@ style=kvantum
 
 [Fonts]
 fixed="Fira Code Medium,12,-1,5,57,0,0,0,0,0,Regular"
-general="Fira Code Medium,12,-1,5,57,0,0,0,0,0,Regular"
+general="Fira Code Medium,14,-1,5,57,0,0,0,0,0,Regular"
 
 [Interface]
 activate_item_on_single_click=1

config/qt6ct/qt6ct.conf

@@ -7,7 +7,7 @@ style=kvantum
 
 [Fonts]
 fixed="Fira Code Medium,12,-1,5,57,0,0,0,0,0,Regular"
-general="Fira Code Medium,12,-1,5,57,0,0,0,0,0,Regular"
+general="Fira Code Medium,14,-1,5,57,0,0,0,0,0,Regular"
 
 [Interface]
 activate_item_on_single_click=1