diff --git a/CHANGELOGS.md b/CHANGELOGS.md
index 292c56c..5978973 100644
--- a/CHANGELOGS.md
+++ b/CHANGELOGS.md
@@ -1,18 +1,4 @@
## Changelogs
-## 30-Sep-2023
-- replaced missioncenter with gnome-system-monitor
-- added some wallpaper
-
-## 27-Sep-2023
-- remove auto start of portal-hyprland-hyprland
-- removal of Virtual-1 monitor in Monitors.conf
-
-## 25-Sep-2023
-- added grub function to add nvidia_drm.modeset=1 for nvidia-grub users
-
-## 14-Sep-2023
-- Bump to v4
-- Renamed repo to Hyprland-v4
diff --git a/README.md b/README.md
index a9542cf..0eeac4a 100644
--- a/README.md
+++ b/README.md
@@ -2,19 +2,17 @@
# 💌 ** JaKooLit's Arch Hyprland Install Script ** 💌
-  
+  
-### A re-structured install script of my Hyprland-v3 [`Link`](https://github.com/JaKooLit/Hyprland-v3)
+### Basically a copy of my Hyprland-v4 Hyprland-install script [`Link`](https://github.com/JaKooLit/Hyprland-v4)
-
-
-
-
-### 📷 you can find more screenshots in the screenshots directory
+
+ 
+ 
/>
### 📽️ youtube video showcase: [`Youtube Link`](https://youtu.be/otda1nXJ5Dg?si=Wbb8eg-u3Y-tDnDQ)
@@ -23,16 +21,10 @@
### ✨ A video walk through my dotfiles[`Link`](https://youtu.be/fO-RBHvVEcc?si=ijqxxnq_DLiyO8xb)
-### 🆕 What's new compared to my V3
-- restructured Install script
-- Can modify the packages easily. (install-scripts/00-hypr-pkgs.sh) edit as desired
-- Added Tokyo-night-theme and TokyoNight-SE icons
-- using dunst instead of mako
-- Added Tokyo-Night SDDM Theme
-- Use a wofi-power menu instead of wlogout
-- Added the following:
- - a. gnome-system-monitor - right click on cpu waybar module
- - b. nvtop - right click on temperature waybar module
+### 🆕 What's new?
+- Basically just a clone of my Hyprland-v4. Just renamed and cleaned up codes.
+- Concentrated on Tokyo Themes and Tokyo Night SE icons only
+- Downloading of dot files will be a centralized repo
### 👀 NVidia GPU Owners.
@@ -42,10 +34,10 @@
### ✨ to run
> clone this repo by using git. Change directory, make executable and run the script
```bash
-git clone https://github.com/JaKooLit/Hyprland-v4.git
-cd Hyprland-v4
-chmod +x install-v4.sh
-./install-v4.sh
+git clone https://github.com/JaKooLit/Arch-Hyprland.git
+cd Arch-Hyprland
+chmod +x install.sh
+./install.sh
```
### ✨ for ZSH and OH-MY-ZSH installation
> do this once installed and script completed; do the following to change the default shell zsh
diff --git a/install-scripts/gtk_themes.sh b/install-scripts/gtk_themes.sh
index c5a1c9b..f237371 100644
--- a/install-scripts/gtk_themes.sh
+++ b/install-scripts/gtk_themes.sh
@@ -59,48 +59,25 @@ install_package() {
fi
}
+# installing unzip package to unzip theme packages
+for PKG1 in unzip; do
+ install_package "$PKG1" 2>&1 | tee -a "$LOG"
+ if [ $? -ne 0 ]; then
+ echo -e "\033[1A\033[K${ERROR} - $PKG1 install had failed, please check the install.log"
+ exit 1
+ fi
+done
# Themes and cursors
-printf "\n${NOTE} INSTALLING GTK THEMES \n"
- while true; do
- read -rp "${CAT} Which GTK Theme and Cursors to install? Catppuccin or Tokyo Theme? Enter 'c' or 't': " choice
- case "$choice" in
- c|C)
- printf "${NOTE} Installing Catpuccin Theme packages...\n"
- for THEME1 in catppuccin-gtk-theme-mocha catppuccin-gtk-theme-latte catppuccin-cursors-mocha; do
- install_package "$THEME1" 2>&1 | tee -a "$LOG"
- [ $? -ne 0 ] && { echo -e "\e[1A\e[K${ERROR} - $THEME1 install had failed, please check the install.log"; exit 1; }
- done
- # Shiny-Dark-Icons-themes
- mkdir -p ~/.icons
- cd assets
- tar -xf Shiny-Dark-Icons.tar.gz -C ~/.icons
- tar -xf Shiny-Light-Icons.tar.gz -C ~/.icons
- cd ..
- sed -i '9,12s/#//' config/hypr/scripts/DarkLight.sh
- sed -i '9,12s/#//' config/hypr/scripts/DarkLight-swaybg.sh
- sed -i '31s/#//' config/hypr/configs/Settings.conf
- cp -f 'config/hypr/waybar/style/dark-styles/style-dark-cat.css' 'config/hypr/waybar/style/style-dark.css'
- break
- ;;
- t|T)
- printf "${NOTE} Installing Tokyo Theme packages...\n"
- wget https://github.com/ljmill/tokyo-night-icons/releases/download/v0.2.0/TokyoNight-SE.tar.bz2
- mkdir -p ~/.icons
- tar -xvjf TokyoNight-SE.tar.bz2 -C ~/.icons
- mkdir -p ~/.themes
- cp -r -f assets/tokyo-themes/* ~/.themes/
- sed -i '15,18s/#//' config/hypr/scripts/DarkLight.sh
- sed -i '15,18s/#//' config/hypr/scripts/DarkLight-swaybg.sh
- sed -i '32s/#//' config/hypr/configs/Settings.conf
- cp -f 'config/hypr/waybar/style/dark-styles/style-dark-tokyo.css' 'config/hypr/waybar/style/style-dark.css'
- break
- ;;
- *)
- printf "%s - Invalid choice. Please enter 'c' or 't'\n" "${ERROR}"
- continue
- ;;
- esac
- done
+printf "${NOTE} Installing Tokyo Theme GTK packages...\n"
+if wget https://github.com/ljmill/tokyo-night-icons/releases/download/v0.2.0/TokyoNight-SE.tar.bz2; then
+ mkdir -p ~/.icons
+ tar -xvjf TokyoNight-SE.tar.bz2 -C ~/.icons
+ mkdir -p ~/.themes
+ unzip -q "assets/tokyo-themes/Tokyonight-Dark-B.zip" -d ~/.themes || true
+ unzip -q "assets/tokyo-themes/Tokyonight-Light-B.zip" -d ~/.themes || true
+else
+ echo -e "${ERROR} Download failed for Tokyo Theme GTK packages."
+fi
- clear
\ No newline at end of file
+clear
diff --git a/install-scripts/nvidia.sh b/install-scripts/nvidia.sh
index 3c37074..5ddf26c 100644
--- a/install-scripts/nvidia.sh
+++ b/install-scripts/nvidia.sh
@@ -49,20 +49,17 @@ install_package() {
# nvidia stuff
printf "${YELLOW}Installing Nvidia Hyprland...${RESET}\n"
if pacman -Qs hyprland > /dev/null; then
- read -n1 -rp "${CAT} Hyprland detected. Would you like to remove and install hyprland-nvidia instead? (y/n) " nvidia_hypr
- echo
- if [[ $nvidia_hypr =~ ^[Yy]$ ]]; then
- for hyprnvi in hyprland hyprland-nvidia hyprland-nvidia-hidpi-git; do
+ printf "${YELLOW} Hyprland detected uninstalling to install Hyprland-nvidia-git...${RESET}\n"
+ for hyprnvi in hyprland hyprland-nvidia hyprland-git hyprland-nvidia-hidpi-git; do
sudo pacman -R --noconfirm "$hyprnvi" 2>/dev/null | tee -a "$LOG" || true
done
- fi
fi
# install hyprland-nvidia-git
install_package "hyprland-nvidia-git" 2>&1 | tee -a "$LOG"
# Install additional Nvidia packages
-printf "${YELLOW} Installing Nvidia packages...\n"
+printf "${YELLOW} Installing addition Nvidia packages...\n"
for krnl in $(cat /usr/lib/modules/*/pkgbase); do
for NVIDIA in "${krnl}-headers" "${nvidia_pkg[@]}"; do
install_package "$NVIDIA" 2>&1 | tee -a "$LOG"
@@ -78,12 +75,7 @@ else
fi
sudo mkinitcpio -P 2>&1 | tee -a "$LOG"
-printf "\n"
-printf "\n"
-printf "\n"
-
-# Preparing exec.conf to enable env = WLR_NO_HARDWARE_CURSORS,1 so it will be ready once config files copied
-sed -i '21s/#//' config/hypr/configs/ENVariables.conf
+printf "\n\n\n"
# Additional Nvidia steps
NVEA="/etc/modprobe.d/nvidia.conf"
diff --git a/install-scripts/rog.sh b/install-scripts/rog.sh
index 00c6778..8a51b2d 100644
--- a/install-scripts/rog.sh
+++ b/install-scripts/rog.sh
@@ -57,6 +57,5 @@ install_package() {
done
printf " Activating ROG services...\n"
sudo systemctl enable --now supergfxd 2>&1 | tee -a "$LOG"
- sed -i '20s/#//' config/hypr/configs/Execs.conf
clear
\ No newline at end of file
diff --git a/screenshots/Plasma-Style.png b/screenshots/Plasma-Style.png
deleted file mode 100644
index d9c9a59..0000000
Binary files a/screenshots/Plasma-Style.png and /dev/null differ
diff --git a/screenshots/Sample-Tokyo-waybar.png b/screenshots/Sample-Tokyo-waybar.png
deleted file mode 100644
index 2320730..0000000
Binary files a/screenshots/Sample-Tokyo-waybar.png and /dev/null differ
diff --git a/screenshots/WofiEmoji.png b/screenshots/WofiEmoji.png
deleted file mode 100644
index e98a378..0000000
Binary files a/screenshots/WofiEmoji.png and /dev/null differ
diff --git a/screenshots/btop-nvtop-mission-center.png b/screenshots/btop-nvtop-mission-center.png
deleted file mode 100644
index 2cc3a71..0000000
Binary files a/screenshots/btop-nvtop-mission-center.png and /dev/null differ
diff --git a/screenshots/dual-panel-dark_light-switch.png b/screenshots/dual-panel-dark_light-switch.png
deleted file mode 100644
index 3e4baa0..0000000
Binary files a/screenshots/dual-panel-dark_light-switch.png and /dev/null differ
diff --git a/screenshots/dual-panel-light-dark-switch.png b/screenshots/dual-panel-light-dark-switch.png
deleted file mode 100644
index 9398a8b..0000000
Binary files a/screenshots/dual-panel-light-dark-switch.png and /dev/null differ
diff --git a/screenshots/gnome-style.png b/screenshots/gnome-style.png
deleted file mode 100644
index 763a997..0000000
Binary files a/screenshots/gnome-style.png and /dev/null differ
diff --git a/screenshots/install-script-initial-query.png b/screenshots/install-script-initial-query.png
deleted file mode 100644
index 40c8039..0000000
Binary files a/screenshots/install-script-initial-query.png and /dev/null differ
diff --git a/screenshots/pavuExample.jpg b/screenshots/pavuExample.jpg
deleted file mode 100644
index 1b915e7..0000000
Binary files a/screenshots/pavuExample.jpg and /dev/null differ