Merge pull request #190 from JaKooLit/main

main to development
This commit is contained in:
Ja.KooLit 2025-03-15 17:29:32 +09:00 committed by GitHub
commit aa48b824d2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
26 changed files with 132 additions and 139 deletions

1
.github/ISSUE_TEMPLATE/config.yml vendored Normal file
View File

@ -0,0 +1 @@
blank_issues_enabled: false

View File

@ -2,6 +2,7 @@
## 11 March 2025
- Added uninstall script
- forked AGS v1 into JakooLit repo. This is just incase Aylur decide to take down v1
## 10 March 2025
- Dropped pyprland in favor of hyprland built in tool for a drop down like terminal and Desktop magnifier

View File

@ -67,4 +67,4 @@ Thank you for your interest in contributing to Community Standards! We welcome a
## Contact
If you have any questions, feel free to contact via [GitHub Discussions](https://github.com/JaKooLit/Debian-Hyprland/discussions) or [Through Discord Server](https://discord.gg/V2SJ92vbEN)
If you have any questions, feel free to contact via [GitHub Discussions](https://github.com/JaKooLit/Debian-Hyprland/discussions) or [Through Discord Server](https://discord.gg/kool-tech-world)

View File

@ -7,7 +7,7 @@
<img src="https://raw.githubusercontent.com/JaKooLit/Hyprland-Dots/main/assets/latte.png" width="400" />
</p>
![GitHub Repo stars](https://img.shields.io/github/stars/JaKooLit/Debian-Hyprland?style=for-the-badge&color=cba6f7) ![GitHub last commit](https://img.shields.io/github/last-commit/JaKooLit/Debian-Hyprland?style=for-the-badge&color=b4befe) ![GitHub repo size](https://img.shields.io/github/repo-size/JaKooLit/Debian-Hyprland?style=for-the-badge&color=cba6f7) <a href="https://discord.gg/9JEgZsfhex"> <img src="https://img.shields.io/discord/1151869464405606400?style=for-the-badge&logo=discord&color=cba6f7&link=https%3A%2F%2Fdiscord.gg%9JEgZsfhex"> </a>
![GitHub Repo stars](https://img.shields.io/github/stars/JaKooLit/Debian-Hyprland?style=for-the-badge&color=cba6f7) ![GitHub last commit](https://img.shields.io/github/last-commit/JaKooLit/Debian-Hyprland?style=for-the-badge&color=b4befe) ![GitHub repo size](https://img.shields.io/github/repo-size/JaKooLit/Debian-Hyprland?style=for-the-badge&color=cba6f7) <a href="https://discord.gg/kool-tech-world"> <img src="https://img.shields.io/discord/1151869464405606400?style=for-the-badge&logo=discord&color=cba6f7&link=https%3A%2F%2Fdiscord.gg%kool-tech-world"> </a>
<br/>
</div>
@ -34,7 +34,7 @@
<a href="https://github.com/JaKooLit/Hyprland-Dots/wiki"><kbd><br>Wiki<br></kbd></a>&ensp;&ensp;
<a href="https://github.com/JaKooLit/Hyprland-Dots/wiki/Keybinds"><kbd><br>Keybinds<br></kbd></a>&ensp;&ensp;
<a href="https://github.com/JaKooLit/Hyprland-Dots/wiki/FAQ"><kbd><br>FAQ<br></kbd></a>&ensp;&ensp;
<a href="https://discord.gg/9JEgZsfhex"><kbd><br>Discord<br></kbd></a>
<a href="https://discord.gg/kool-tech-world"><kbd><br>Discord<br></kbd></a>
</div><br>
<p align="center">
@ -271,7 +271,7 @@ cd ~/Debian-Hyprland
#### 📒 Final Notes
- join my discord channel [`Discord`](https://discord.com/invite/9JEgZsfhex)
- join my discord channel [`Discord`](https://discord.com/invite/kool-tech-world)
- Feel free to copy, re-distribute, and use this script however you want. Would appreciate if you give me some loves by crediting my work :)

View File

@ -22,7 +22,7 @@ source $ZSH/oh-my-zsh.sh
# fastfetch. Will be disabled if above colorscript was chosen to install
fastfetch -c $HOME/.config/fastfetch/config-compact.jsonc
# Set-up icons for files/folders in terminal using lsd
# Set-up icons for files/directories in terminal using lsd
alias ls='lsd'
alias l='ls -l'
alias la='ls -a'

View File

@ -1,6 +1,8 @@
#!/bin/bash
# 💫 https://github.com/JaKooLit 💫 #
# main dependencies #
# 22 Aug 2024 - NOTE will trim this more down
# packages neeeded
dependencies=(
@ -16,31 +18,8 @@ dependencies=(
golang
hwdata
jq
libmpdclient-dev
libnl-3-dev
libasound2-dev
libstartup-notification0-dev
libwayland-client++1
libwayland-dev
libcairo-5c-dev
libcairo2-dev
libsdbus-c++-bin
libegl-dev
libegl1-mesa-dev
libpango1.0-dev
libgdk-pixbuf-2.0-dev
libxcb-keysyms1-dev
libwayland-client0
libxcb-ewmh-dev
libxcb-cursor-dev
libxcb-icccm4-dev
libxcb-randr0-dev
libxcb-render-util0-dev
libxcb-util-dev
libxcb-xkb-dev
libxcb-xinerama0-dev
libxkbcommon-dev
libxkbcommon-x11-dev
meson
ninja-build
openssl
@ -52,12 +31,27 @@ dependencies=(
python3-pyquery
qt6-base-dev
spirv-tools
#vulkan-validationlayers
unzip
vulkan-validationlayers
vulkan-utility-libraries-dev
wayland-protocols
xdg-desktop-portal
xwayland
)
# hyprland dependencies
hyprland_dep=(
bc
binutils
libc6
libcairo2
libdisplay-info2
libdrm2
libhyprcursor-dev
libhyprlang-dev
libhyprutils-dev
libpam0g-dev
hyprcursor-util
)
build_dep=(
@ -83,9 +77,8 @@ LOG="Install-Logs/install-$(date +%d-%H%M%S)_dependencies.log"
# Installation of main dependencies
printf "\n%s - Installing ${SKY_BLUE}main dependencies....${RESET} \n" "${NOTE}"
for PKG in "${dependencies[@]}"; do
install_package "$PKG" "$LOG"
for PKG1 in "${dependencies[@]}" "${hyprland_dep[@]}"; do
install_package "$PKG1" "$LOG"
done
printf "\n%.0s" {1..1}

View File

@ -10,7 +10,7 @@ Extra=(
)
# packages neeeded
# packages needed
hypr_package=(
cliphist
grim
@ -23,7 +23,6 @@ hypr_package=(
pavucontrol
playerctl
polkit-kde-agent-1
pkexec
python3-requests
python3-pip
qt5ct
@ -31,9 +30,9 @@ hypr_package=(
qt5-style-kvantum-themes
qt6ct
slurp
sway-notification-center
swappy
unzip # required later
sway-notification-center
unzip
waybar
wget
wl-clipboard
@ -48,19 +47,25 @@ hypr_package_2=(
brightnessctl
btop
cava
loupe
nwg-look
nwg-displays
fastfetch
loupe
gnome-system-monitor
mousepad
mpv
mpv-mpris
nwg-look
nwg-displays
nvtop
pamixer
qalculate-gtk
)
# packages to force reinstall
force=(
imagemagick
wayland-protocols
)
# List of packages to uninstall as it conflicts with swaync or causing swaync to not function properly
uninstall=(
dunst
@ -69,11 +74,6 @@ uninstall=(
cargo
)
# List packages to force reinstall
force=(
yad
)
## WARNING: DO NOT EDIT BEYOND THIS LINE IF YOU DON'T KNOW WHAT YOU ARE DOING! ##
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
@ -106,7 +106,6 @@ fi
printf "\n%.0s" {1..1}
# Installation of main components
printf "\n%s - Installing ${SKY_BLUE}KooL's hyprland necessary packages${RESET} .... \n" "${NOTE}"
@ -114,12 +113,13 @@ for PKG1 in "${hypr_package[@]}" "${hypr_package_2[@]}" "${Extra[@]}"; do
install_package "$PKG1" "$LOG"
done
printf "\n%.0s" {1..1}
for PKG2 in "${force[@]}"; do
re_install_package "$PKG2" "$LOG"
done
printf "\n%.0s" {1..1}
# install YAD from assets. NOTE This is downloaded from SID repo and sometimes
# Trixie is removing YAD for some strange reasons
# Check if yad is installed

View File

@ -3,7 +3,7 @@
# This script is cleaning up previous manual installation files / directories
# 22 Aug 2024
# Files to be removed rom /usr/local/bin
# Files to be removed from /usr/local/bin
TARGET_DIR="/usr/local/bin"
@ -46,7 +46,9 @@ for PKG_NAME in "${PACKAGES[@]}"; do
# Delete the file
sudo rm "$FILE_PATH"
echo "Deleted: $FILE_PATH" 2>&1 | tee -a "$LOG"
else
echo "File not found: $FILE_PATH" 2>&1 | tee -a "$LOG"
fi
done
printf "\n%.0s" {1..2}
clear

View File

@ -77,7 +77,7 @@ done
# Log missing packages
if [ ${#missing[@]} -eq 0 ] && [ ${#local_missing[@]} -eq 0 ] && [ ${#local_missing_2[@]} -eq 0 ]; then
echo "${OK} All essential packages are installed." | tee -a "$LOG"
echo "${OK} GREAT! All ${YELLOW}essential packages${RESET} have been successfully installed." | tee -a "$LOG"
else
if [ ${#missing[@]} -ne 0 ]; then
echo "${WARN} The following packages are not installed and will be logged:"

View File

@ -49,6 +49,7 @@ if command -v ags &>/dev/null; then
AGS_VERSION=$(ags -v | awk '{print $NF}')
if [[ "$AGS_VERSION" == "1.9.0" ]]; then
printf "${INFO} ${MAGENTA}Aylur's GTK Shell v1.9.0${RESET} is already installed. Skipping installation."
printf "\n%.0s" {1..2}
exit 0
fi
fi
@ -74,32 +75,33 @@ done
#install typescript by npm
sudo npm install --global typescript 2>&1 | tee -a "$LOG"
# ags
printf "${INFO} Install and Compiling ${SKY_BLUE}Aylur's GTK shell $ags_tag${RESET} .. \n"
# ags v1
printf "${NOTE} Install and Compiling ${SKY_BLUE}Aylur's GTK shell $ags_tag${RESET}..\n"
# Check if folder exists and remove it
# Check if directory exists and remove it
if [ -d "ags" ]; then
printf "${NOTE} Removing existing ags folder...\n"
printf "${NOTE} Removing existing ags directory...\n"
rm -rf "ags"
fi
# Clone nwg-look repository with the specified tag
if git clone --recursive -b "$ags_tag" --depth=1 https://github.com/Aylur/ags.git; then
cd ags || exit 1
# Build and install ags
printf "\n%.0s" {1..1}
printf "${INFO} Kindly Standby...cloning and compiling ${SKY_BLUE}Aylur's GTK shell $ags_tag${RESET}...\n"
printf "\n%.0s" {1..1}
# Clone repository with the specified tag and capture git output into MLOG
if git clone --depth=1 https://github.com/JaKooLit/ags_v1.9.0.git; then
cd ags_v1.9.0 || exit 1
npm install
meson setup build
if sudo meson install -C build 2>&1 | tee -a "$MLOG"; then
printf "${OK} ${YELLOW}Aylur's GTK shell $ags_tag${RESET} installed successfully.\n" 2>&1 | tee -a "$MLOG"
printf "\n${OK} ${YELLOW}Aylur's GTK shell $ags_tag${RESET} installed successfully.\n" 2>&1 | tee -a "$MLOG"
else
echo -e "${ERROR} Installation failed for ${YELLOW}Aylur's GTK shell $ags_tag${RESET}" 2>&1 | tee -a "$MLOG"
echo -e "\n${ERROR} ${YELLOW}Aylur's GTK shell $ags_tag${RESET} Installation failed\n " 2>&1 | tee -a "$MLOG"
fi
# Move logs to Install-Logs directory
mv "$MLOG" ../Install-Logs/ || true
cd ..
else
echo -e "${ERROR} Failed to download ${YELLOW}Aylur's GTK shell $ags_tag${RESET} . Please check your connection" 2>&1 | tee -a "$LOG"
echo -e "\n${ERROR} Failed to download ${YELLOW}Aylur's GTK shell $ags_tag${RESET} Please check your connection\n" 2>&1 | tee -a "$LOG"
mv "$MLOG" ../Install-Logs/ || true
exit 1
fi

View File

@ -56,7 +56,7 @@ if curl -L "$tarball_url" -o "Hyprland-Dots-${specific_version}.tar.gz"; then
chmod +x copy.sh
./copy.sh
echo -e "${OK} Hyprland-Dots-${specific_version} release downloaded, extracted, and processed successfully. Check JaKooLit-Hyprland-Dots folder for more detailed install logs" 2>&1 | tee -a "../Install-Logs/install-$(date +'%d-%H%M%S')_dotfiles.log"
echo -e "${OK} Hyprland-Dots-${specific_version} release downloaded, extracted, and processed successfully. Check JaKooLit-Hyprland-Dots directory for more detailed install logs" 2>&1 | tee -a "../Install-Logs/install-$(date +'%d-%H%M%S')_dotfiles.log"
else
echo -e "${ERROR} Failed to download Hyprland-Dots-${specific_version} release." 2>&1 | tee -a "../Install-Logs/install-$(date +'%d-%H%M%S')_dotfiles.log"
exit 1

View File

@ -46,13 +46,13 @@ for ((ATTEMPT = 1; ATTEMPT <= MAX_ATTEMPTS; ATTEMPT++)); do
sleep 2
done
# Check if the JetBrainsMono folder exists and delete it if it does
# Check if the JetBrainsMono directory exists and delete it if it does
if [ -d ~/.local/share/fonts/JetBrainsMonoNerd ]; then
rm -rf ~/.local/share/fonts/JetBrainsMonoNerd 2>&1 | tee -a "$LOG"
fi
mkdir -p ~/.local/share/fonts/JetBrainsMonoNerd 2>&1 | tee -a "$LOG"
# Extract the new files into the JetBrainsMono folder and log the output
# Extract the new files into the JetBrainsMono directory and log the output
tar -xJkf JetBrainsMono.tar.xz -C ~/.local/share/fonts/JetBrainsMonoNerd 2>&1 | tee -a "$LOG"
# Fantasque Mono Nerd Font

View File

@ -31,7 +31,7 @@ done
# Check if the directory exists and delete it if present
if [ -d "GTK-themes-icons" ]; then
echo "$NOTE GTK themes and Icons folder exist..deleting..." 2>&1 | tee -a "$LOG"
echo "$NOTE GTK themes and Icons directory exist..deleting..." 2>&1 | tee -a "$LOG"
rm -rf "GTK-themes-icons" 2>&1 | tee -a "$LOG"
fi
@ -41,7 +41,7 @@ if git clone --depth=1 https://github.com/JaKooLit/GTK-themes-icons.git ; then
chmod +x auto-extract.sh
./auto-extract.sh
cd ..
echo "$OK Extracted GTK Themes & Icons to ~/.icons & ~/.themes folders" 2>&1 | tee -a "$LOG"
echo "$OK Extracted GTK Themes & Icons to ~/.icons & ~/.themes directories" 2>&1 | tee -a "$LOG"
else
echo "$ERROR Download failed for GTK themes and Icons.." 2>&1 | tee -a "$LOG"
fi

View File

@ -4,8 +4,6 @@
idle=(
libsdbus-c++-dev
libsdbus-c++2
libsdbus-c++-bin
)
#specific branch or release
@ -39,7 +37,7 @@ for PKG1 in "${idle[@]}"; do
fi
done
# Check if hypridle folder exists and remove it
# Check if hypridle directory exists and remove it
if [ -d "hypridle" ]; then
rm -rf "hypridle"
fi

View File

@ -3,10 +3,8 @@
# Main Hyprland Package #
hypr=(
libhyprutils0
libhyprlang-dev
hyprwayland-scanner
hyprland-protocols
hyprwayland-scanner
)
# forcing to reinstall. Had experience it says hyprland is already installed
@ -30,6 +28,7 @@ fi
# Set the name of the log file to include the current date and time
LOG="Install-Logs/install-$(date +%d-%H%M%S)_hyprland.log"
# Hyprland
printf "${NOTE} Installing ${SKY_BLUE}Hyprland packages${RESET} .......\n"
for HYPR in "${hypr[@]}"; do

View File

@ -26,7 +26,7 @@ MLOG="install-$(date +%d-%H%M%S)_hyprlang2.log"
# Installation of dependencies
printf "\n%s - Installing ${YELLOW}hyprlang dependencies${RESET} .... \n" "${INFO}"
# Check if hyprlang folder exists and remove it
# Check if hyprlang directory exists and remove it
if [ -d "hyprlang" ]; then
rm -rf "hyprlang"
fi

View File

@ -38,7 +38,7 @@ for PKG1 in "${lock[@]}"; do
re_install_package "$PKG1" "$LOG"
done
# Check if hyprlock folder exists and remove it
# Check if hyprlock directory exists and remove it
if [ -d "hyprlock" ]; then
rm -rf "hyprlock"
fi

View File

@ -64,7 +64,7 @@ printf "\n%.0s" {1..2}
# Clone and build rofi - wayland
printf "${NOTE} Installing ${SKY_BLUE}rofi-wayland${RESET}...\n"
# Check if rofi folder exists
# Check if rofi directory exists
if [ -d "rofi-$rofi_tag" ]; then
rm -rf "rofi-$rofi_tag"
fi

View File

@ -8,6 +8,7 @@ sddm1=(
)
sddm2=(
qt6-5compat-dev
qml6-module-qt5compat-graphicaleffects
qt6-declarative-dev
qt6-svg-dev

View File

@ -110,8 +110,7 @@ if git clone --depth=1 "$source_theme" "$theme_name"; then
echo "Failed to copy fonts."
fi
# Update font cache and log the output
fc-cache -v -f 2>&1 | tee -a "$LOG"
fc-cache -fv 2>&1 | tee -a "$LOG"
printf "\n%.0s" {1..1}

View File

@ -47,7 +47,7 @@ done
printf "\n%.0s" {1..2}
# Check if swww folder exists
# Check if swww directory exists
if [ -d "swww" ]; then
cd swww || exit 1
git pull origin main 2>&1 | tee -a "$MLOG"

View File

@ -5,7 +5,6 @@
wallust=(
wallust
)
## WARNING: DO NOT EDIT BEYOND THIS LINE IF YOU DON'T KNOW WHAT YOU ARE DOING! ##
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"

View File

@ -4,8 +4,8 @@
zsh=(
lsd
mercurial
zsh
mercurial
zplug
)

View File

@ -18,7 +18,6 @@ fi
# Set the name of the log file to include the current date and time
LOG="Install-Logs/install-$(date +%d-%H%M%S)_zsh_pokemon.log"
printf "${INFO} Installing ${SKY_BLUE}Pokemon color scripts${RESET} ..."
if [ -d "pokemon-colorscripts" ]; then
@ -36,5 +35,4 @@ else
echo "$HOME/.zshrc not found. Cant enable ${YELLOW}Pokemon color scripts${RESET}" >> "$LOG" 2>&1
fi
printf "\n%.0s" {1..2}

View File

@ -169,7 +169,7 @@ if check_services_running; then
# Display the active login manager(s) in the whiptail message box
whiptail --title "Active non-SDDM login manager(s) detected" \
--msgbox "The following login manager(s) are active:\n\n$active_list\n\nIf you want to install SDDM and SDDM theme, stop and disable first the active services above first before running this script\nRefer to README on switching to SDDM if you really want SDDM\n\nNOTE: Your option to install SDDM and SDDM theme has now been removed\n\n😎 Ja " 27 80
--msgbox "The following login manager(s) are active:\n\n$active_list\n\nIf you want to install SDDM and SDDM theme, stop and disable first the active services above, and reboot before running this script\nRefer to README on switching to SDDM if you really want SDDM\n\nNOTE: Your option to install SDDM and SDDM theme has now been removed\n\n- Ja " 28 80
fi
# Check if NVIDIA GPU is detected