aurora4ddf45c
change the order of installation, install everything with paru at the end
+71 −59
4 files changed
- M .config/hypr/source/appearance.conf +12 −14
- M .config/hypr/source/keybinds.conf +3 −7
- M README.md +3 −1
- M install.sh +53 −37
| @@ -4,7 +4,7 @@ general { | |||
| 4 | 4 | border_size = 2 | |
| 5 | 5 | resize_on_border = false | |
| 6 | 6 | allow_tearing = false | |
| 7 | − | # col.active_border = $color14 $color0 $color0 $color14 45deg | |
| 7 | + | # col.active_border = $color14 $color0 $color0 $color14 45deg # Gradient border | |
| 8 | 8 | col.active_border = $color14 $color14 $color14 $color14 45deg | |
| 9 | 9 | col.inactive_border = $color0 $color0 $color0 $color0 45deg | |
| 10 | 10 | layout = master | |
| @@ -14,21 +14,21 @@ decoration { | |||
| 14 | 14 | # rounding = 8 | |
| 15 | 15 | ||
| 16 | 16 | ||
| 17 | − | blur { | |
| 18 | − | enabled = false | |
| 19 | − | size = 3 | |
| 20 | − | passes = 1 | |
| 21 | − | } | |
| 22 | − | ||
| 23 | − | ||
| 24 | 17 | # blur { | |
| 25 | 18 | # enabled = true | |
| 26 | 19 | # size = 3 | |
| 27 | − | # passes = 3 | |
| 28 | − | # new_optimizations = true | |
| 29 | − | # vibrancy = 0.1696 | |
| 30 | − | # ignore_opacity = true | |
| 20 | + | # passes = 1 | |
| 31 | 21 | # } | |
| 22 | + | ||
| 23 | + | ||
| 24 | + | blur { | |
| 25 | + | enabled = true | |
| 26 | + | size = 3 | |
| 27 | + | passes = 3 | |
| 28 | + | new_optimizations = true | |
| 29 | + | vibrancy = 0.1696 | |
| 30 | + | ignore_opacity = true | |
| 31 | + | } | |
| 32 | 32 | } | |
| 33 | 33 | ||
| 34 | 34 | animations { | |
| @@ -70,10 +70,8 @@ misc { | |||
| 70 | 70 | force_default_wallpaper = -1 # Set to 0 or 1 to disable the anime mascot wallpapers | |
| 71 | 71 | disable_hyprland_logo = true# If true disables the random hyprland logo / anime girl background. :( | |
| 72 | 72 | disable_splash_rendering = true | |
| 73 | − | ||
| 74 | 73 | mouse_move_enables_dpms = true | |
| 75 | 74 | key_press_enables_dpms = true | |
| 76 | − | ||
| 77 | 75 | vrr = 0 # Disable adaptive sync | |
| 78 | 76 | } | |
| 79 | 77 | ||
| @@ -72,23 +72,20 @@ bind = $mainMod SHIFT, 0, split-movetoworkspacesilent, 10 | |||
| 72 | 72 | bind = $mainMod, S, togglespecialworkspace, magic | |
| 73 | 73 | bind = $mainMod SHIFT, S, movetoworkspace, special:magic | |
| 74 | 74 | ||
| 75 | − | # Have scratchpad like DWM | |
| 75 | + | # Scratchpad like DWM | |
| 76 | 76 | workspace = special:h, on-created-empty: $terminal | |
| 77 | 77 | bind = $mainMod SHIFT, Return, togglespecialworkspace, h | |
| 78 | 78 | ||
| 79 | − | # --- Screen Rotate --- | |
| 79 | + | # Screen Rotate | |
| 80 | 80 | bindld = CTRL ALT, R, Rotate Screen Clockwise, exec, hypr_screen_rotate.sh -90 | |
| 81 | 81 | bindld = CTRL ALT SHIFT, R, Rotate Screen Anti-Clockwise, exec, hypr_screen_rotate.sh +90 | |
| 82 | 82 | ||
| 83 | − | # --- Accessibility: Zoom --- | |
| 83 | + | # Accessibility: Zoom | |
| 84 | 84 | cursor:zoom_disable_aa = true | |
| 85 | − | ||
| 86 | 85 | # Zoom In | |
| 87 | 86 | 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}')\"" | |
| 88 | − | ||
| 89 | 87 | # Zoom Out | |
| 90 | 88 | 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}')\"" | |
| 91 | − | ||
| 92 | 89 | # Reset Zoom | |
| 93 | 90 | bindld = SUPER SHIFT, BACKSPACE, Reset Zoom, exec, hyprctl keyword cursor:zoom_factor 1.0 | |
| 94 | 91 | ||
| @@ -114,4 +111,3 @@ bindl = , XF86AudioNext, exec, playerctl next | |||
| 114 | 111 | bindl = , XF86AudioPause, exec, playerctl play-pause | |
| 115 | 112 | bindl = , XF86AudioPlay, exec, playerctl play-pause | |
| 116 | 113 | bindl = , XF86AudioPrev, exec, playerctl previous | |
| 117 | − | ||
| @@ -14,6 +14,8 @@ cd $HOME | |||
| 14 | 14 | git clone https://github.com/krolyxon/dotfiles.git ~/.dotfiles | |
| 15 | 15 | cd ~/.dotfiles | |
| 16 | 16 | ./install.sh | |
| 17 | − | # Installation with no confirmation prompts | |
| 17 | + | ||
| 18 | + | ## OR ## | |
| 19 | + | ## Use auto-yes (you won't be asked to select any packages, everything will be selected by default) | |
| 18 | 20 | ./install.sh --yes | |
| 19 | 21 | ``` | |
| @@ -174,6 +174,19 @@ else | |||
| 174 | 174 | gum_to_array GPU_PKGS < <(choose_packages pkg_gpu) | |
| 175 | 175 | fi | |
| 176 | 176 | ||
| 177 | + | ################## | |
| 178 | + | ## AUR PACKAGES ## | |
| 179 | + | ################## | |
| 180 | + | source "$currentDir/packages/pkg_aur.sh" | |
| 181 | + | prompt_style "Select AUR packages" | |
| 182 | + | ||
| 183 | + | if ((AUTO_YES)); then | |
| 184 | + | AUR_PKGS=("${pkg_aur[@]}") | |
| 185 | + | else | |
| 186 | + | gum_to_array AUR_PKGS < <(choose_packages pkg_aur) | |
| 187 | + | fi | |
| 188 | + | ||
| 189 | + | ||
| 177 | 190 | ||
| 178 | 191 | ########################## | |
| 179 | 192 | ## Configure Everything ## | |
| @@ -237,44 +250,8 @@ else | |||
| 237 | 250 | exit 1 | |
| 238 | 251 | fi | |
| 239 | 252 | ||
| 240 | − | ################## | |
| 241 | − | ## AUR PACKAGES ## | |
| 242 | − | ################## | |
| 243 | − | source "$currentDir/packages/pkg_aur.sh" | |
| 244 | − | prompt_style "Select AUR packages" | |
| 245 | − | ||
| 246 | − | if ((AUTO_YES)); then | |
| 247 | − | AUR_PKGS=("${pkg_aur[@]}") | |
| 248 | − | else | |
| 249 | − | gum_to_array AUR_PKGS < <(choose_packages pkg_aur) | |
| 250 | − | fi | |
| 251 | − | ||
| 252 | − | if ((${#AUR_PKGS[@]})); then | |
| 253 | − | if ! command -v paru >/dev/null 2>&1; then | |
| 254 | − | log INFO "Installing Paru (AUR package manager)" | |
| 255 | − | git clone https://aur.archlinux.org/paru.git | |
| 256 | − | (cd paru && makepkg -sri) | |
| 257 | − | rm -rf paru | |
| 258 | − | fi | |
| 259 | − | paru -S --needed "${AUR_PKGS[@]}" | |
| 260 | − | else | |
| 261 | − | log WARN "No AUR packages selected" | |
| 262 | − | fi | |
| 263 | 253 | ||
| 264 | 254 | ||
| 265 | − | ############################ | |
| 266 | − | ## Setup Keyd ## | |
| 267 | − | ############################ | |
| 268 | − | if command -v keyd >/dev/null 2>&1; then | |
| 269 | − | if confirm "Configure and enable keyd? "; then | |
| 270 | − | log INFO "Copying keyd configuration to /etc/keyd/default.conf" | |
| 271 | − | sudo cp "$currentDir/system/etc/keyd/default.conf" /etc/keyd/ | |
| 272 | − | sudo systemctl enable --now keyd.service \ | |
| 273 | − | && log SUCCESS "Successfully enabled keyd.service" \ | |
| 274 | − | || log ERROR "Couldn't enable keyd.service" | |
| 275 | − | fi | |
| 276 | − | fi | |
| 277 | − | ||
| 278 | 255 | ######################## | |
| 279 | 256 | ## Install Everything ## | |
| 280 | 257 | ######################## | |
| @@ -284,13 +261,23 @@ ALL_PKGS=( | |||
| 284 | 261 | "${OPTIONAL_PKGS[@]}" | |
| 285 | 262 | "${GPU_PKGS[@]}" | |
| 286 | 263 | "${UTILITY_PKGS[@]}" | |
| 264 | + | "${AUR_PKGS[@]}" | |
| 287 | 265 | "${pkg_desktop[@]}" | |
| 288 | 266 | ) | |
| 289 | 267 | ||
| 290 | 268 | if ((${#ALL_PKGS[@]})); then | |
| 291 | 269 | if confirm "Install all the selected packages?"; then | |
| 292 | 270 | log INFO "Installing selected packages..." | |
| 293 | − | if sudo pacman -Syu --needed "${ALL_PKGS[@]}"; then | |
| 271 | + | ||
| 272 | + | ## Installing paru if not installed already | |
| 273 | + | if ! command -v paru >/dev/null 2>&1; then | |
| 274 | + | log INFO "Installing Paru (AUR package manager)" | |
| 275 | + | git clone https://aur.archlinux.org/paru.git | |
| 276 | + | (cd paru && makepkg -sri) | |
| 277 | + | rm -rf paru | |
| 278 | + | fi | |
| 279 | + | ||
| 280 | + | if paru -Syu --needed "${ALL_PKGS[@]}"; then | |
| 294 | 281 | INSTALL_STATUS="complete" | |
| 295 | 282 | else | |
| 296 | 283 | INSTALL_STATUS="failed" | |
| @@ -305,6 +292,35 @@ else | |||
| 305 | 292 | fi | |
| 306 | 293 | ||
| 307 | 294 | ||
| 295 | + | ########################## | |
| 296 | + | ## Install AUR Packages ## | |
| 297 | + | ########################## | |
| 298 | + | if ((${#AUR_PKGS[@]})); then | |
| 299 | + | if ! command -v paru >/dev/null 2>&1; then | |
| 300 | + | log INFO "Installing Paru (AUR package manager)" | |
| 301 | + | git clone https://aur.archlinux.org/paru.git | |
| 302 | + | (cd paru && makepkg -sri) | |
| 303 | + | rm -rf paru | |
| 304 | + | fi | |
| 305 | + | paru -S --needed "${AUR_PKGS[@]}" | |
| 306 | + | else | |
| 307 | + | log WARN "No AUR packages selected" | |
| 308 | + | fi | |
| 309 | + | ||
| 310 | + | ################ | |
| 311 | + | ## Setup Keyd ## | |
| 312 | + | ################ | |
| 313 | + | if command -v keyd >/dev/null 2>&1; then | |
| 314 | + | if confirm "Configure and enable keyd? "; then | |
| 315 | + | log INFO "Copying keyd configuration to /etc/keyd/default.conf" | |
| 316 | + | sudo cp "$currentDir/system/etc/keyd/default.conf" /etc/keyd/ | |
| 317 | + | sudo systemctl enable --now keyd.service \ | |
| 318 | + | && log SUCCESS "Successfully enabled keyd.service" \ | |
| 319 | + | || log ERROR "Couldn't enable keyd.service" | |
| 320 | + | fi | |
| 321 | + | fi | |
| 322 | + | ||
| 323 | + | ||
| 308 | 324 | case "$INSTALL_STATUS" in | |
| 309 | 325 | complete) | |
| 310 | 326 | gum style \ | |