diff --git a/README.md b/README.md index a33443b..ab02470 100644 --- a/README.md +++ b/README.md @@ -98,8 +98,6 @@ pkill waybar && waybar & ## Future improvements -- Correct laptop detection -- Optional groups - Waybar switch script - A defaults system allowing you to easily choose your default programs - Nvidia cards handling diff --git a/config/.config/hypr/config/default/appearance.conf b/config/.config/hypr/config/default/appearance.conf index e6fa896..56edd75 100644 --- a/config/.config/hypr/config/default/appearance.conf +++ b/config/.config/hypr/config/default/appearance.conf @@ -111,26 +111,26 @@ animations { animation = global, 1, 10, default animation = border, 1, 4, easeOutQuint - animation = windows, 1, 3.5, easeOutQuint + animation = windows, 1, 3.79, easeOutQuint animation = windowsIn, 1, 3.1, easeOutQuint, popin 87% animation = windowsOut, 1, 1.49, linear, popin 87% - animation = fadeIn, 1, 1.73, easeOutQuint - animation = fadeOut, 1, 1.46, easeOutQuint - animation = fade, 1, 3.03, easeOutQuint + animation = fadeIn, 1, 1.73, almostLinear + animation = fadeOut, 1, 1.46, almostLinear + animation = fade, 1, 3.03, quick - animation = layers, 1, 3, easeOutQuint - # animation = layersIn, 1, 2.4, easeOutQuint, popin 85% - # animation = layersOut, 1, 2.4, easeOutQuint, popin 85% - animation = layersIn, 1, 2.4, easeOutQuint, fade - animation = layersOut, 1, 2.4, easeOutQuint, fade - animation = fadeLayersIn, 1, 2, easeOutQuint - animation = fadeLayersOut, 1, 2, easeOutQuint + animation = layers, 1, 3.81, easeOutQuint + animation = layersIn, 1, 3, easeOutQuint, popin 85% + animation = layersOut, 1, 3, linear, popin + # animation = fadeLayersIn, 1, 1.79, almostLinear + # animation = fadeLayersOut, 1, 1.39, almostLinear - animation = workspaces, 1, 2.8 , easeOutQuint, slidefadevert - animation = workspacesIn, 1, 2.6, easeOutQuint, slide - animation = workspacesOut, 1, 2.6, easeOutQuint, slide + animation = workspaces, 1, 2.2 , easeOutQuint, slidefadevert + animation = workspacesIn, 1, 3, easeOutQuint, slide + animation = workspacesOut, 1, 3, easeOutQuint, slide + # animation = workspacesIn, 1, 3, easeOutQuint, slidefade + # animation = workspacesOut, 1, 5, easeOutQuint, slidefade } # Ref https://wiki.hyprland.org/Configuring/Workspace-Rules/ @@ -145,6 +145,7 @@ animations { # See https://wiki.hyprland.org/Configuring/Dwindle-Layout/ for more dwindle { + pseudotile = true # Master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below preserve_split = true # You probably want this } @@ -158,6 +159,7 @@ misc { force_default_wallpaper = 0 # 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_splash_rendering = true # Disable default wallpapers rendering + vfr = true # Lower sent frames when idle } diff --git a/config/.config/hypr/config/default/input.conf b/config/.config/hypr/config/default/input.conf index 29406ed..0c076c1 100644 --- a/config/.config/hypr/config/default/input.conf +++ b/config/.config/hypr/config/default/input.conf @@ -41,7 +41,7 @@ $mainMod = SUPER # Sets "Windows" key as main modifier bind = $mainMod, Q, killactive, bind = $mainMod, R, exec, $menu # Omnibar bind = $mainMod, D, exec, $menu # Legacy menu shortcut -bind = $mainMod, I, exec, hyprlock # Lockscreen +bind = $mainMod, L, exec, hyprlock # Lockscreen bind = $mainMod, B, exec, ~/.config/hypr/scripts/toggle-waybar.sh # Toggle sidebar bind = $mainMod SHIFT, R, exec, ~/.config/hypr/scripts/reload.sh # Reload desktop bind = $mainMod, F11, exec, ~/.config/hypr/scripts/game-mode.sh # Gamemode @@ -56,12 +56,6 @@ bind = $mainMod, E, exec, $fileManager bind = $mainMod, A, exec, $notificationManager bindel = , XF86Launch1, exec, $terminal hx ~/.config/hypr/config # Replace by default editor -# Move focus with mainMod + hjkl (vim keybinds) -bind = $mainMod, H, movefocus, l -bind = $mainMod, L, movefocus, r -bind = $mainMod, K, movefocus, u -bind = $mainMod, J, movefocus, d - # Move focus with mainMod + arrow keys bind = $mainMod, left, movefocus, l bind = $mainMod, right, movefocus, r @@ -76,9 +70,9 @@ bind = $mainMod SHIFT, down, movewindow, d # Layout bind = $mainMod, F, fullscreen, -bindd = $mainMod, V, $d toggle split, layoutmsg, togglesplit # Horizontal/vertical split +bind = $mainMod, V, togglesplit, # Horizontal/vertical split bind = $mainMod, T, togglefloating, -bind = $mainMod, Y, pseudo, # Toggle pseudo-tiling +bind = $mainMod, H, pseudo, # Toggle pseudo-tiling # Switch workspaces with mainMod + [0-9] bind = $mainMod, 1, workspace, 1 diff --git a/config/.config/hypr/hyprlock.conf b/config/.config/hypr/hyprlock.conf index 532a40d..d79c7bc 100644 --- a/config/.config/hypr/hyprlock.conf +++ b/config/.config/hypr/hyprlock.conf @@ -24,12 +24,12 @@ general { input-field { monitor = size = 320, 55 - outline_thickness = 2 + outline_thickness = -1 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 = rgba(200, 200, 200, 0.4) - inner_color = rgba(100, 114, 125, 0) + inner_color = rgba(100, 114, 125, 1) font_color = rgb(200, 200, 200) fade_on_empty = false font_family = DejaVu Sans diff --git a/config/.config/waybar/horizontal/config.jsonc b/config/.config/waybar/horizontal/config.jsonc index 20b7b8d..b24f6cd 100644 --- a/config/.config/waybar/horizontal/config.jsonc +++ b/config/.config/waybar/horizontal/config.jsonc @@ -142,14 +142,11 @@ }, "custom/battery_percentage": { "format": "{}", + //"exec": "cat /sys/class/power_supply/BAT*/capacity", - // The first "exec" line makes battery like if 85% was the maximum capacity (100%). + // Makes battery like if 85% was the maximum capacity (100%). // Useful for people that limit charge up to a certain percentage but like having real percentage - // The second behaves normally, just comment the one you don't want - - // "exec": "echo $(( $(cat /sys/class/power_supply/BAT*/capacity) * 100 / 85 ))%", - "exec": "echo $(cat /sys/class/power_supply/BAT*/capacity)%", - + "exec": "echo $(( $(cat /sys/class/power_supply/BAT*/capacity) * 100 / 85 ))%", "interval": 10, "tooltip": false }, diff --git a/config/.zshrc b/config/.zshrc index df740db..f4c2e6b 100644 --- a/config/.zshrc +++ b/config/.zshrc @@ -86,9 +86,9 @@ alias icat='kitten icat' alias power-draw="cat /sys/class/power_supply/BAT1/current_now /sys/class/power_supply/BAT1/voltage_now | xargs | awk '{print \$1*\$2/1e12 \" W\"}\'" alias battery='cat /sys/class/power_supply/BAT1/capacity' # Override some default commands with more practical alternatives -alias ls='eza --icons=automatic --tree --level=1 --follow-symlinks --no-quotes --sort=modified' +alias ls='eza --icons=automatic --tree --level=1 --follow-symlinks --no-quotes' alias lsa='ls -a' -alias lsl='eza --icons=automatic --long --header --group -M --sort=modified' +alias lsl='eza --icons=automatic --long --header --group -M' alias tree='ls --level=3' # Keep default commands accessible alias lsd='/usr/bin/ls --color' diff --git a/scripts/install.sh b/scripts/install.sh index 00bda54..e4b1cfc 100644 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -544,12 +544,22 @@ install_packages() { warn "Bulk install failed for group '${group}' — retrying per package" for pkg in "${pkgs[@]}"; do local tmp2; tmp2=$(mktemp) - spinner_start " [${group}] $pkg" - if pacman_install "$pkg" >"$tmp2" 2>&1; then + if [[ $IS_TTY == true ]]; then + spinner_start " [${group}] $pkg" + if pacman_install "$pkg" >"$tmp2" 2>&1; then spinner_stop ok "[${group}] $pkg"; succeeded+=("$pkg") - else + else spinner_stop fail "[${group}] $pkg" warn "pacman output:"; cat "$tmp2" | indent; failed+=("$pkg") + fi + else + printf " ... [%s] %s\n" "$group" "$pkg" + if pacman_install "$pkg" >"$tmp2" 2>&1; then + ok "[${group}] $pkg"; succeeded+=("$pkg") + else + err "[${group}] $pkg" + warn "pacman output:"; cat "$tmp2" | indent; failed+=("$pkg") + fi fi rm -f "$tmp2" done @@ -574,12 +584,7 @@ install_packages() { # Build the set of groups that are handled specially so we can exclude them # when iterating all .pkgs files for automatic groups. - # Here we add all known hardware group names. The unnecessary ones will be excluded - - local hw_groups=( - intel-cpu amd-cpu - intel-gpu amd-gpu nvidia - ) + local hw_groups=("${HW_CPU}-cpu" "${HW_GPU}-gpu") local optional_group_names=() local optional_file="$PACKAGES_DIR/optional.groups" if [[ -f $optional_file ]]; then @@ -756,14 +761,6 @@ setup_waybar() { enable_services() { phase "Enabling services" - # Check systemd presence - which systemctl - if [ "$?" -ne 0 ]; then - warn "Systemd is not installed, skipping services activation" - info "You'll have to manually enable needed services" - return - fi - enable_service() { local svc="$1" if systemctl is-enabled "$svc" &>/dev/null; then