Browse Source

Merge pull request #81 from JaKooLit/Development

Development
pull/82/head^2
Ja.KooLit 2 years ago committed by GitHub
parent
commit
9cede52e09
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 8
      config/hypr/configs/Execs.conf
  2. 2
      config/hypr/configs/Settings.conf
  3. 20
      config/hypr/configs/WindowRules.conf
  4. 2
      config/hypr/initial-boot.sh
  5. 2
      config/hypr/scripts/AirplaneMode.sh
  6. 2
      config/hypr/scripts/ChangeBlur.sh
  7. 4
      config/hypr/scripts/GameMode.sh
  8. 4
      config/hypr/scripts/SwitchKeyboardLayout.sh
  9. 4
      config/hypr/scripts/Volume.sh
  10. 2
      config/waybar/modules
  11. 29
      copy.sh

8
config/hypr/configs/Execs.conf

@ -10,7 +10,8 @@ $WallpaperPath = $HOME/Pictures/wallpapers
exec-once = $HOME/.config/hypr/initial-boot.sh
# wallpaper stuff / More wallpaper options below
exec-once = swww query || swww init
exec-once = swww query || swww init
exec-once = $SwwwRandom $WallpaperPath # random wallpaper switcher every 30 minutes
# Startup
exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
@ -22,7 +23,7 @@ exec-once = $scriptsDir/Polkit.sh
# starup apps
exec-once = waybar &
exec-once = dunst &
exec-once = blueman-applet &
#exec-once = blueman-applet &
exec-once = nm-applet --indicator &
#exec-once = rog-control-center &
@ -40,10 +41,7 @@ exec-once = swayidle -w timeout 900 '$lock'
# sway idle without lock
#exec-once = swayidle -w timeout 900 'hyprctl dispatch dpms off' resume 'hyprctl dispatch dpms on'
## Here are list of features available but disabled by default
#exec-once = $SwwwRandom $WallpaperPath # random wallpaper switcher every 30 minutes
#exec-once = swww query || swww init && swww img $HOME/Pictures/wallpapers/mecha-nostalgia.png # persistent wallpaper
#gnome polkit for nixos

2
config/hypr/configs/Settings.conf

@ -59,7 +59,7 @@ decoration {
blur {
enabled = true
size = 6
size = 5
passes = 2
ignore_opacity = true
new_optimizations = true

20
config/hypr/configs/WindowRules.conf

@ -1,7 +1,6 @@
## /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ ##
# See https://wiki.hyprland.org/Configuring/Window-Rules/ for more
windowrule = float, org.kde.polkit-kde-authentication-agent-1
windowrule = float, nm-connection-editor|blueman-manager
windowrule = float, pavucontrol
@ -17,12 +16,9 @@ windowrule = float, yad
#windowrule = fullscreen,gamescope
#windowrule = workspace 6 silent,^(gamescope)$
# windowrule = move 1380 495,^(pavucontrol) # Make sure to change these valuers
windowrule = center,^(pavucontrol) # Make sure to delete this line if uncommen the line above
#windowrule = size 533 533,^(pavucontrol) # These are optionals. But recommended
windowrule = center,^(pavucontrol)
# windowrule v2
windowrulev2 = workspace 1, class:^(thunderbird)$
windowrulev2 = workspace 2, class:^(firefox)$
windowrulev2 = workspace 2, class:^(Firefox-esr)$
@ -38,15 +34,15 @@ windowrulev2 = workspace 9 silent, class:^(audacious)$
#opacity (transparent) #enable as desired
windowrulev2 = opacity 0.9 0.6, class:^([Rr]ofi)$
windowrulev2 = opacity 0.9 0.7, class:^(firefox)$
windowrulev2 = opacity 0.9 0.8, class:^([Tt]hunar)$
windowrulev2 = opacity 0.9 0.6, class:^(firefox)$
windowrulev2 = opacity 0.9 0.7, class:^([Tt]hunar)$
windowrulev2 = opacity 0.8 0.6, class:^(pcmanfm-qt)$
windowrulev2 = opacity 0.9 0.7, class:^(gedit)$
windowrulev2 = opacity 0.9 0.8, class:^(kitty)$
#windowrulev2 = opacity 0.9 0.7, class:^(mousepad)$
windowrulev2 = opacity 0.9 0.7, class:^(codium-url-handler)$
windowrulev2 = opacity 0.9 0.7, class:^(VSCodium)$
windowrulev2 = opacity 0.9 0.7, class:^(yad)$
windowrulev2 = opacity 0.9 0.7, class:^(kitty)$
windowrulev2 = opacity 0.9 0.6, class:^(mousepad)$
windowrulev2 = opacity 0.9 0.6, class:^(codium-url-handler)$
windowrulev2 = opacity 0.9 0.6, class:^(VSCodium)$
windowrulev2 = opacity 0.9 0.6, class:^(yad)$
#layerrule = unset,class:^([Rr]ofi)$
#layerrule = blur,class:^([Rr]ofi)$

2
config/hypr/initial-boot.sh

@ -17,7 +17,7 @@ if [ ! -f ~/.config/hypr/.initial_startup_done ]; then
# Initialize pywal
printf " Initializing pywal........\n\n"
wal -i "$wallpaper"
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"

2
config/hypr/scripts/AirplaneMode.sh

@ -1,6 +1,6 @@
#!/bin/bash
dunstify -u low -i "$dunst_notif"
dunst_notif="$HOME/.config/dunst/images/bell.png"
wifi="$(nmcli r wifi | awk 'FNR = 2 {print $1}')"
if [ "$wifi" == "enabled" ]; then

2
config/hypr/scripts/ChangeBlur.sh

@ -9,7 +9,7 @@ if [ "${STATE}" == "2" ]; then
hyprctl keyword decoration:blur:passes 1
dunstify -u low -i "$dunst_notif" "Less blur"
else
hyprctl keyword decoration:blur:size 6
hyprctl keyword decoration:blur:size 5
hyprctl keyword decoration:blur:passes 2
dunstify -u low -i "$dunst_notif" "Normal blur"
fi

4
config/hypr/scripts/GameMode.sh

@ -19,9 +19,11 @@ if [ "$HYPRGAMEMODE" = 1 ] ; then
exit
else
swww init && swww img "$HOME/.config/rofi/.current_wallpaper"
sleep 0.1
${SCRIPTSDIR}/PywalSwww.sh
sleep 0.5
${SCRIPTSDIR}/Refresh.sh
dunstify -u low -i "$dunst_notif" "gamemode disabled. All animations normal"
dunstify -u normal -i "$dunst_notif" "gamemode disabled. All animations normal"
exit
fi
hyprctl reload

4
config/hypr/scripts/SwitchKeyboardLayout.sh

@ -2,6 +2,7 @@
layout_f="$HOME/.cache/kb_layout"
settings_file="$HOME/.config/hypr/configs/Settings.conf"
dunst_notif="$HOME/.config/dunst/images/bell.png"
# Check if ~/.cache/kb_layout exists and create it with a default layout from Settings.conf if not found
if [ ! -f "$layout_f" ]; then
@ -37,3 +38,6 @@ new_layout="${layout_mapping[next_index]}"
# Update the keyboard layout
hyprctl keyword input:kb_layout "$new_layout"
echo "$new_layout" > "$layout_f"
# Notification for the new keyboard layout
dunstify -u low -i "$dunst_notif" "Keyboard layout set to $new_layout"

4
config/hypr/scripts/Volume.sh

@ -29,9 +29,9 @@ get_icon() {
# Notify
notify_user() {
if [[ "$(get_volume)" == "Muted" ]]; then
dunstify -h string:x-dunst-stack-tag:volume_notif -u low -i "$(get_icon)" "Volume : Muted"
dunstify -h string:x-dunst-stack-tag:volume_notif -u low -i "$(get_icon)" "Volume: Muted"
else
dunstify -h int:value:"$(get_volume | sed 's/%//')" -h string:x-dunst-stack-tag:volume_notif -u low -i "$(get_icon)" "Volume : $(get_volume)"
dunstify -h int:value:"$(get_volume | sed 's/%//')" -h string:x-dunst-stack-tag:volume_notif -u low -i "$(get_icon)" "Volume: $(get_volume)"
fi
}

2
config/waybar/modules

@ -402,7 +402,7 @@
},
"pulseaudio": {
"format": "{icon}",
"format": "{icon} {volume}%",
"format-bluetooth": "{icon} 󰂰 {volume}%",
"format-muted": "󰖁",
"format-icons": {

29
copy.sh

@ -2,6 +2,8 @@
### https://github.com/JaKooLit/JaKooLit
wallpaper=$HOME/Pictures/wallpapers/CuteCat.png
# Check if running as root. If root, script will exit
if [[ $EUID -eq 0 ]]; then
echo "This script should not be executed as root! Exiting......."
@ -97,8 +99,13 @@ if [ "$confirm" = "y" ]; then
mv temp.conf config/hypr/configs/Settings.conf
else
# If the detected layout is not correct, prompt the user to enter the correct layout
printf "${YELLOW} Ensure to type in the proper keyboard layout else Hyprland will crash and might not start!!!\n\n"
printf "${WARN} - Sample Keyboard layouts are us, kr, es, gb, de, pl, etc.\n\n"
printf "\n%.0s" {1..2}
echo "$(tput bold)$(tput setaf 3)ATTENTION!!!! VERY IMPORTANT!!!! $(tput sgr0)"
echo "$(tput bold)$(tput setaf 7)Setting a wrong value here will result in Hyprland not starting $(tput sgr0)"
echo "$(tput bold)$(tput setaf 7)If you are not sure, keep it in us layout. You can change later on! $(tput sgr0)"
echo "$(tput bold)$(tput setaf 7)You can also set more than 2 layouts!$(tput sgr0)"
echo "$(tput bold)$(tput setaf 7)ie: us,kr,es $(tput sgr0)"
printf "\n%.0s" {1..2}
read -p "${CAT} - Please enter the correct keyboard layout: " new_layout
# Update the 'kb_layout=' line with the correct layout in the file
awk -v new_layout="$new_layout" '/kb_layout/ {$0 = " kb_layout=" new_layout} 1' config/hypr/configs/Settings.conf > temp.conf
@ -162,6 +169,8 @@ printf "${NOTE} - copying dotfiles\n"
fi
done
printf "\n%.0s" {1..2}
# Copying config files
printf " Copying config files...\n"
mkdir -p ~/.config
@ -188,19 +197,22 @@ while true; do
case $WALL in
[Yy])
echo "${NOTE} Downloading additional wallpapers..."
if git clone https://github.com/JaKooLit/Wallpaper-Bank.git 2>&1 | tee -a "$LOG"; then
if cp -R Wallpaper-Bank/wallpapers/* ~/Pictures/wallpapers/; then 2>&1 | tee -a "$LOG"
if git clone --progress "https://github.com/JaKooLit/Wallpaper-Bank.git" 2>&1 | tee -a "$LOG"; then
echo "${NOTE} Wallpapers downloaded successfully."
if cp -R Wallpaper-Bank/wallpapers/* ~/Pictures/wallpapers/ 2>&1 | tee -a "$LOG"; then
echo "${NOTE} Wallpapers copied successfully."
rm -rf Wallpaper-Bank 2>&1 | tee -a "$LOG" # Remove cloned repository after copying wallpapers
break
else
echo "${ERROR} Copying wallpapers failed" 2>&1 | tee -a "$LOG"
echo "${ERROR} Copying wallpapers failed" >&2 | tee -a "$LOG"
fi
else
echo "${ERROR} Downloading additional wallpapers failed" 2>&1 | tee -a "$LOG"
echo "${ERROR} Downloading additional wallpapers failed" >&2 | tee -a "$LOG"
fi
;;
[Nn])
echo "You chose not to download additional wallpapers." 2>&1 | tee -a "$LOG"
echo "You chose not to download additional wallpapers." >&2 | tee -a "$LOG"
break
;;
*)
@ -222,12 +234,11 @@ else
rm -r "$HOME/.config/waybar/configs/[TOP] Default" "$HOME/.config/waybar/configs/[BOT] Default" 2>&1 | tee -a "$LOG"
fi
# symlinks for waybar style
ln -sf "$HOME/.config/waybar/style/[Pywal] Chroma Fusion.css" "$HOME/.config/waybar/style.css" && \
# initialize pywal to avoid config error on hyprland
wal -i ~/Pictures/wallpapers/anime-girl-abyss.png 2>&1 | tee -a "$LOG"
wal -i $wallpaper -s -t 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"

Loading…
Cancel
Save