change the order of installation, install everything with paru at the end
This commit is contained in:
parent
f96621a788
commit
4ddf45c07f
|
|
@ -4,7 +4,7 @@ general {
|
||||||
border_size = 2
|
border_size = 2
|
||||||
resize_on_border = false
|
resize_on_border = false
|
||||||
allow_tearing = false
|
allow_tearing = false
|
||||||
# col.active_border = $color14 $color0 $color0 $color14 45deg
|
# col.active_border = $color14 $color0 $color0 $color14 45deg # Gradient border
|
||||||
col.active_border = $color14 $color14 $color14 $color14 45deg
|
col.active_border = $color14 $color14 $color14 $color14 45deg
|
||||||
col.inactive_border = $color0 $color0 $color0 $color0 45deg
|
col.inactive_border = $color0 $color0 $color0 $color0 45deg
|
||||||
layout = master
|
layout = master
|
||||||
|
|
@ -14,21 +14,21 @@ decoration {
|
||||||
# rounding = 8
|
# rounding = 8
|
||||||
|
|
||||||
|
|
||||||
blur {
|
|
||||||
enabled = false
|
|
||||||
size = 3
|
|
||||||
passes = 1
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
# blur {
|
# blur {
|
||||||
# enabled = true
|
# enabled = true
|
||||||
# size = 3
|
# size = 3
|
||||||
# passes = 3
|
# passes = 1
|
||||||
# new_optimizations = true
|
|
||||||
# vibrancy = 0.1696
|
|
||||||
# ignore_opacity = true
|
|
||||||
# }
|
# }
|
||||||
|
|
||||||
|
|
||||||
|
blur {
|
||||||
|
enabled = true
|
||||||
|
size = 3
|
||||||
|
passes = 3
|
||||||
|
new_optimizations = true
|
||||||
|
vibrancy = 0.1696
|
||||||
|
ignore_opacity = true
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
animations {
|
animations {
|
||||||
|
|
@ -70,10 +70,8 @@ misc {
|
||||||
force_default_wallpaper = -1 # Set to 0 or 1 to disable the anime mascot wallpapers
|
force_default_wallpaper = -1 # Set to 0 or 1 to disable the anime mascot wallpapers
|
||||||
disable_hyprland_logo = true# If true disables the random hyprland logo / anime girl background. :(
|
disable_hyprland_logo = true# If true disables the random hyprland logo / anime girl background. :(
|
||||||
disable_splash_rendering = true
|
disable_splash_rendering = true
|
||||||
|
|
||||||
mouse_move_enables_dpms = true
|
mouse_move_enables_dpms = true
|
||||||
key_press_enables_dpms = true
|
key_press_enables_dpms = true
|
||||||
|
|
||||||
vrr = 0 # Disable adaptive sync
|
vrr = 0 # Disable adaptive sync
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -72,23 +72,20 @@ bind = $mainMod SHIFT, 0, split-movetoworkspacesilent, 10
|
||||||
bind = $mainMod, S, togglespecialworkspace, magic
|
bind = $mainMod, S, togglespecialworkspace, magic
|
||||||
bind = $mainMod SHIFT, S, movetoworkspace, special:magic
|
bind = $mainMod SHIFT, S, movetoworkspace, special:magic
|
||||||
|
|
||||||
# Have scratchpad like DWM
|
# Scratchpad like DWM
|
||||||
workspace = special:h, on-created-empty: $terminal
|
workspace = special:h, on-created-empty: $terminal
|
||||||
bind = $mainMod SHIFT, Return, togglespecialworkspace, h
|
bind = $mainMod SHIFT, Return, togglespecialworkspace, h
|
||||||
|
|
||||||
# --- Screen Rotate ---
|
# Screen Rotate
|
||||||
bindld = CTRL ALT, R, Rotate Screen Clockwise, exec, hypr_screen_rotate.sh -90
|
bindld = CTRL ALT, R, Rotate Screen Clockwise, exec, hypr_screen_rotate.sh -90
|
||||||
bindld = CTRL ALT SHIFT, R, Rotate Screen Anti-Clockwise, exec, hypr_screen_rotate.sh +90
|
bindld = CTRL ALT SHIFT, R, Rotate Screen Anti-Clockwise, exec, hypr_screen_rotate.sh +90
|
||||||
|
|
||||||
# --- Accessibility: Zoom ---
|
# Accessibility: Zoom
|
||||||
cursor:zoom_disable_aa = true
|
cursor:zoom_disable_aa = true
|
||||||
|
|
||||||
# Zoom In
|
# Zoom In
|
||||||
binded = SUPER SHIFT, equal, Zoom In, exec, sh -c "hyprctl keyword cursor:zoom_factor \"$(hyprctl getoption cursor:zoom_factor | awk 'NR==1 {print $2 * 1.25}')\""
|
binded = SUPER SHIFT, equal, Zoom In, exec, sh -c "hyprctl keyword cursor:zoom_factor \"$(hyprctl getoption cursor:zoom_factor | awk 'NR==1 {print $2 * 1.25}')\""
|
||||||
|
|
||||||
# Zoom Out
|
# Zoom Out
|
||||||
binded = SUPER SHIFT, minus, Zoom Out, exec, sh -c "hyprctl keyword cursor:zoom_factor \"$(hyprctl getoption cursor:zoom_factor | awk 'NR==1 {val = $2 / 1.25; if (val < 1.0) val = 1.0; print val}')\""
|
binded = SUPER SHIFT, minus, Zoom Out, exec, sh -c "hyprctl keyword cursor:zoom_factor \"$(hyprctl getoption cursor:zoom_factor | awk 'NR==1 {val = $2 / 1.25; if (val < 1.0) val = 1.0; print val}')\""
|
||||||
|
|
||||||
# Reset Zoom
|
# Reset Zoom
|
||||||
bindld = SUPER SHIFT, BACKSPACE, Reset Zoom, exec, hyprctl keyword cursor:zoom_factor 1.0
|
bindld = SUPER SHIFT, BACKSPACE, Reset Zoom, exec, hyprctl keyword cursor:zoom_factor 1.0
|
||||||
|
|
||||||
|
|
@ -114,4 +111,3 @@ bindl = , XF86AudioNext, exec, playerctl next
|
||||||
bindl = , XF86AudioPause, exec, playerctl play-pause
|
bindl = , XF86AudioPause, exec, playerctl play-pause
|
||||||
bindl = , XF86AudioPlay, exec, playerctl play-pause
|
bindl = , XF86AudioPlay, exec, playerctl play-pause
|
||||||
bindl = , XF86AudioPrev, exec, playerctl previous
|
bindl = , XF86AudioPrev, exec, playerctl previous
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -14,6 +14,8 @@ cd $HOME
|
||||||
git clone https://github.com/krolyxon/dotfiles.git ~/.dotfiles
|
git clone https://github.com/krolyxon/dotfiles.git ~/.dotfiles
|
||||||
cd ~/.dotfiles
|
cd ~/.dotfiles
|
||||||
./install.sh
|
./install.sh
|
||||||
# Installation with no confirmation prompts
|
|
||||||
|
## OR ##
|
||||||
|
## Use auto-yes (you won't be asked to select any packages, everything will be selected by default)
|
||||||
./install.sh --yes
|
./install.sh --yes
|
||||||
```
|
```
|
||||||
|
|
|
||||||
98
install.sh
98
install.sh
|
|
@ -174,6 +174,19 @@ else
|
||||||
gum_to_array GPU_PKGS < <(choose_packages pkg_gpu)
|
gum_to_array GPU_PKGS < <(choose_packages pkg_gpu)
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
##################
|
||||||
|
## AUR PACKAGES ##
|
||||||
|
##################
|
||||||
|
source "$currentDir/packages/pkg_aur.sh"
|
||||||
|
prompt_style "Select AUR packages"
|
||||||
|
|
||||||
|
if ((AUTO_YES)); then
|
||||||
|
AUR_PKGS=("${pkg_aur[@]}")
|
||||||
|
else
|
||||||
|
gum_to_array AUR_PKGS < <(choose_packages pkg_aur)
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
##########################
|
##########################
|
||||||
## Configure Everything ##
|
## Configure Everything ##
|
||||||
|
|
@ -237,18 +250,51 @@ else
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
##################
|
|
||||||
## AUR PACKAGES ##
|
|
||||||
##################
|
|
||||||
source "$currentDir/packages/pkg_aur.sh"
|
|
||||||
prompt_style "Select AUR packages"
|
|
||||||
|
|
||||||
if ((AUTO_YES)); then
|
|
||||||
AUR_PKGS=("${pkg_aur[@]}")
|
########################
|
||||||
else
|
## Install Everything ##
|
||||||
gum_to_array AUR_PKGS < <(choose_packages pkg_aur)
|
########################
|
||||||
|
source "$currentDir/packages/pkg_desktop.sh"
|
||||||
|
ALL_PKGS=(
|
||||||
|
"${DEV_PKGS[@]}"
|
||||||
|
"${OPTIONAL_PKGS[@]}"
|
||||||
|
"${GPU_PKGS[@]}"
|
||||||
|
"${UTILITY_PKGS[@]}"
|
||||||
|
"${AUR_PKGS[@]}"
|
||||||
|
"${pkg_desktop[@]}"
|
||||||
|
)
|
||||||
|
|
||||||
|
if ((${#ALL_PKGS[@]})); then
|
||||||
|
if confirm "Install all the selected packages?"; then
|
||||||
|
log INFO "Installing selected packages..."
|
||||||
|
|
||||||
|
## Installing paru if not installed already
|
||||||
|
if ! command -v paru >/dev/null 2>&1; then
|
||||||
|
log INFO "Installing Paru (AUR package manager)"
|
||||||
|
git clone https://aur.archlinux.org/paru.git
|
||||||
|
(cd paru && makepkg -sri)
|
||||||
|
rm -rf paru
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if paru -Syu --needed "${ALL_PKGS[@]}"; then
|
||||||
|
INSTALL_STATUS="complete"
|
||||||
|
else
|
||||||
|
INSTALL_STATUS="failed"
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
log WARN "Package installation skipped by user"
|
||||||
|
INSTALL_STATUS="partial"
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
log WARN "No packages selected"
|
||||||
|
INSTALL_STATUS="partial"
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
##########################
|
||||||
|
## Install AUR Packages ##
|
||||||
|
##########################
|
||||||
if ((${#AUR_PKGS[@]})); then
|
if ((${#AUR_PKGS[@]})); then
|
||||||
if ! command -v paru >/dev/null 2>&1; then
|
if ! command -v paru >/dev/null 2>&1; then
|
||||||
log INFO "Installing Paru (AUR package manager)"
|
log INFO "Installing Paru (AUR package manager)"
|
||||||
|
|
@ -261,10 +307,9 @@ else
|
||||||
log WARN "No AUR packages selected"
|
log WARN "No AUR packages selected"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
################
|
||||||
############################
|
|
||||||
## Setup Keyd ##
|
## Setup Keyd ##
|
||||||
############################
|
################
|
||||||
if command -v keyd >/dev/null 2>&1; then
|
if command -v keyd >/dev/null 2>&1; then
|
||||||
if confirm "Configure and enable keyd? "; then
|
if confirm "Configure and enable keyd? "; then
|
||||||
log INFO "Copying keyd configuration to /etc/keyd/default.conf"
|
log INFO "Copying keyd configuration to /etc/keyd/default.conf"
|
||||||
|
|
@ -275,35 +320,6 @@ if command -v keyd >/dev/null 2>&1; then
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
########################
|
|
||||||
## Install Everything ##
|
|
||||||
########################
|
|
||||||
source "$currentDir/packages/pkg_desktop.sh"
|
|
||||||
ALL_PKGS=(
|
|
||||||
"${DEV_PKGS[@]}"
|
|
||||||
"${OPTIONAL_PKGS[@]}"
|
|
||||||
"${GPU_PKGS[@]}"
|
|
||||||
"${UTILITY_PKGS[@]}"
|
|
||||||
"${pkg_desktop[@]}"
|
|
||||||
)
|
|
||||||
|
|
||||||
if ((${#ALL_PKGS[@]})); then
|
|
||||||
if confirm "Install all the selected packages?"; then
|
|
||||||
log INFO "Installing selected packages..."
|
|
||||||
if sudo pacman -Syu --needed "${ALL_PKGS[@]}"; then
|
|
||||||
INSTALL_STATUS="complete"
|
|
||||||
else
|
|
||||||
INSTALL_STATUS="failed"
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
log WARN "Package installation skipped by user"
|
|
||||||
INSTALL_STATUS="partial"
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
log WARN "No packages selected"
|
|
||||||
INSTALL_STATUS="partial"
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
case "$INSTALL_STATUS" in
|
case "$INSTALL_STATUS" in
|
||||||
complete)
|
complete)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue