aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--config/hypr/hyprlock-1080p.conf182
-rw-r--r--config/hypr/hyprlock-2k.conf8
-rw-r--r--config/hypr/hyprlock.conf182
-rw-r--r--config/hypr/lua/settings.lua4
-rwxr-xr-xcopy.sh75
-rw-r--r--scripts/lib_copy.sh4
6 files changed, 84 insertions, 371 deletions
diff --git a/config/hypr/hyprlock-1080p.conf b/config/hypr/hyprlock-1080p.conf
deleted file mode 100644
index b0a0279c..00000000
--- a/config/hypr/hyprlock-1080p.conf
+++ /dev/null
@@ -1,182 +0,0 @@
-# /* ---- 💫 https://github.com/LinuxBeginnings 💫 ---- */ #
-# Hyprlock config for < 1080p monitor resolutions
-# Original config submitted by https://github.com/SherLock707
-
-# Sourcing colors generated by wallust
-source = $HOME/.config/hypr/wallust/wallust-hyprland.conf
-$Scripts = $HOME/.config/hypr/scripts
-
-general {
- fractional_scaling = 2
- immediate_render = true
-}
-
-background {
- monitor =
- # NOTE: use only 1 path
- #path = screenshot # screenshot of your desktop
- #path = $HOME/.config/hypr/wallpaper_effects/.wallpaper_modified # by wallpaper effects
- path = $HOME/.config/hypr/wallpaper_effects/.wallpaper_current # current wallpaper
-
- color = rgb(0,0,0) # color will be rendered initially until path is available
-
- # all these options are taken from hyprland, see https://wiki.hyprland.org/Configuring/Variables/#blur for explanations
- blur_size = 3
- blur_passes = 2 # 0 disables blurring
- noise = 0.0117
- contrast = 1.3000 # Vibrant!!!
- brightness = 0.8000
- vibrancy = 0.2100
- vibrancy_darkness = 0.0
-}
-
-
-# Date
-label {
- monitor =
- text = cmd[update:18000000] echo "<b> "$(date +'%A, %-d %B')" </b>"
- color = $color13
- font_size = 48
- font_family = Victor Mono Bold Italic
- position = 0, -60
- halign = center
- valign = center
-}
-
-# Hour-Time
-label {
- monitor =
-# text = cmd[update:1000] echo "$(date +"%H")"
- text = cmd[update:1000] echo "$(date +"%I:%M %p")" #AM/PM
- #color = rgba(255, 185, 0, .8)
- color = $color8
- font_size = 130
- font_family = JetBrainsMono Nerd Font ExtraBold
- position = 0, -250
- halign = center
- valign = top
-}
-
-# Minute-Time
-# label {
-# monitor =
-# text = cmd[update:1000] echo "$(date +"%M")"
-# #color = rgba(15, 10, 222, .8)
-# color = $color12
-# font_size = 150
-# font_family = JetBrainsMono Nerd Font ExtraBold
-# position = 0, -340
-# halign = center
- # valign = top
-# }
-
-# Seconds-Time
-# label {
-# monitor =
-## text = cmd[update:1000] echo "$(date +"%S")"
-# text = cmd[update:1000] echo "$(date +"%S %p")" #AM/PM
-# color = $color11
-# font_size = 32
-# font_family = JetBrainsMono Nerd Font ExtraBold
-# position = 0, -350
-# halign = center
-# valign = top
-# }
-
-# Put a picture of choice here. Default is the current wallpaper
-# image {
-# monitor =
-# path = $HOME/.config/hypr/wallpaper_effects/.wallpaper_current
-# size = 160
-# rounding = -1
-# border_size = 0
-# border_color = $color11
-# rotate = 0
-# reload_time = -1
-# position = 0, 280
-# halign = center
-# valign = bottom
-# }
-
-# USER
-label {
- monitor =
- text =  $USER
- color = $color9
- font_size = 36
- font_family = Victor Mono Bold Oblique
- position = 0, 275
- halign = center
- valign = bottom
-}
-
-# INPUT FIELD
-input-field {
- monitor =
- size = 230, 70
- outline_thickness = 2
- dots_size = 0.2 # Scale of input-field height, 0.2 - 0.8
- dots_spacing = 0.2 # Scale of dots' absolute size, 0.0 - 1.0
- dots_center = true
- outer_color = $color8
- inner_color = rgba(255, 255, 255, 0.1)
- capslock_color = rgb(255,255,255)
- font_color = $color13
- fade_on_empty = false
- font_family = Victor Mono Bold Oblique
- placeholder_text = <i><span foreground="##ffffff99">🔒 Type Password</span></i>
- hide_input = false
- position = 0, 100
- halign = center
- valign = bottom
-}
-
-# Keyboard LAYOUT
-label {
- monitor =
- text = $LAYOUT
- color = $color8
- font_size = 14
- font_family = Victor Mono Bold Oblique
- position = 0, 70
- halign = center
- valign = bottom
-}
-
-# uptime
-label {
- monitor =
- text = cmd[update:60000] echo "<b> "$(uptime -p || $Scripts/UptimeNixOS.sh)" </b>"
- color = $color8
- font_size = 24
- font_family = Victor Mono Bold Oblique
- position = 0, 0
- halign = right
- valign = bottom
-}
-
-# battery information
-label {
- monitor =
- text = cmd[update:1000] echo "<b> "$($Scripts/Battery.sh)" </b>"
- color = $color8
- font_size = 16
- font_family = Victor Mono Bold Oblique
- position = 0, 30
- halign = right
- valign = bottom
-}
-
-# weather edit the scripts for locations
-# weather scripts are located in ~/.config/hypr/UserScripts Weather.sh and/or Weather.py
-# see https://github.com/LinuxBeginnings/Hyprland-Dots/wiki/TIPS#%EF%B8%8F-weather-app-related-for-waybar-and-hyprlock
-label {
- monitor =
- text = cmd[update:3600000] [ -f "$HOME/.cache/.weather_cache" ] && cat "$HOME/.cache/.weather_cache"
- color = $color8
- font_size = 14
- font_family = Victor Mono Bold Oblique
- position = 50, 0
- halign = left
- valign = bottom
-}
diff --git a/config/hypr/hyprlock-2k.conf b/config/hypr/hyprlock-2k.conf
index 08fa8539..c70b3ada 100644
--- a/config/hypr/hyprlock-2k.conf
+++ b/config/hypr/hyprlock-2k.conf
@@ -1,5 +1,5 @@
# /* ---- 💫 https://github.com/LinuxBeginnings 💫 ---- */ #
-# Hyprlock config for < 1080p monitor resolutions
+# Hyprlock config for < 1080p monitor resolutions
# Original config submitted by https://github.com/SherLock707
# Sourcing colors generated by wallust
@@ -17,7 +17,7 @@ background {
#path = screenshot # screenshot of your desktop
#path = $HOME/.config/hypr/wallpaper_effects/.wallpaper_modified # by wallpaper effects
path = $HOME/.config/hypr/wallpaper_effects/.wallpaper_current # current wallpaper
-
+
color = rgb(0,0,0) # color will be rendered initially until path is available
# all these options are taken from hyprland, see https://wiki.hyprland.org/Configuring/Variables/#blur for explanations
@@ -36,7 +36,7 @@ label {
monitor =
text = cmd[update:18000000] echo "<b> "$(date +'%A, %-d %B')" </b>"
color = $color13
- font_size = 48
+ font_size = 48
font_family = Victor Mono Bold Italic
position = 0, -60
halign = center
@@ -51,7 +51,7 @@ label {
#color = rgba(255, 185, 0, .8)
color = $color8
font_size = 130
- font_family = JetBrainsMono Nerd Font ExtraBold
+ font_family = JetBrainsMono Nerd Font ExtraBold
position = 0, -250
halign = center
valign = top
diff --git a/config/hypr/hyprlock.conf b/config/hypr/hyprlock.conf
deleted file mode 100644
index 8c357d90..00000000
--- a/config/hypr/hyprlock.conf
+++ /dev/null
@@ -1,182 +0,0 @@
-# /* ---- 💫 https://github.com/LinuxBeginnings 💫 ---- */ #
-# Hyprlock config for => 2k monitor resolutions
-# Original config submitted by https://github.com/SherLock707
-
-# Sourcing colors generated by wallust
-source = $HOME/.config/hypr/wallust/wallust-hyprland.conf
-$Scripts = $HOME/.config/hypr/scripts
-
-general {
- fractional_scaling = 2
- immediate_render = true
-}
-
-background {
- monitor =
- # NOTE: use only 1 path
- #path = screenshot # screenshot of your desktop
- #path = $HOME/.config/hypr/wallpaper_effects/.wallpaper_modified # by wallpaper effects
- path = $HOME/.config/hypr/wallpaper_effects/.wallpaper_current # current wallpaper
-
- color = rgb(0,0,0) # color will be rendered initially until path is available
-
- # all these options are taken from hyprland, see https://wiki.hyprland.org/Configuring/Variables/#blur for explanations
- blur_size = 3
- blur_passes = 2 # 0 disables blurring
- noise = 0.0117
- contrast = 1.3000 # Vibrant!!!
- brightness = 0.8000
- vibrancy = 0.2100
- vibrancy_darkness = 0.0
-}
-
-
-# Date
-label {
- monitor =
- text = cmd[update:18000000] echo "<b> "$(date +'%A, %-d %B')" </b>"
- color = $color13
- font_size = 64
- font_family = Victor Mono Bold Italic
- position = 0, -20
- halign = center
- valign = center
-}
-
-# Hour-Time (single horizontal time like 1080p variant)
-label {
- monitor =
-# text = cmd[update:1000] echo "$(date +"%H:%M")" # 24h option
- text = cmd[update:1000] echo "$(date +"%I:%M %p")" # AM/PM
- #color = rgba(255, 185, 0, .8)
- color = $color8
- font_size = 173
- font_family = JetBrainsMono Nerd Font ExtraBold
- position = 0, -133
- halign = center
- valign = top
-}
-
-# Minute-Time (disabled; kept for reference)
-# label {
-# monitor =
-# text = cmd[update:1000] echo "$(date +"%M")"
-# #color = rgba(15, 10, 222, .8)
-# color = $color12
-# font_size = 240
-# font_family = JetBrainsMono Nerd Font ExtraBold
-# position = 0, -450
-# halign = center
-# valign = top
-# }
-
-# Seconds-Time (disabled; kept for reference)
-# label {
-# monitor =
-# text = cmd[update:1000] echo "$(date +"%S")"
-# # text = cmd[update:1000] echo "$(date +"%S %p")" #AM/PM
-# color = $color11
-# font_size = 50
-# font_family = JetBrainsMono Nerd Font ExtraBold
-# position = 0, -450
-# halign = center
-# valign = top
-# }
-
-# Put a picture of choice here. Default is the current wallpaper
-# image {
-# monitor =
-# #path = $HOME/.config/hypr/wallpaper_effects/.wallpaper_current
-# size = 160
-# rounding = -1
-# border_size = 0
-# border_color = $color11
-# rotate = 0
-# reload_time = -1
-# position = 0, 400
-# halign = center
-# valign = bottom
-# }
-
-# USER
-label {
- monitor =
- text =  $USER
- color = $color9
- font_size = 48
- font_family = Victor Mono Bold Oblique
- position = 0, 300
- halign = center
- valign = bottom
-}
-
-# INPUT FIELD
-input-field {
- monitor =
- size = 306, 93
- outline_thickness = 2
- dots_size = 0.2 # Scale of input-field height, 0.2 - 0.8
- dots_spacing = 0.2 # Scale of dots' absolute size, 0.0 - 1.0
- dots_center = true
- outer_color = $color8
- inner_color = rgba(255, 255, 255, 0.1)
- capslock_color = rgb(255,255,255)
- font_color = $color13
- fade_on_empty = false
- font_family = Victor Mono Bold Oblique
- placeholder_text = <i><span foreground="##ffffff99">🔒 Type Password</span></i>
- hide_input = false
- position = 0, 100
- halign = center
- valign = bottom
-}
-
-# Keyboard LAYOUT
-label {
- monitor =
- text = $LAYOUT
- color = $color8
- font_size = 19
- font_family = Victor Mono Bold Oblique
- position = 0, 53
- halign = center
- valign = bottom
-}
-
-# uptime
-label {
- monitor =
- text = cmd[update:60000] echo "<b> "$(uptime -p || $Scripts/UptimeNixOS.sh)" </b>"
- color = $color8
- font_size = 32
- font_family = Victor Mono Bold Oblique
- position = 0, 0
- halign = right
- valign = bottom
-}
-
-# battery information
-label {
- monitor =
- text = cmd[update:1000] echo "<b> "$($Scripts/Battery.sh)" </b>"
- color = $color8
- font_size = 21
- font_family = Victor Mono Bold Oblique
- position = 0, 40
- halign = right
- valign = bottom
-}
-
-# weather edit the scripts for locations
-# weather scripts are located in ~/.config/hypr/UserScripts Weather.sh and/or Weather.py
-# see https://github.com/LinuxBeginnings/Hyprland-Dots/wiki/TIPS#%EF%B8%8F-weather-app-related-for-waybar-and-hyprlock
-label {
- monitor =
- text = cmd[update:3600000] [ -f "$HOME/.cache/.weather_cache" ] && cat "$HOME/.cache/.weather_cache"
- color = $color8
- font_size = 19
- font_family = Victor Mono Bold Oblique
- position = 50, 0
- halign = left
- valign = bottom
-}
diff --git a/config/hypr/lua/settings.lua b/config/hypr/lua/settings.lua
index 2d57c181..5cab666f 100644
--- a/config/hypr/lua/settings.lua
+++ b/config/hypr/lua/settings.lua
@@ -159,7 +159,11 @@ hl.config({
hl.config({
cursor = {
sync_gsettings_theme = true,
+<<<<<<< HEAD
no_hardware_cursors = 0,
+=======
+ no_hardware_cursors = 0,
+>>>>>>> eb60d6f9 (Fixed wallpaper being reset (hopefully))
enable_hyprcursor = true,
warp_on_change_workspace = 2,
no_warps = true,
diff --git a/copy.sh b/copy.sh
index 7a01c4c2..0ed8e8ac 100755
--- a/copy.sh
+++ b/copy.sh
@@ -149,7 +149,46 @@ if ! declare -f capture_upgrade_runtime_selection_state >/dev/null 2>&1; then
capture_upgrade_runtime_selection_state() { :; }
fi
if ! declare -f capture_runtime_personal_state >/dev/null 2>&1; then
- capture_runtime_personal_state() { :; }
+ capture_runtime_personal_state() {
+ local log="${1:-/dev/null}"
+ local cfg_home="${XDG_CONFIG_HOME:-$HOME/.config}"
+ local cache_home="${XDG_CACHE_HOME:-$HOME/.cache}"
+ local rofi_link="$cfg_home/rofi/.current_wallpaper"
+ local wallpaper_current="$cfg_home/hypr/wallpaper_effects/.wallpaper_current"
+ local state_dir="$cache_home/kooldots-copy"
+ local state_file="$state_dir/wallpaper-current-$$"
+ local resolved=""
+
+ mkdir -p "$state_dir"
+
+ KOOLDOTS_RUNTIME_WALLPAPER_STATE_FILE="$state_file"
+ KOOLDOTS_RUNTIME_WALLPAPER_SOURCE=""
+ KOOLDOTS_RUNTIME_INITIAL_STARTUP_MARKER=0
+ export KOOLDOTS_RUNTIME_WALLPAPER_STATE_FILE KOOLDOTS_RUNTIME_WALLPAPER_SOURCE KOOLDOTS_RUNTIME_INITIAL_STARTUP_MARKER
+
+ if [ -f "$cfg_home/hypr/.initial_startup_done" ]; then
+ KOOLDOTS_RUNTIME_INITIAL_STARTUP_MARKER=1
+ export KOOLDOTS_RUNTIME_INITIAL_STARTUP_MARKER
+ fi
+
+ if [ -L "$rofi_link" ]; then
+ resolved="$(readlink -f "$rofi_link" 2>/dev/null || true)"
+ fi
+
+ if [ -n "$resolved" ] && [ -f "$resolved" ]; then
+ cp -f "$resolved" "$state_file" 2>/dev/null || true
+ KOOLDOTS_RUNTIME_WALLPAPER_SOURCE="$resolved"
+ export KOOLDOTS_RUNTIME_WALLPAPER_SOURCE
+ echo "${NOTE} Captured current wallpaper from rofi link: $resolved" 2>&1 | tee -a "$log"
+ elif [ -f "$wallpaper_current" ]; then
+ cp -f "$wallpaper_current" "$state_file" 2>/dev/null || true
+ KOOLDOTS_RUNTIME_WALLPAPER_SOURCE="$wallpaper_current"
+ export KOOLDOTS_RUNTIME_WALLPAPER_SOURCE
+ echo "${NOTE} Captured current wallpaper from $wallpaper_current" 2>&1 | tee -a "$log"
+ else
+ rm -f "$state_file" 2>/dev/null || true
+ fi
+ }
fi
if ! declare -f preserve_custom_sddm_configs >/dev/null 2>&1; then
preserve_custom_sddm_configs() { :; }
@@ -158,7 +197,35 @@ if ! declare -f restore_upgrade_runtime_selection_state >/dev/null 2>&1; then
restore_upgrade_runtime_selection_state() { :; }
fi
if ! declare -f restore_runtime_personal_state >/dev/null 2>&1; then
- restore_runtime_personal_state() { :; }
+ restore_runtime_personal_state() {
+ local log="${1:-/dev/null}"
+ local cfg_home="${XDG_CONFIG_HOME:-$HOME/.config}"
+ local wallpaper_current="$cfg_home/hypr/wallpaper_effects/.wallpaper_current"
+ local rofi_link="$cfg_home/rofi/.current_wallpaper"
+ local state_file="${KOOLDOTS_RUNTIME_WALLPAPER_STATE_FILE:-}"
+ local source_path="${KOOLDOTS_RUNTIME_WALLPAPER_SOURCE:-}"
+
+ if [ "${KOOLDOTS_RUNTIME_INITIAL_STARTUP_MARKER:-0}" -eq 1 ]; then
+ mkdir -p "$cfg_home/hypr"
+ touch "$cfg_home/hypr/.initial_startup_done" 2>/dev/null || true
+ fi
+
+ if [ -n "$state_file" ] && [ -f "$state_file" ]; then
+ mkdir -p "$(dirname "$wallpaper_current")" "$(dirname "$rofi_link")"
+ cp -f "$state_file" "$wallpaper_current" 2>/dev/null || true
+
+ if [ -n "$source_path" ] && [ -f "$source_path" ]; then
+ ln -snf "$source_path" "$rofi_link" 2>/dev/null || true
+ echo "${INFO} Runtime wallpaper source restored from: $source_path" 2>&1 | tee -a "$log"
+ else
+ ln -snf "$wallpaper_current" "$rofi_link" 2>/dev/null || true
+ echo "${INFO} Runtime wallpaper source restored from: $wallpaper_current" 2>&1 | tee -a "$log"
+ fi
+
+ echo "${OK} Restored runtime wallpaper state after copy." 2>&1 | tee -a "$log"
+ rm -f "$state_file" 2>/dev/null || true
+ fi
+ }
fi
# Ensure we operate from the dotfiles root so relative paths resolve.
@@ -907,7 +974,9 @@ wallust_args=()
if [ -f "$DOTFILES_DIR/config/hypr/scripts/WallustConfig.sh" ]; then
. "$DOTFILES_DIR/config/hypr/scripts/WallustConfig.sh"
fi
-if [ "$RUN_MODE" != "install" ] && [ "${KOOLDOTS_RUNTIME_THEME_RESTORED:-0}" -eq 1 ]; then
+if [ "$EXPRESS_MODE" -eq 1 ]; then
+ echo "${NOTE} Express upgrade selected: skipping wallust run entirely." 2>&1 | tee -a "$LOG"
+elif [ "$RUN_MODE" != "install" ] && [ "${KOOLDOTS_RUNTIME_THEME_RESTORED:-0}" -eq 1 ]; then
echo "${NOTE} Preserved existing Wallust/global theme colors from pre-upgrade state; skipping wallust regeneration." 2>&1 | tee -a "$LOG"
else
wallust "${wallust_args[@]}" run -s "$wallpaper" 2>&1 | tee -a "$LOG"
diff --git a/scripts/lib_copy.sh b/scripts/lib_copy.sh
index 1cb37fb7..d496f2d7 100644
--- a/scripts/lib_copy.sh
+++ b/scripts/lib_copy.sh
@@ -218,6 +218,10 @@ restore_hypr_assets() {
cp -r "$BACKUP_WALLPAPER_DIR" "$HYPR_DIR/" 2>&1 | tee -a "$log"
echo "${OK:-[OK]} - Restored directory: ${MAGENTA:-}wallpaper_effects${RESET:-}" 2>&1 | tee -a "$log"
fi
+ if [ -f "$BACKUP_HYPR_PATH/.initial_startup_done" ]; then
+ cp -f "$BACKUP_HYPR_PATH/.initial_startup_done" "$HYPR_DIR/.initial_startup_done" 2>&1 | tee -a "$log"
+ echo "${OK:-[OK]} - Preserved initial startup marker to avoid first-boot resets." 2>&1 | tee -a "$log"
+ fi
else
echo -e "\n${NOTE:-[NOTE]} Restoring ${SKY_BLUE:-}Animations & Monitor Profiles${RESET:-} into ${YELLOW:-}$HYPR_DIR${RESET:-}..."
send patches to the email below
yukais@pinapelz.com
include the subject [PATCH repo_name]
pinapelz.com
homepage