From d4530aa8a4b011dad9b7e06a33f0b7df872f2728 Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Mon, 6 Nov 2023 01:34:48 +0900 Subject: [PATCH 1/8] Prepare for V2 --- install-scripts/00-hypr-pkgs.sh | 13 ++++++++++--- install-scripts/dotfiles.sh | 5 +++-- install.sh | 8 +------- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/install-scripts/00-hypr-pkgs.sh b/install-scripts/00-hypr-pkgs.sh index 154136a..058f9b8 100644 --- a/install-scripts/00-hypr-pkgs.sh +++ b/install-scripts/00-hypr-pkgs.sh @@ -15,22 +15,24 @@ Extra=( hypr_package=( curl dunst - foot grim gvfs gvfs-backends + kitty + nano network-manager-gnome pavucontrol playerctl polkit-kde-agent-1 python3-requests + python3-pip qt5ct + rofi slurp waybar wget wl-clipboard wlogout - wofi ) # the following packages can be deleted. however, dotfiles may not work properly @@ -43,7 +45,6 @@ hypr_package_2=( mpv nvtop pamixer - swaybg swayidle viewnior vim @@ -111,4 +112,10 @@ go install go.senan.xyz/cliphist@latest 2>&1 | tee -a "$LOG" # copy cliphist into /usr/local/bin for some reason it is installing in ~/go/bin sudo cp -r "$HOME/go/bin/cliphist" "/usr/local/bin/" 2>&1 | tee -a "$LOG" + +## Installing pywal colors +printf "\n%s - Installing Pywal.... \n" "${NOTE}" + +sudo pip3 install pywal 2>&1 | tee -a "$LOG" + clear diff --git a/install-scripts/dotfiles.sh b/install-scripts/dotfiles.sh index 1631aea..77ec49d 100644 --- a/install-scripts/dotfiles.sh +++ b/install-scripts/dotfiles.sh @@ -23,11 +23,12 @@ if [ -d Hyprland-Dots ]; then chmod +x copy.sh ./copy.sh 2>&1 | tee -a "$LOG" else - if git clone https://github.com/JaKooLit/Hyprland-Dots.git; then + if git clone --branch Betav0.4 https://github.com/JaKooLit/Hyprland-Dots; then cd Hyprland-Dots || exit 1 chmod +x copy.sh ./copy.sh 2>&1 | tee -a "$LOG" else echo -e "${ERROR} Can't download Hyprland-Dots" 2>&1 | tee -a "$LOG" fi -fi \ No newline at end of file +fi + diff --git a/install.sh b/install.sh index ded4423..74dacf7 100644 --- a/install.sh +++ b/install.sh @@ -61,7 +61,6 @@ nwg="" rog="" sddm="" swaylock="" -swww="" thunar="" xdph="" zsh="" @@ -133,8 +132,6 @@ ask_yes_no "Do you want to install zsh and oh-my-zsh?" zsh printf "\n" ask_yes_no "Do you want to install swaylock-effects?" swaylock printf "\n" -ask_yes_no "Do you want to install swww?" swww -printf "\n" ask_yes_no "Do you want to install nwg-look?" nwg printf "\n" ask_yes_no "Do you want to copy dotfiles?" dots @@ -149,6 +146,7 @@ execute_script "00-dependencies.sh" execute_script "00-hypr-pkgs.sh" execute_script "fonts.sh" execute_script "swappy.sh" +execute_script "swww.sh" if [ "$nvidia" == "Y" ]; then execute_script "nvidia.sh" @@ -190,10 +188,6 @@ if [ "$swaylock" == "Y" ]; then execute_script "swaylock-effects.sh" fi -if [ "$swww" == "Y" ]; then - execute_script "swww.sh" -fi - if [ "$nwg" == "Y" ]; then execute_script "nwg-look.sh" fi From 4ff516678eab71bab51858853ac056ed19e3276f Mon Sep 17 00:00:00 2001 From: "Ja.KooLit" Date: Mon, 6 Nov 2023 08:00:13 +0900 Subject: [PATCH 2/8] Update helpers.rc --- assets/xfce4/helpers.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/xfce4/helpers.rc b/assets/xfce4/helpers.rc index 32fb567..0f5b92e 100644 --- a/assets/xfce4/helpers.rc +++ b/assets/xfce4/helpers.rc @@ -1,4 +1,4 @@ FileManager=Thunar -TerminalEmulator=foot +TerminalEmulator=kitty WebBrowser=firefox #MailReader=evolution From e69281aad10983f5bae46bcd6f08faac40824d9a Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Mon, 6 Nov 2023 09:22:58 +0900 Subject: [PATCH 3/8] update dotfile scripts --- install-scripts/dotfiles.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install-scripts/dotfiles.sh b/install-scripts/dotfiles.sh index 77ec49d..5629bc6 100644 --- a/install-scripts/dotfiles.sh +++ b/install-scripts/dotfiles.sh @@ -23,7 +23,7 @@ if [ -d Hyprland-Dots ]; then chmod +x copy.sh ./copy.sh 2>&1 | tee -a "$LOG" else - if git clone --branch Betav0.4 https://github.com/JaKooLit/Hyprland-Dots; then + if git clone --branch Beta-v0.4 https://github.com/JaKooLit/Hyprland-Dots; then cd Hyprland-Dots || exit 1 chmod +x copy.sh ./copy.sh 2>&1 | tee -a "$LOG" From b41555f59a7395f90c07c6569ff98a34c4329374 Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Mon, 6 Nov 2023 10:34:26 +0900 Subject: [PATCH 4/8] some small tweaks --- install.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/install.sh b/install.sh index 74dacf7..2c4c782 100644 --- a/install.sh +++ b/install.sh @@ -122,19 +122,19 @@ ask_yes_no "Do you want to configure Bluetooth?" bluetooth printf "\n" ask_yes_no "Do you want to install Thunar file manager?" thunar printf "\n" -ask_yes_no "Installing in Asus ROG Laptops?" rog +ask_yes_no "Installing on Asus ROG Laptops?" rog printf "\n" -ask_yes_no "Do you want to install and configure SDDM?" sddm +ask_yes_no "install and configure SDDM log-in Manager?" sddm printf "\n" -ask_yes_no "Do you want to install xdg-desktop-portal-hyprland?" xdph +ask_yes_no "Install XDG-DESKTOP-PORTAL-HYPRLAND? (recommended for proper Screen Share ie OBS)" xdph printf "\n" ask_yes_no "Do you want to install zsh and oh-my-zsh?" zsh printf "\n" -ask_yes_no "Do you want to install swaylock-effects?" swaylock +ask_yes_no "install swaylock-effects? (recommended - for screen locks)" swaylock printf "\n" -ask_yes_no "Do you want to install nwg-look?" nwg +ask_yes_no "Do you want to install nwg-look? (GTK Theming app - lxappearance-like)" nwg printf "\n" -ask_yes_no "Do you want to copy dotfiles?" dots +ask_yes_no "Do you want to copy Hyprland dotfiles?" dots printf "\n" # Ensuring all in the scripts folder are made executable chmod +x install-scripts/* From 1d86b705dfb59f57e356c3f78ec63dcb9104c6a5 Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Mon, 6 Nov 2023 14:41:06 +0900 Subject: [PATCH 5/8] updated .zshrc --- assets/.zshrc | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/assets/.zshrc b/assets/.zshrc index b10c413..8842782 100644 --- a/assets/.zshrc +++ b/assets/.zshrc @@ -13,5 +13,15 @@ plugins=( source $ZSH/oh-my-zsh.sh +# Import colorscheme from 'wal' asynchronously +# & # Run the process in the background. +# ( ) # Hide shell job control messages. +# Not supported in the "fish" shell. +(cat ~/.cache/wal/sequences &) +# Alternative (blocks terminal for 0-3ms) +cat ~/.cache/wal/sequences + +# To add support for TTYs this line can be optionally added. +source ~/.cache/wal/colors-tty.sh From c997cbd9609522cd1c63d65c92aac12d012e8fe5 Mon Sep 17 00:00:00 2001 From: "Ja.KooLit" Date: Mon, 6 Nov 2023 16:23:31 +0900 Subject: [PATCH 6/8] Update 00-hypr-pkgs.sh added yad --- install-scripts/00-hypr-pkgs.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/install-scripts/00-hypr-pkgs.sh b/install-scripts/00-hypr-pkgs.sh index 058f9b8..3fdb36f 100644 --- a/install-scripts/00-hypr-pkgs.sh +++ b/install-scripts/00-hypr-pkgs.sh @@ -33,6 +33,7 @@ hypr_package=( wget wl-clipboard wlogout + yad ) # the following packages can be deleted. however, dotfiles may not work properly From 50ab5aeab02f66bd7d632077a93a1602e3ae3c51 Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Tue, 7 Nov 2023 13:20:56 +0900 Subject: [PATCH 7/8] Updated readme --- README.md | 34 +++++++++++----------------------- 1 file changed, 11 insertions(+), 23 deletions(-) diff --git a/README.md b/README.md index da830bf..b7aca93 100644 --- a/README.md +++ b/README.md @@ -46,13 +46,11 @@ sudo nano /etc/apt/sources.list ### ✨ A video walk through my dotfiles[`Link`](https://youtu.be/fO-RBHvVEcc?si=ijqxxnq_DLiyO8xb) ## 🪧🪧🪧 ANNOUNCEMENT 🪧🪧🪧 -- I have moved to a centralized Hyprland Dots/Configuration. [`Hyprland-Dots`](https://github.com/JaKooLit/Hyprland-Dots) . During installation, if you opt to copy dotfiles, it will be downloaded from that centralized repo. +- This Repo does not contain Hyprland Dots or configs! Dotfiles can be checked here [`Hyprland-Dots`](https://github.com/JaKooLit/Hyprland-Dots) . During installation, if you opt to copy installation, it will be downloaded from that centralized repo. -- after initial boot-up after install, you will experience a NO wallpaper. This is due to changes I made on the install scripts to correct that, you can press the light/dark button or choose wallpaper (SUPER CTRL W), and that wallpaper will be loaded after reboot or login. - -- more info on announcement [`Link`](https://youtu.be/upDl1ns05eg) - -If you want to use swaybg as wallpaper provider, you can edit ~/.config/hypr/configs/Execs.conf and uncomment the swaybg part +### 🆕 What's new with v2? +- Rofi, Pywal Colors and Moved to Kitty. (Previous config was foot as tty and wofi as app launcher) +- Check out changelogs here [`Hyprland-Dots-Changelogs`](https://github.com/JaKooLit/Hyprland-Dots/blob/main/CHANGELOG.md) ### ✨ Some notes on this installer @@ -63,8 +61,8 @@ If you want to use swaybg as wallpaper provider, you can edit ~/.config/hypr/con ### ⚠️ WARNING! nwg-look takes long time to install. - nwg-look is a utility to costumize your GTK theme. It's a LXAppearance like. Its a good tool though but this package is entirely optional -### ✨ Costumize the packages -- inside the install-scripts folder, you can edit 00-hypr-pkgs.sh. Do not edit 00-dependencies.sh unless you know what you are doing +### ✨ Costumize the packages to be installed +- inside the install-scripts folder, you can edit 00-hypr-pkgs.sh. Do not edit 00-dependencies.sh unless you know what you are doing. Care though as the Hyprland Dots may not work properly! - default GTK theme if agreed to be installed is Tokyo night GTK themes (dark and light) + Tokyo night SE icons ### 🔔 NOTICE TO NVIDIA OWNERS ### @@ -89,19 +87,12 @@ source ~/.zshrc - by default mikeh theme is installed. You can find more themes from this [`OH-MY-ZSH-THEMES`](https://github.com/ohmyzsh/ohmyzsh/wiki/Themes) - to change the theme, edit ~/.zshrc ZSH_THEME="desired theme" -### ✨ Hyprland Dot Notes -- super h for launching a small help file -- super e to view / edit settings, monitor, keybinds, Environment Variables, etc -- go through the keybinds. There are alot of hidden features like dual panel, change waybar styles, change wallpaper, etc... its too long to put all in the readme!!! -- super d for wofi (menu) -- super t for thunar (file manager) +### 📒 Hyprland Dot Notes +- SUPER H for HINT or click on the waybar HINT! Button! +- SUPER SHIFT H to launch the Some quick tips and tricks! - if you installed in your laptop and Brightness and Keyboard brightness does not work you can execute this command `sudo chmod +s $(which brightnessctl)` -### 😠😠😠 NO WALLPAPER!! -- By default, swww is set for wallpaper. If you have not opt to install swww, you can edit ~/.config/hypr/configs/Execs.conf . Put # on swww and delete the # on the swaybg part -- I still highly suggest to install swww though since most are connected to swww - ### ✨ Packages that are manually downloaded and build. These packages will not be updated by apt and have to be manually updated - Hyprland [`LINK`](https://github.com/hyprwm/Hyprland) - nwg-look [`LINK`](https://github.com/nwg-piotr/nwg-look) @@ -137,15 +128,11 @@ ninja -C build sudo ninja -C build install ``` -### ✨ Roadmap: +### 🛣️ Roadmap: - [ ] Install zsh and oh-my-zsh without necessary steps above - [ ] possibly adding gruvbox themes, cursors, icons -- [ ] adding vertical waybar -- [X] ~~Use kitty in favor of foot~~ - Dropped the idea of kitty. Kitty is using twice memory compared to foot. -- [ ] Create an automated uninstaller ### ❗ some known issues - - [ ] reports from members of my discord, states that some users of nvidia are getting stuck on sddm login. credit to @Kenni Fix stated was ``` while in sddm press ctrl+alt+F2 or F3 @@ -169,6 +156,7 @@ log into your account ### 👍👍👍 Thanks and Credits! +- [`Hyprland`](https://hyprland.org/) Of course to Hyprland and @vaxerski for this awesome Dynamic Tiling Manager. - shout out to CooSee from Gentoo forums for the nice rainbow borders ### 💌 Some screenshots shared to me via discord From ebea9463ed2420fb007c598213f938a670074292 Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Tue, 7 Nov 2023 13:47:37 +0900 Subject: [PATCH 8/8] Final update --- install-scripts/dotfiles.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install-scripts/dotfiles.sh b/install-scripts/dotfiles.sh index 5629bc6..28663d8 100644 --- a/install-scripts/dotfiles.sh +++ b/install-scripts/dotfiles.sh @@ -23,7 +23,7 @@ if [ -d Hyprland-Dots ]; then chmod +x copy.sh ./copy.sh 2>&1 | tee -a "$LOG" else - if git clone --branch Beta-v0.4 https://github.com/JaKooLit/Hyprland-Dots; then + if git clone https://github.com/JaKooLit/Hyprland-Dots; then cd Hyprland-Dots || exit 1 chmod +x copy.sh ./copy.sh 2>&1 | tee -a "$LOG"