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 ++++++------- config/hypr/v2.1.16 | 5 --- config/hypr/v2.1.17 | 5 +++ config/waybar/configs/Def[Bottom]-Laptop | 66 ++++++++++++++++++++++++++++++++ config/waybar/configs/Def[TOP]-Laptop | 66 ++++++++++++++++++++++++++++++++ config/waybar/configs/Default [Bottom] | 5 --- config/waybar/configs/Default [TOP] | 5 --- copy.sh | 22 +++++++++-- 8 files changed, 169 insertions(+), 32 deletions(-) mode change 100644 => 100755 config/hypr/initial-boot.sh delete mode 100644 config/hypr/v2.1.16 create mode 100644 config/hypr/v2.1.17 create mode 100644 config/waybar/configs/Def[Bottom]-Laptop create mode 100644 config/waybar/configs/Def[TOP]-Laptop 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 diff --git a/config/hypr/v2.1.16 b/config/hypr/v2.1.16 deleted file mode 100644 index 31b3414d..00000000 --- a/config/hypr/v2.1.16 +++ /dev/null @@ -1,5 +0,0 @@ -### https://github.com/JaKooLit ### -## https://github.com/JaKooLit/Hyprland-Dots -## This is to have a reference of which version would be - -## note that this will always be higher than the released versions \ No newline at end of file diff --git a/config/hypr/v2.1.17 b/config/hypr/v2.1.17 new file mode 100644 index 00000000..31b3414d --- /dev/null +++ b/config/hypr/v2.1.17 @@ -0,0 +1,5 @@ +### https://github.com/JaKooLit ### +## https://github.com/JaKooLit/Hyprland-Dots +## This is to have a reference of which version would be + +## note that this will always be higher than the released versions \ No newline at end of file diff --git a/config/waybar/configs/Def[Bottom]-Laptop b/config/waybar/configs/Def[Bottom]-Laptop new file mode 100644 index 00000000..8bf8ecd1 --- /dev/null +++ b/config/waybar/configs/Def[Bottom]-Laptop @@ -0,0 +1,66 @@ +/* ---- 💫 https://github.com/JaKooLit 💫 ---- */ + +// ### DEFAULT ### // +{ +"include": "~/.config/waybar/modules", +"layer": "top", +//"mode": "dock", +"exclusive": true, +"passthrough": false, +"position": "bottom", +"spacing": 3, +"fixed-center": true, +"ipc": true, +//"margin-top": 6, +"margin-left": 8, +"margin-right": 8, + +"modules-left": [ + "hyprland/workspaces#pacman", + "custom/separator#dot-line", + "cpu", + "custom/separator#dot-line", + "temperature", + "custom/separator#dot-line", + "memory", + "custom/separator#dot-line", + "custom/weather", + ], + +"modules-center": [ + "custom/menu", + "custom/separator#dot-line", + "idle_inhibitor", + "custom/separator#dot-line", + "clock", + "custom/separator#dot-line", + "custom/light_dark", + "custom/separator#dot-line", + "custom/lock", + //], + "custom/separator#dot-line", + "custom/keybinds", + ], + +"modules-right": [ + //"hyprland/window", + "tray", + "custom/separator#dot-line", + "bluetooth", + "custom/separator#dot-line", + "network#speed", + "custom/separator#dot-line", + "battery", + "custom/separator#dot-line", + "backlight", + "custom/separator#dot-line", + "pulseaudio", + "custom/separator#dot-line", + //"wireplumber", + "pulseaudio#microphone", + "custom/separator#dot-line", + "keyboard-state", + "custom/separator#dot-line", + "custom/power", + ], +} diff --git a/config/waybar/configs/Def[TOP]-Laptop b/config/waybar/configs/Def[TOP]-Laptop new file mode 100644 index 00000000..eabaf37e --- /dev/null +++ b/config/waybar/configs/Def[TOP]-Laptop @@ -0,0 +1,66 @@ +/* ---- 💫 https://github.com/JaKooLit 💫 ---- */ + +// ### DEFAULT ### // +{ +"include": "~/.config/waybar/modules", +"layer": "top", +//"mode": "dock", +"exclusive": true, +"passthrough": false, +"position": "top", +"spacing": 3, +"fixed-center": true, +"ipc": true, +"margin-top": 3, +"margin-left": 8, +"margin-right": 8, + +"modules-left": [ + "hyprland/workspaces#pacman", + "custom/separator#dot-line", + "cpu", + "custom/separator#dot-line", + "temperature", + "custom/separator#dot-line", + "memory", + "custom/separator#dot-line", + "custom/weather", + ], + +"modules-center": [ + "custom/menu", + "custom/separator#dot-line", + "idle_inhibitor", + "custom/separator#dot-line", + "clock", + "custom/separator#dot-line", + "custom/light_dark", + "custom/separator#dot-line", + "custom/lock", + //], + "custom/separator#dot-line", + "custom/keybinds", + ], + +"modules-right": [ + //"hyprland/window", + "tray", + "custom/separator#dot-line", + "bluetooth", + "custom/separator#dot-line", + "network#speed", + "custom/separator#dot-line", + "battery", + "custom/separator#dot-line", + "backlight", + "custom/separator#dot-line", + "pulseaudio", + "custom/separator#dot-line", + //"wireplumber", + "pulseaudio#microphone", + "custom/separator#dot-line", + "keyboard-state", + "custom/separator#dot-line", + "custom/power", + ], +} \ No newline at end of file diff --git a/config/waybar/configs/Default [Bottom] b/config/waybar/configs/Default [Bottom] index 8bf8ecd1..6c37a22f 100644 --- a/config/waybar/configs/Default [Bottom] +++ b/config/waybar/configs/Default [Bottom] @@ -50,13 +50,8 @@ "custom/separator#dot-line", "network#speed", "custom/separator#dot-line", - "battery", - "custom/separator#dot-line", - "backlight", - "custom/separator#dot-line", "pulseaudio", "custom/separator#dot-line", - //"wireplumber", "pulseaudio#microphone", "custom/separator#dot-line", "keyboard-state", diff --git a/config/waybar/configs/Default [TOP] b/config/waybar/configs/Default [TOP] index eabaf37e..edc14094 100644 --- a/config/waybar/configs/Default [TOP] +++ b/config/waybar/configs/Default [TOP] @@ -50,13 +50,8 @@ "custom/separator#dot-line", "network#speed", "custom/separator#dot-line", - "battery", - "custom/separator#dot-line", - "backlight", - "custom/separator#dot-line", "pulseaudio", "custom/separator#dot-line", - //"wireplumber", "pulseaudio#microphone", "custom/separator#dot-line", "keyboard-state", diff --git a/copy.sh b/copy.sh index 2efc116a..7f29b34e 100755 --- a/copy.sh +++ b/copy.sh @@ -173,10 +173,7 @@ cp -r config/* ~/.config/ && { echo "${OK}Copy completed!"; } || { echo "${ERROR mkdir -p ~/Pictures/wallpapers cp -r wallpapers ~/Pictures/ && { echo "${OK}Copy completed!"; } || { echo "${ERROR} Failed to copy wallpapers."; exit 1; } 2>&1 | tee -a "$LOG" -# Initial Symlinks to avoid errors -# symlinks for waybar -ln -sf "$HOME/.config/waybar/configs/Default [TOP]" "$HOME/.config/waybar/config" && \ -ln -sf "$HOME/.config/waybar/style/Golden Noir.css" "$HOME/.config/waybar/style.css" && \ + # Set some files as executable @@ -206,6 +203,23 @@ if [[ $WALL =~ ^[Yy]$ ]]; then fi fi +# Initial Symlinks to avoid errors + +# Detect machine type and set Waybar configurations accordingly, logging the output +if hostnamectl | grep -q 'Chassis: desktop'; then + # Configurations for a desktop + ln -sf "$HOME/.config/waybar/configs/Default [TOP]" "$HOME/.config/waybar/config" 2>&1 | tee -a "$LOG" + rm -r "$HOME/.config/waybar/configs/Def[TOP]-Laptop" "$HOME/.config/waybar/configs/Def[Bottom]-Laptop" 2>&1 | tee -a "$LOG" +else + # Configurations for a laptop or any system other than desktop + ln -sf "$HOME/.config/waybar/configs/Def[TOP]-Laptop" "$HOME/.config/waybar/config" 2>&1 | tee -a "$LOG" + rm -r "$HOME/.config/waybar/configs/Default [TOP]" "$HOME/.config/waybar/configs/Default [Bottom]" 2>&1 | tee -a "$LOG" +fi + + +# symlinks for waybar style +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" -- cgit v1.2.3