From 327bb4e30b207df1c86cbbca191aba6e1bb4fb36 Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Wed, 6 Dec 2023 22:23:37 +0900 Subject: Bump to 2.1.17. Changes: Change initial boot behaviour... Forcing a single wallpaper to load initially. (Will change every major release :) Script will now detect if desktop or any other machines and will symlink the proper waybar layout --- config/hypr/initial-boot.sh | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) mode change 100644 => 100755 config/hypr/initial-boot.sh (limited to 'config/hypr/initial-boot.sh') diff --git a/config/hypr/initial-boot.sh b/config/hypr/initial-boot.sh old mode 100644 new mode 100755 index d5ce3233..ba07fed5 --- a/config/hypr/initial-boot.sh +++ b/config/hypr/initial-boot.sh @@ -1,27 +1,28 @@ #!/bin/bash -# THIS SCRIPT CAN BE DELETED ONCE BOOTED!! - # A bash script designed to ran it only once dotfiles installed + +# THIS SCRIPT CAN BE DELETED ONCE SUCCESSFULLY BOOTED!! And also, edit ~/.config/hypr/configs/Execs.conf +# not necessary to do since this script is only designed to ran only once as long as the marker exist + +# Set swww options +wallpaper=$HOME/Pictures/wallpapers/mecha-nostalgia.png + +swww="swww img" +effect="--transition-bezier .43,1.19,1,.4 --transition-fps 60 --transition-type grow --transition-pos 0.925,0.977 --transition-duration 2" + # Check if a marker file exists. if [ ! -f ~/.config/hypr/.initial_startup_done ]; then - # Check if the ~/.cache/wal directory exists - if [ ! -d ~/.cache/wal ]; then - printf " Initializing pywal........\n\n" - # Check if the ~/Pictures/wallpapers directory exists - if [ -d ~/Pictures/wallpapers ]; then - # Run wal with random wallpapers from ~/Pictures/wallpapers - wal -i ~/Pictures/wallpapers/mecha-nostalgia.png - echo "Pywal initialized" - fi - fi + # Initialize pywal + printf " Initializing pywal........\n\n" + wal -i $wallpaper #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 scripts to load inorder to have a proper wallpaper waybar and pywal themes - exec $HOME/.config/hypr/scripts/Wallpaper.sh & + swww query || swww init && $swww $wallpaper $effect # Create a marker file to indicate that the script has been executed. touch ~/.config/hypr/.initial_startup_done -- cgit v1.2.3 From 86733c1873f9a6e227a2ae7a85c3371fc0b0625f Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Thu, 7 Dec 2023 11:21:34 +0900 Subject: added initial wallpaper --- config/hypr/initial-boot.sh | 2 +- copy.sh | 2 +- wallpapers/anime-girl-abyss.png | Bin 0 -> 2931296 bytes 3 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 wallpapers/anime-girl-abyss.png (limited to 'config/hypr/initial-boot.sh') diff --git a/config/hypr/initial-boot.sh b/config/hypr/initial-boot.sh index ba07fed5..cfadfcc4 100755 --- a/config/hypr/initial-boot.sh +++ b/config/hypr/initial-boot.sh @@ -6,7 +6,7 @@ # not necessary to do since this script is only designed to ran only once as long as the marker exist # Set swww options -wallpaper=$HOME/Pictures/wallpapers/mecha-nostalgia.png +wallpaper=$HOME/Pictures/wallpapers/anime-girl-abyss.png swww="swww img" effect="--transition-bezier .43,1.19,1,.4 --transition-fps 60 --transition-type grow --transition-pos 0.925,0.977 --transition-duration 2" diff --git a/copy.sh b/copy.sh index 7f29b34e..bb5e7691 100755 --- a/copy.sh +++ b/copy.sh @@ -221,7 +221,7 @@ fi ln -sf "$HOME/.config/waybar/style/Golden Noir.css" "$HOME/.config/waybar/style.css" && \ # initialize pywal to avoid config error on hyprland -wal -i ~/Pictures/wallpapers/mecha-nostalgia.png 2>&1 | tee -a "$LOG" +wal -i ~/Pictures/wallpapers/anime-girl-abyss.png 2>&1 | tee -a "$LOG" #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" diff --git a/wallpapers/anime-girl-abyss.png b/wallpapers/anime-girl-abyss.png new file mode 100644 index 00000000..6871f0e7 Binary files /dev/null and b/wallpapers/anime-girl-abyss.png differ -- cgit v1.2.3 From abb68d82a2a839438a3de19b377084ae9796bf42 Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Thu, 7 Dec 2023 14:29:10 +0900 Subject: updated initial boot and kb layout switch --- config/hypr/initial-boot.sh | 36 ++++++++++++++++++----------- config/hypr/scripts/SwitchKeyboardLayout.sh | 18 +++++++++++---- config/waybar/modules | 8 +++---- 3 files changed, 39 insertions(+), 23 deletions(-) (limited to 'config/hypr/initial-boot.sh') diff --git a/config/hypr/initial-boot.sh b/config/hypr/initial-boot.sh index cfadfcc4..797f49cb 100755 --- a/config/hypr/initial-boot.sh +++ b/config/hypr/initial-boot.sh @@ -1,11 +1,12 @@ #!/bin/bash -# A bash script designed to ran it only once dotfiles installed +# A bash script designed to run only once dotfiles installed # THIS SCRIPT CAN BE DELETED ONCE SUCCESSFULLY BOOTED!! And also, edit ~/.config/hypr/configs/Execs.conf -# not necessary to do since this script is only designed to ran only once as long as the marker exist +# not necessary to do since this script is only designed to run only once as long as the marker exists -# Set swww options +# Variables +scriptsDir=$HOME/.config/hypr/scripts wallpaper=$HOME/Pictures/wallpapers/anime-girl-abyss.png swww="swww img" @@ -14,18 +15,25 @@ effect="--transition-bezier .43,1.19,1,.4 --transition-fps 60 --transition-type # Check if a marker file exists. if [ ! -f ~/.config/hypr/.initial_startup_done ]; then - # Initialize pywal - printf " Initializing pywal........\n\n" - wal -i $wallpaper + # Initialize pywal + printf " Initializing pywal........\n\n" + wal -i "$wallpaper" + + # 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 scripts to load in order to have a proper wallpaper waybar and pywal themes + pkill swww && swww init || swww query && $swww "$wallpaper" $effect + + # Refreshing waybar, dunst, rofi etc. + "$scriptsDir/PywalSwww.sh" > /dev/null 2>&1 & + "$scriptsDir/Refresh.sh" > /dev/null 2>&1 & + + # initiate the kb_layout (for some reason) waybar cant launch it + "$scriptsDir/SwitchKeyboardLayout.sh" > /dev/null 2>&1 & - #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 scripts to load inorder to have a proper wallpaper waybar and pywal themes - swww query || swww init && $swww $wallpaper $effect - # Create a marker file to indicate that the script has been executed. touch ~/.config/hypr/.initial_startup_done -fi - + exit +fi diff --git a/config/hypr/scripts/SwitchKeyboardLayout.sh b/config/hypr/scripts/SwitchKeyboardLayout.sh index 40b212f0..e7c56b42 100755 --- a/config/hypr/scripts/SwitchKeyboardLayout.sh +++ b/config/hypr/scripts/SwitchKeyboardLayout.sh @@ -1,13 +1,21 @@ -#!/bin/bash +#!/usr/bin/env bash + +layout_f="$HOME/.cache/kb_layout" +settings_file="$HOME/.config/hypr/configs/Settings.conf" + +# Check if ~/.cache/kb_layout exists and create it with a default layout from Settings.conf if not found +if [ ! -f "$layout_f" ]; then + default_layout=$(grep 'kb_layout=' "$settings_file" | cut -d '=' -f 2 | cut -d ',' -f 1 2>/dev/null) + if [ -z "$default_layout" ]; then + default_layout="us" # Default to 'us' layout if Settings.conf or 'kb_layout' is not found + fi + echo "$default_layout" > "$layout_f" +fi -layout_f="/tmp/kb_layout" current_layout=$(cat "$layout_f") # Read keyboard layout settings from Settings.conf -settings_file="$HOME/.config/hypr/configs/Settings.conf" - if [ -f "$settings_file" ]; then - # Extract the value of kb_layout from Settings.conf kb_layout_line=$(grep 'kb_layout=' "$settings_file" | cut -d '=' -f 2) IFS=',' read -ra layout_mapping <<< "$kb_layout_line" fi diff --git a/config/waybar/modules b/config/waybar/modules index fa989045..5e90530b 100644 --- a/config/waybar/modules +++ b/config/waybar/modules @@ -459,11 +459,11 @@ }, "custom/keyboard": { - "exec": "cat /tmp/kb_layout", - "interval": 3, + "exec": "cat ~/.cache/kb_layout", + "interval": 1, "format": " {}", - "on-click": "~/.config/hypr/scripts/SwitchKeyboardLayout.sh", - "tooltip": false, + "on-click": "~/.config/hypr/scripts/SwitchKeyboardLayout.sh", + "tooltip": false, }, "custom/light_dark": { -- cgit v1.2.3