From 0df5a287bfcb697d58c32ad01a4aa1b34ff55198 Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Fri, 22 Dec 2023 01:53:40 +0900 Subject: Added Tokyo-Day kvantum theme app updated DarkLight.sh script to include QT apps in Dark/Light switching --- config/hypr/scripts/DarkLight.sh | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'config/hypr/scripts') diff --git a/config/hypr/scripts/DarkLight.sh b/config/hypr/scripts/DarkLight.sh index 628baa41..bc2e3bc0 100755 --- a/config/hypr/scripts/DarkLight.sh +++ b/config/hypr/scripts/DarkLight.sh @@ -45,9 +45,13 @@ set_waybar_style() { if [ "$(cat ~/.cache/.wallpaper_mode)" = "Light" ]; then next_mode="Dark" wallpaper_path="$dark_wallpapers" + kvantum_mode="Tokyo-Night" + qt5ct_color_scheme="$HOME/.config/qt5ct/colors/Tokyo-Night.conf" else next_mode="Light" wallpaper_path="$light_wallpapers" + kvantum_mode="Tokyo-Day" + qt5ct_color_scheme="$HOME/.config/qt5ct/colors/Tokyo-Day.conf" fi # Call the function after determining the mode @@ -64,6 +68,12 @@ else sed -i '/foreground = /s/.*/ foreground = "#00000095"/' "${dunst_config}/dunstrc" fi +# QT APPS Change Kvantum Manager theme & QT5CT Settings +# QT Icons at below with GTK Icons +kvantummanager --set "$kvantum_mode" +sed -i "s|^color_scheme_path=.*$|color_scheme_path=$qt5ct_color_scheme|" "$HOME/.config/qt5ct/qt5ct.conf" + + # Set Rofi Themes if [ "$next_mode" = "Dark" ]; then ln -sf $dark_rofi_pywal "$HOME/.config/rofi/pywal-color/pywal-theme.rasi" @@ -136,11 +146,15 @@ set_custom_gtk_theme() { fi 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" 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" -- cgit v1.2.3 From 14e1421537e38cd9bc68491c4a24028132a4a589 Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Fri, 22 Dec 2023 02:09:22 +0900 Subject: added Tokyo-Day kvantum --- config/Kvantum/Tokyo-Day/Tokyo-Day.svg | 7 +++++-- config/hypr/scripts/DarkLight.sh | 5 ++++- config/qt5ct/qt5ct.conf | 2 +- config/qt6ct/colors/Catppuccin-Mocha.conf | 4 ---- config/qt6ct/colors/Tokyo-Day.conf | 4 ++++ config/qt6ct/qt6ct.conf | 2 +- 6 files changed, 15 insertions(+), 9 deletions(-) delete mode 100644 config/qt6ct/colors/Catppuccin-Mocha.conf create mode 100644 config/qt6ct/colors/Tokyo-Day.conf (limited to 'config/hypr/scripts') diff --git a/config/Kvantum/Tokyo-Day/Tokyo-Day.svg b/config/Kvantum/Tokyo-Day/Tokyo-Day.svg index 7f3dec1c..d5165883 100644 --- a/config/Kvantum/Tokyo-Day/Tokyo-Day.svg +++ b/config/Kvantum/Tokyo-Day/Tokyo-Day.svg @@ -4,8 +4,11 @@ height="1e3" version="1" id="svg1810" - sodipodi:docname="Frosted-Glass.svg" - inkscape:version="1.3 (0e150ed6c4, 2023-07-21)" + sodipodi:docname="Tokyo-Day.svg" + inkscape:version="1.3.2 (091e20ef0f, 2023-11-25, custom)" + inkscape:export-filename="Tokyo-Day.svg" + inkscape:export-xdpi="96" + inkscape:export-ydpi="96" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:xlink="http://www.w3.org/1999/xlink" diff --git a/config/hypr/scripts/DarkLight.sh b/config/hypr/scripts/DarkLight.sh index bc2e3bc0..aed6595b 100755 --- a/config/hypr/scripts/DarkLight.sh +++ b/config/hypr/scripts/DarkLight.sh @@ -47,11 +47,13 @@ if [ "$(cat ~/.cache/.wallpaper_mode)" = "Light" ]; then wallpaper_path="$dark_wallpapers" kvantum_mode="Tokyo-Night" qt5ct_color_scheme="$HOME/.config/qt5ct/colors/Tokyo-Night.conf" + qt6ct_color_scheme="$HOME/.config/qt6ct/colors/Tokyo-Night.conf" else next_mode="Light" wallpaper_path="$light_wallpapers" kvantum_mode="Tokyo-Day" qt5ct_color_scheme="$HOME/.config/qt5ct/colors/Tokyo-Day.conf" + qt6ct_color_scheme="$HOME/.config/qt6ct/colors/Tokyo-Day.conf" fi # Call the function after determining the mode @@ -72,7 +74,7 @@ fi # QT Icons at below with GTK Icons kvantummanager --set "$kvantum_mode" sed -i "s|^color_scheme_path=.*$|color_scheme_path=$qt5ct_color_scheme|" "$HOME/.config/qt5ct/qt5ct.conf" - +sed -i "s|^color_scheme_path=.*$|color_scheme_path=$qt6ct_color_scheme|" "$HOME/.config/qt6ct/qt6ct.conf" # Set Rofi Themes if [ "$next_mode" = "Dark" ]; then @@ -149,6 +151,7 @@ set_custom_gtk_theme() { ## 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" else echo "No $mode icon theme found" fi diff --git a/config/qt5ct/qt5ct.conf b/config/qt5ct/qt5ct.conf index cf3c23aa..9309dbc5 100644 --- a/config/qt5ct/qt5ct.conf +++ b/config/qt5ct/qt5ct.conf @@ -1,7 +1,7 @@ [Appearance] color_scheme_path=$HOME/.config/qt5ct/colors/Tokyo-Night.conf custom_palette=true -icon_theme=TokyoNight-SE +icon_theme=Tokyonight-Dark standard_dialogs=default style=kvantum diff --git a/config/qt6ct/colors/Catppuccin-Mocha.conf b/config/qt6ct/colors/Catppuccin-Mocha.conf deleted file mode 100644 index e566a630..00000000 --- a/config/qt6ct/colors/Catppuccin-Mocha.conf +++ /dev/null @@ -1,4 +0,0 @@ -[ColorScheme] -active_colors=#ffcdd6f4, #ff1e1e2e, #ffa6adc8, #ff9399b2, #ff45475a, #ff6c7086, #ffcdd6f4, #ffcdd6f4, #ffcdd6f4, #ff1e1e2e, #ff181825, #ff7f849c, #ff89b4fa, #ff1e1e2e, #ff89b4fa, #fff38ba8, #ff1e1e2e, #ffcdd6f4, #ff11111b, #ffcdd6f4, #807f849c -disabled_colors=#ffa6adc8, #ff1e1e2e, #ffa6adc8, #ff9399b2, #ff45475a, #ff6c7086, #ffa6adc8, #ffa6adc8, #ffa6adc8, #ff1e1e2e, #ff11111b, #ff7f849c, #ff89b4fa, #ff45475a, #ff89b4fa, #fff38ba8, #ff1e1e2e, #ffcdd6f4, #ff11111b, #ffcdd6f4, #807f849c -inactive_colors=#ffcdd6f4, #ff1e1e2e, #ffa6adc8, #ff9399b2, #ff45475a, #ff6c7086, #ffcdd6f4, #ffcdd6f4, #ffcdd6f4, #ff1e1e2e, #ff181825, #ff7f849c, #ff89b4fa, #ffa6adc8, #ff89b4fa, #fff38ba8, #ff1e1e2e, #ffcdd6f4, #ff11111b, #ffcdd6f4, #807f849c diff --git a/config/qt6ct/colors/Tokyo-Day.conf b/config/qt6ct/colors/Tokyo-Day.conf new file mode 100644 index 00000000..42db9c58 --- /dev/null +++ b/config/qt6ct/colors/Tokyo-Day.conf @@ -0,0 +1,4 @@ +[ColorScheme] +active_colors=#ff4c4f69, #ffe6e9ef, #ff6c6f85, #ff7c7f93, #ffbcc0cc, #ff9ca0b0, #ff4c4f69, #ff4c4f69, #ff4c4f69, #ffeff1f5, #ffe6e9ef, #ff8c8fa1, #ff1e66f5, #ffeff1f5, #ff7287fd, #ffe64553, #ffeff1f5, #ff4c4f69, #ffdce0e8, #ff4c4f69, #808c8fa1 +disabled_colors=#ff6c6f85, #ffe6e9ef, #ff6c6f85, #ff7c7f93, #ffbcc0cc, #ff9ca0b0, #ff6c6f85, #ff6c6f85, #ff6c6f85, #ffeff1f5, #ffe6e9ef, #ff8c8fa1, #ff9ca0b0, #ff5c5f77, #ff7287fd, #ffe64553, #ffeff1f5, #ff4c4f69, #ffdce0e8, #ff4c4f69, #808c8fa1 +inactive_colors=#ff4c4f69, #ffe6e9ef, #ff6c6f85, #ff7c7f93, #ffbcc0cc, #ff9ca0b0, #ff4c4f69, #ff4c4f69, #ff4c4f69, #ffeff1f5, #ffe6e9ef, #ff8c8fa1, #ffccd0da, #ff6c6f85, #ff7287fd, #ffe64553, #ffeff1f5, #ff4c4f69, #ffdce0e8, #ff4c4f69, #808c8fa1 diff --git a/config/qt6ct/qt6ct.conf b/config/qt6ct/qt6ct.conf index 6e8eb381..7ec82621 100644 --- a/config/qt6ct/qt6ct.conf +++ b/config/qt6ct/qt6ct.conf @@ -1,7 +1,7 @@ [Appearance] color_scheme_path=$HOME/.config/qt6ct/colors/Tokyo-Night.conf custom_palette=true -icon_theme=TokyoNight-SE +icon_theme=TokyoNight-Tokyonight-Dark standard_dialogs=default style=kvantum -- cgit v1.2.3 From ed3f105346d064cbc0fd45f0d34bff4d76eb502c Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Fri, 22 Dec 2023 10:50:09 +0900 Subject: The initial_boot.sh was moved towards the end of Execs.conf to avoid conflict with swww Initial_boot.sh also now includes setting of qt apps using kvantummanager Updated dark_light.sh --- config/hypr/configs/Execs.conf | 6 +++--- config/hypr/initial-boot.sh | 12 ++++++++++-- config/hypr/scripts/DarkLight.sh | 6 +++--- 3 files changed, 16 insertions(+), 8 deletions(-) (limited to 'config/hypr/scripts') diff --git a/config/hypr/configs/Execs.conf b/config/hypr/configs/Execs.conf index 76ec382b..e9f9dcdc 100644 --- a/config/hypr/configs/Execs.conf +++ b/config/hypr/configs/Execs.conf @@ -6,9 +6,6 @@ $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 @@ -34,6 +31,9 @@ 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 diff --git a/config/hypr/initial-boot.sh b/config/hypr/initial-boot.sh index 1ab8b018..a51f479b 100755 --- a/config/hypr/initial-boot.sh +++ b/config/hypr/initial-boot.sh @@ -8,6 +8,8 @@ # Variables scriptsDir=$HOME/.config/hypr/scripts wallpaper=$HOME/Pictures/wallpapers/Cute-Cat_ja.png +waybar_style="$HOME/.config/waybar/configs/[Pywal] Chroma Fusion.css" +kvantum_theme="Tokyo-Night" swww="swww img" effect="--transition-bezier .43,1.19,1,.4 --transition-fps 30 --transition-type grow --transition-pos 0.925,0.977 --transition-duration 2" @@ -16,14 +18,17 @@ effect="--transition-bezier .43,1.19,1,.4 --transition-fps 30 --transition-type if [ ! -f ~/.config/hypr/.initial_startup_done ]; then # Initialize pywal - printf " Initializing pywal........\n\n" + #printf " Initializing pywal........\n\n" wal -i $wallpaper -s -t # 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 init || swww query && $swww "$wallpaper" $effect + swww query && $swww "$wallpaper" $effect # Refreshing waybar, dunst, rofi etc. "$scriptsDir/PywalSwww.sh" > /dev/null 2>&1 & @@ -35,6 +40,9 @@ if [ ! -f ~/.config/hypr/.initial_startup_done ]; then gsettings set org.gnome.desktop.interface cursor-theme Bibata-Modern-Ice > /dev/null 2>&1 & gsettings set org.gnome.desktop.interface cursor-size 24 > /dev/null 2>&1 & + # initiate kvantum theme + kvantummanager --set "$kvantum_theme" > /dev/null 2>&1 & + # initiate the kb_layout (for some reason) waybar cant launch it "$scriptsDir/SwitchKeyboardLayout.sh" > /dev/null 2>&1 & diff --git a/config/hypr/scripts/DarkLight.sh b/config/hypr/scripts/DarkLight.sh index aed6595b..dd8f6e46 100755 --- a/config/hypr/scripts/DarkLight.sh +++ b/config/hypr/scripts/DarkLight.sh @@ -45,13 +45,13 @@ set_waybar_style() { if [ "$(cat ~/.cache/.wallpaper_mode)" = "Light" ]; then next_mode="Dark" wallpaper_path="$dark_wallpapers" - kvantum_mode="Tokyo-Night" + kvantum_theme="Tokyo-Night" qt5ct_color_scheme="$HOME/.config/qt5ct/colors/Tokyo-Night.conf" qt6ct_color_scheme="$HOME/.config/qt6ct/colors/Tokyo-Night.conf" else next_mode="Light" wallpaper_path="$light_wallpapers" - kvantum_mode="Tokyo-Day" + kvantum_theme="Tokyo-Day" qt5ct_color_scheme="$HOME/.config/qt5ct/colors/Tokyo-Day.conf" qt6ct_color_scheme="$HOME/.config/qt6ct/colors/Tokyo-Day.conf" fi @@ -72,7 +72,7 @@ fi # QT APPS Change Kvantum Manager theme & QT5CT Settings # QT Icons at below with GTK Icons -kvantummanager --set "$kvantum_mode" +kvantummanager --set "$kvantum_theme" sed -i "s|^color_scheme_path=.*$|color_scheme_path=$qt5ct_color_scheme|" "$HOME/.config/qt5ct/qt5ct.conf" sed -i "s|^color_scheme_path=.*$|color_scheme_path=$qt6ct_color_scheme|" "$HOME/.config/qt6ct/qt6ct.conf" -- cgit v1.2.3