From 6b29fc5d1e802563a036da9eab187b27c0f17db5 Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Wed, 10 Jul 2024 00:26:38 +0900 Subject: hyprlock fix (Debian is showing -e) --- copy.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'copy.sh') diff --git a/copy.sh b/copy.sh index 506551d4..d67c719b 100755 --- a/copy.sh +++ b/copy.sh @@ -218,11 +218,11 @@ while true; do sed -i 's#^ "format": "{:%a %d | %H:%M}", // 24H# \/\/"format": "{:%a %d | %H:%M}", // 24H#' config/waybar/modules 2>&1 | tee -a "$LOG" # for hyprlock - sed -i 's/^ text = cmd\[update:1000\] echo -e "\$(date +"%H")"/# &/' config/hypr/hyprlock.conf 2>&1 | tee -a "$LOG" - sed -i 's/^# *text = cmd\[update:1000\] echo -e "\$(date +"%I")" #AM\/PM/ text = cmd\[update:1000\] echo -e "\$(date +"%I")" #AM\/PM/' config/hypr/hyprlock.conf 2>&1 | tee -a "$LOG" + sed -i 's/^ text = cmd\[update:1000\] echo "\$(date +"%H")"/# &/' config/hypr/hyprlock.conf 2>&1 | tee -a "$LOG" + sed -i 's/^# *text = cmd\[update:1000\] echo "\$(date +"%I")" #AM\/PM/ text = cmd\[update:1000\] echo "\$(date +"%I")" #AM\/PM/' config/hypr/hyprlock.conf 2>&1 | tee -a "$LOG" - sed -i 's/^ text = cmd\[update:1000\] echo -e "\$(date +"%S")"/# &/' config/hypr/hyprlock.conf 2>&1 | tee -a "$LOG" - sed -i 's/^# *text = cmd\[update:1000\] echo -e "\$(date +"%S %p")" #AM\/PM/ text = cmd\[update:1000\] echo -e "\$(date +"%S %p")" #AM\/PM/' config/hypr/hyprlock.conf 2>&1 | tee -a "$LOG" + sed -i 's/^ text = cmd\[update:1000\] echo "\$(date +"%S")"/# &/' config/hypr/hyprlock.conf 2>&1 | tee -a "$LOG" + sed -i 's/^# *text = cmd\[update:1000\] echo "\$(date +"%S %p")" #AM\/PM/ text = cmd\[update:1000\] echo "\$(date +"%S %p")" #AM\/PM/' config/hypr/hyprlock.conf 2>&1 | tee -a "$LOG" # for SDDM (simple-sddm) sddm_folder="/usr/share/sddm/themes/simple-sddm" -- cgit v1.2.3 From c314624196ada2ec5c17f1335226990a7644320d Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Thu, 11 Jul 2024 13:11:08 +0900 Subject: updated default waybar style --- config/hypr/initial-boot.sh | 2 +- copy.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'copy.sh') diff --git a/config/hypr/initial-boot.sh b/config/hypr/initial-boot.sh index 28bf33ab..85e65322 100755 --- a/config/hypr/initial-boot.sh +++ b/config/hypr/initial-boot.sh @@ -8,7 +8,7 @@ # Variables scriptsDir=$HOME/.config/hypr/scripts wallpaper=$HOME/.config/hypr/wallpaper_effects/.wallpaper_modified -waybar_style="$HOME/.config/waybar/style/[Wallust] Box type.css" +waybar_style="$HOME/.config/waybar/style/[Dark] Half-Moon.css" kvantum_theme="Catppuccin-Mocha" color_scheme="prefer-dark" gtk_theme="Andromeda-dark" diff --git a/copy.sh b/copy.sh index d67c719b..5a32f20c 100755 --- a/copy.sh +++ b/copy.sh @@ -4,7 +4,7 @@ clear wallpaper=$HOME/.config/hypr/wallpaper_effects/.wallpaper_modified -waybar_style="$HOME/.config/waybar/style/[Wallust] Box type.css" +waybar_style="$HOME/.config/waybar/style/[Dark] Half-Moon.css" waybar_config="$HOME/.config/waybar/configs/[TOP] Default_v3" waybar_config_laptop="$HOME/.config/waybar/configs/[TOP] Default Laptop_v3" -- cgit v1.2.3 From 7e6c569c25c2f1fef2d3463ab9605bba32bf90f1 Mon Sep 17 00:00:00 2001 From: "Ja.KooLit" <85185940+JaKooLit@users.noreply.github.com> Date: Wed, 31 Jul 2024 13:52:47 +0800 Subject: Update copy.sh to create backup for nvim --- copy.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'copy.sh') diff --git a/copy.sh b/copy.sh index 5a32f20c..057a430f 100755 --- a/copy.sh +++ b/copy.sh @@ -326,7 +326,7 @@ get_backup_dirname() { echo "back-up_${timestamp}" } -for DIR in ags btop cava fastfetch hypr kitty Kvantum qt5ct qt6ct rofi swappy swaync wallust waybar wlogout; do +for DIR in ags btop cava fastfetch hypr kitty Kvantum nvim qt5ct qt6ct rofi swappy swaync wallust waybar wlogout; do DIRPATH=~/.config/"$DIR" if [ -d "$DIRPATH" ]; then echo -e "${NOTE} - Config for $DIR found, attempting to back up." -- cgit v1.2.3 From c37aa1c2b1aae8fa411009023abd03f7dc640f7f Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Sat, 3 Aug 2024 18:11:04 +0900 Subject: no hardware cursors if nvidia detected --- copy.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'copy.sh') diff --git a/copy.sh b/copy.sh index 057a430f..5b8a0c27 100755 --- a/copy.sh +++ b/copy.sh @@ -47,17 +47,20 @@ LOG="Copy-Logs/install-$(date +%d-%H%M%S)_dotfiles.log" # update home folders xdg-user-dirs-update 2>&1 | tee -a "$LOG" || true -# uncommenting WLR_NO_HARDWARE_CURSORS if nvidia is detected +# setting up for nvidia if lspci -k | grep -A 2 -E "(VGA|3D)" | grep -iq nvidia; then echo "Nvidia GPU detected. Setting up proper env's" 2>&1 | tee -a "$LOG" || true sed -i '/env = LIBVA_DRIVER_NAME,nvidia/s/^#//' config/hypr/UserConfigs/ENVariables.conf sed -i '/env = __GLX_VENDOR_LIBRARY_NAME,nvidia/s/^#//' config/hypr/UserConfigs/ENVariables.conf - sed -i '/env = NVD_BACKEND,direct/s/^#//' config/hypr/UserConfigs/ENVariables.conf + sed -i '/env = NVD_BACKEND,direct/s/^#//' config/hypr/UserConfigs/ENVariables.conf + # enabling no hardware cursors if nvidia detected + sed -i 's/^\([[:space:]]*no_hardware_cursors[[:space:]]*=[[:space:]]*\)false/\1true/' config/hypr/UserConfigs/UserSettings.conf fi # uncommenting WLR_RENDERER_ALLOW_SOFTWARE,1 if running in a VM is detected if hostnamectl | grep -q 'Chassis: vm'; then echo "System is running in a virtual machine." 2>&1 | tee -a "$LOG" || true + # enabling no hardware cursors if VM detected sed -i 's/^\([[:space:]]*no_hardware_cursors[[:space:]]*=[[:space:]]*\)false/\1true/' config/hypr/UserConfigs/UserSettings.conf sed -i '/env = WLR_RENDERER_ALLOW_SOFTWARE,1/s/^#//' config/hypr/UserConfigs/ENVariables.conf sed -i '/monitor = Virtual-1, 1920x1080@60,auto,1/s/^#//' config/hypr/UserConfigs/Monitors.conf -- cgit v1.2.3 From fb3cd6d1cb4a2f2f72a527e13b61d9db4e336349 Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Sun, 4 Aug 2024 18:40:03 +0900 Subject: reduced font size for kitty if user chose <1080p resolution during installation --- config/kitty/kitty.conf | 8 ++++---- config/wallust/templates/colors-kitty.conf | 8 ++++---- copy.sh | 13 ++++++++----- 3 files changed, 16 insertions(+), 13 deletions(-) (limited to 'copy.sh') diff --git a/config/kitty/kitty.conf b/config/kitty/kitty.conf index 60a20bdf..ccf60a48 100644 --- a/config/kitty/kitty.conf +++ b/config/kitty/kitty.conf @@ -1,7 +1,7 @@ -font_family Fira Code SemiBold -font_size 16.0 -bold_font auto -italic_font auto +font_family Fira Code SemiBold +font_size 16.0 +bold_font auto +italic_font auto bold_italic_font auto background_opacity 0.5 diff --git a/config/wallust/templates/colors-kitty.conf b/config/wallust/templates/colors-kitty.conf index ab207635..17a0fdff 100644 --- a/config/wallust/templates/colors-kitty.conf +++ b/config/wallust/templates/colors-kitty.conf @@ -1,7 +1,7 @@ -font_family Fira Code SemiBold -font_size 16.0 -bold_font auto -italic_font auto +font_family Fira Code SemiBold +font_size 16.0 +bold_font auto +italic_font auto bold_italic_font auto background_opacity 0.5 diff --git a/copy.sh b/copy.sh index 5b8a0c27..2995a6c6 100755 --- a/copy.sh +++ b/copy.sh @@ -260,9 +260,9 @@ done printf "\n" -# Action to do for better rofi appearance +# Action to do for better rofi and kitty appearance while true; do - echo "$ORANGE Select monitor resolution for better Rofi appearance:" + echo "$ORANGE Select monitor resolution for better Rofi and kitty appearance:" echo "$YELLOW 1. Equal to or less than 1080p (≤ 1080p)" echo "$YELLOW 2. Equal to or higher than 1440p (≥ 1440p)" read -p "$CAT Enter the number of your choice: " choice @@ -283,13 +283,16 @@ while true; do done # Use the selected resolution in your existing script -echo "You chose $resolution resolution for better Rofi appearance." 2>&1 | tee -a "$LOG" +echo "You chose $resolution resolution." 2>&1 | tee -a "$LOG" # Add your commands based on the resolution choice if [ "$resolution" == "≤ 1080p" ]; then - cp -r config/rofi/resolution/1080p/* config/rofi/ + cp -r config/rofi/resolution/1080p/* config/rofi/ + sed -i 's/font_size 16.0/font_size 12.0/' config/kitty/kitty.conf + sed -i 's/font_size 16.0/font_size 12.0/' config/wallust/templates/colors-kitty.conf + elif [ "$resolution" == "≥ 1440p" ]; then - cp -r config/rofi/resolution/1440p/* config/rofi/ + cp -r config/rofi/resolution/1440p/* config/rofi/ fi printf "\n%.0s" {1..2} -- cgit v1.2.3 From 66cfe8e38194b6c8fcaf1d74aa31b264c79751bc Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Thu, 8 Aug 2024 17:02:06 +0900 Subject: Preparation for Hyprland 0.42.0 & Code cleanup --- config/hypr/UserConfigs/UserSettings.conf | 17 ++++++++++------- copy.sh | 4 +++- 2 files changed, 13 insertions(+), 8 deletions(-) (limited to 'copy.sh') diff --git a/config/hypr/UserConfigs/UserSettings.conf b/config/hypr/UserConfigs/UserSettings.conf index 9190a265..c7b17fec 100644 --- a/config/hypr/UserConfigs/UserSettings.conf +++ b/config/hypr/UserConfigs/UserSettings.conf @@ -8,9 +8,6 @@ # Sourcing colors generated by wallust source = $HOME/.config/hypr/wallust/wallust-hyprland.conf -# blurls = waybar -# blurls = rofi - dwindle { pseudotile = yes preserve_split = yes @@ -18,7 +15,7 @@ dwindle { } master { - new_status = master #from Hyprland >v0.41.2 + new_status = master new_on_top = 1 mfact = 0.5 } @@ -148,7 +145,7 @@ misc { enable_swallow = true swallow_regex = ^(kitty)$ focus_on_activate = false - #no_direct_scanout = true #for fullscreen games + #no_direct_scanout = true #for fullscreen games - deprecated initial_workspace_tracking = 0 middle_click_paste = false } @@ -164,9 +161,15 @@ xwayland { force_zero_scaling = true } -# cursor section for Hyprland >= v0.41.0 +# render section for Hyprland >= v0.42.0 +render { + explicit_sync = 2 + explicit_sync_kms = 2 + direct_scanout = false +} + cursor { no_hardware_cursors = false enable_hyprcursor = true - warp_on_change_workspace = true # for -git or Hyprland >v0.41.1 + warp_on_change_workspace = true } diff --git a/copy.sh b/copy.sh index 2995a6c6..609d09d7 100755 --- a/copy.sh +++ b/copy.sh @@ -49,12 +49,14 @@ xdg-user-dirs-update 2>&1 | tee -a "$LOG" || true # setting up for nvidia if lspci -k | grep -A 2 -E "(VGA|3D)" | grep -iq nvidia; then - echo "Nvidia GPU detected. Setting up proper env's" 2>&1 | tee -a "$LOG" || true + echo "Nvidia GPU detected. Setting up proper env's and configs" 2>&1 | tee -a "$LOG" || true sed -i '/env = LIBVA_DRIVER_NAME,nvidia/s/^#//' config/hypr/UserConfigs/ENVariables.conf sed -i '/env = __GLX_VENDOR_LIBRARY_NAME,nvidia/s/^#//' config/hypr/UserConfigs/ENVariables.conf sed -i '/env = NVD_BACKEND,direct/s/^#//' config/hypr/UserConfigs/ENVariables.conf # enabling no hardware cursors if nvidia detected sed -i 's/^\([[:space:]]*no_hardware_cursors[[:space:]]*=[[:space:]]*\)false/\1true/' config/hypr/UserConfigs/UserSettings.conf + # disabling explicit sync for nvidia for now (Hyprland 0.42.0) + sed -i 's/ explicit_sync = 2/ explicit_sync = 0/' config/hypr/UserConfigs/UserSettings.conf fi # uncommenting WLR_RENDERER_ALLOW_SOFTWARE,1 if running in a VM is detected -- cgit v1.2.3 From 0fb1b47f2be1e6911b166a0ac050515eba0e1b6d Mon Sep 17 00:00:00 2001 From: "Ja.KooLit" <85185940+JaKooLit@users.noreply.github.com> Date: Sat, 10 Aug 2024 12:42:24 +0000 Subject: updated copy.sh for =<1080p resolutions --- config/hypr/hyprlock.conf | 2 +- copy.sh | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'copy.sh') diff --git a/config/hypr/hyprlock.conf b/config/hypr/hyprlock.conf index af56bc18..e95da6dd 100644 --- a/config/hypr/hyprlock.conf +++ b/config/hypr/hyprlock.conf @@ -1,5 +1,5 @@ # /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ # -# Hyprlock +# Hyprlock config for => 2k monitor resolutions # Original config submitted by https://github.com/SherLock707 # Sourcing colors generated by wallust diff --git a/copy.sh b/copy.sh index 609d09d7..ad8bec95 100755 --- a/copy.sh +++ b/copy.sh @@ -293,6 +293,10 @@ if [ "$resolution" == "≤ 1080p" ]; then sed -i 's/font_size 16.0/font_size 12.0/' config/kitty/kitty.conf sed -i 's/font_size 16.0/font_size 12.0/' config/wallust/templates/colors-kitty.conf + # hyprlock matters + mv config/hypr/hyprlock.conf config/hypr/hyprlock-2k.conf + mv config/hypr/hyprlock-1080p.conf config/hypr/hyprlock.conf + elif [ "$resolution" == "≥ 1440p" ]; then cp -r config/rofi/resolution/1440p/* config/rofi/ fi -- cgit v1.2.3 From 9756abcd1d2903dee4cebd54c9cc1429d35e03c9 Mon Sep 17 00:00:00 2001 From: "Ja.KooLit" <85185940+JaKooLit@users.noreply.github.com> Date: Sat, 10 Aug 2024 12:53:07 +0000 Subject: updated copy.sh - moved the resolution question first before time format --- copy.sh | 84 +++++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 43 insertions(+), 41 deletions(-) (limited to 'copy.sh') diff --git a/copy.sh b/copy.sh index ad8bec95..f1e1d257 100755 --- a/copy.sh +++ b/copy.sh @@ -192,6 +192,49 @@ if command -v asusctl >/dev/null 2>&1; then sed -i '/exec-once = rog-control-center &/s/^#//' config/hypr/UserConfigs/Startup_Apps.conf fi +printf "\n" + +# Action to do for better rofi and kitty appearance +while true; do + echo "$ORANGE Select monitor resolution for better config appearance and fonts:" + echo "$YELLOW 1. Equal to or less than 1080p (≤ 1080p)" + echo "$YELLOW 2. Equal to or higher than 1440p (≥ 1440p)" + read -p "$CAT Enter the number of your choice: " choice + + case $choice in + 1) + resolution="≤ 1080p" + break + ;; + 2) + resolution="≥ 1440p" + break + ;; + *) + echo "Invalid choice. Please enter 1 for ≤ 1080p or 2 for ≥ 1440p." + ;; + esac +done + +# Use the selected resolution in your existing script +echo "You chose $resolution resolution." 2>&1 | tee -a "$LOG" + +# Add your commands based on the resolution choice +if [ "$resolution" == "≤ 1080p" ]; then + cp -r config/rofi/resolution/1080p/* config/rofi/ + sed -i 's/font_size 16.0/font_size 12.0/' config/kitty/kitty.conf + sed -i 's/font_size 16.0/font_size 12.0/' config/wallust/templates/colors-kitty.conf + + # hyprlock matters + mv config/hypr/hyprlock.conf config/hypr/hyprlock-2k.conf + mv config/hypr/hyprlock-1080p.conf config/hypr/hyprlock.conf + +elif [ "$resolution" == "≥ 1440p" ]; then + cp -r config/rofi/resolution/1440p/* config/rofi/ +fi + +printf "\n%.0s" {1..2} + # Ask whether to change to 12hr format while true; do echo -e "$ORANGE By default, configs are in 24H format." @@ -262,47 +305,6 @@ done printf "\n" -# Action to do for better rofi and kitty appearance -while true; do - echo "$ORANGE Select monitor resolution for better Rofi and kitty appearance:" - echo "$YELLOW 1. Equal to or less than 1080p (≤ 1080p)" - echo "$YELLOW 2. Equal to or higher than 1440p (≥ 1440p)" - read -p "$CAT Enter the number of your choice: " choice - - case $choice in - 1) - resolution="≤ 1080p" - break - ;; - 2) - resolution="≥ 1440p" - break - ;; - *) - echo "Invalid choice. Please enter 1 for ≤ 1080p or 2 for ≥ 1440p." - ;; - esac -done - -# Use the selected resolution in your existing script -echo "You chose $resolution resolution." 2>&1 | tee -a "$LOG" - -# Add your commands based on the resolution choice -if [ "$resolution" == "≤ 1080p" ]; then - cp -r config/rofi/resolution/1080p/* config/rofi/ - sed -i 's/font_size 16.0/font_size 12.0/' config/kitty/kitty.conf - sed -i 's/font_size 16.0/font_size 12.0/' config/wallust/templates/colors-kitty.conf - - # hyprlock matters - mv config/hypr/hyprlock.conf config/hypr/hyprlock-2k.conf - mv config/hypr/hyprlock-1080p.conf config/hypr/hyprlock.conf - -elif [ "$resolution" == "≥ 1440p" ]; then - cp -r config/rofi/resolution/1440p/* config/rofi/ -fi - -printf "\n%.0s" {1..2} - # Rainbow Borders # Check if the user wants to disable Rainbow borders # Print message about Rainbow Borders -- cgit v1.2.3 From 1edc094cd96675d6508cb129d79ee16f64d20641 Mon Sep 17 00:00:00 2001 From: "Ja.KooLit" <85185940+JaKooLit@users.noreply.github.com> Date: Sat, 10 Aug 2024 14:35:10 +0000 Subject: Added LIBGL_ALWAYS_SOFTWARE on ENVariables.conf Will be activated for if VM is detected --- config/hypr/UserConfigs/ENVariables.conf | 5 ++--- copy.sh | 3 ++- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'copy.sh') diff --git a/config/hypr/UserConfigs/ENVariables.conf b/config/hypr/UserConfigs/ENVariables.conf index 679a94e0..2ec6b4ea 100644 --- a/config/hypr/UserConfigs/ENVariables.conf +++ b/config/hypr/UserConfigs/ENVariables.conf @@ -19,7 +19,6 @@ env = XDG_SESSION_TYPE,wayland # toolkit-specific scale # env = GDK_SCALE,2 - # firefox env = MOZ_ENABLE_WAYLAND,1 @@ -39,9 +38,9 @@ env = ELECTRON_OZONE_PLATFORM_HINT,auto #env = __VK_LAYER_NV_optimus,NVIDIA_only #env = WLR_DRM_NO_ATOMIC,1 - # FOR VM and POSSIBLY NVIDIA -#env = WLR_NO_HARDWARE_CURSORS,1 # On hyprland >v0.41, now configured on variable cursor section +# LIBGL_ALWAYS_SOFTWARE software mesa rendering +#env = LIBGL_ALWAYS_SOFTWARE,1 #env = WLR_RENDERER_ALLOW_SOFTWARE,1 # nvidia firefox (for hardware acceleration on FF)? diff --git a/copy.sh b/copy.sh index f1e1d257..d691c531 100755 --- a/copy.sh +++ b/copy.sh @@ -62,9 +62,10 @@ fi # uncommenting WLR_RENDERER_ALLOW_SOFTWARE,1 if running in a VM is detected if hostnamectl | grep -q 'Chassis: vm'; then echo "System is running in a virtual machine." 2>&1 | tee -a "$LOG" || true - # enabling no hardware cursors if VM detected + # enabling proper ENV's for Virtual Environment which should help sed -i 's/^\([[:space:]]*no_hardware_cursors[[:space:]]*=[[:space:]]*\)false/\1true/' config/hypr/UserConfigs/UserSettings.conf sed -i '/env = WLR_RENDERER_ALLOW_SOFTWARE,1/s/^#//' config/hypr/UserConfigs/ENVariables.conf + sed -i '/env = LIBGL_ALWAYS_SOFTWARE,1/s/^#//' config/hypr/UserConfigs/ENVariables.conf sed -i '/monitor = Virtual-1, 1920x1080@60,auto,1/s/^#//' config/hypr/UserConfigs/Monitors.conf fi -- cgit v1.2.3