Compare commits
No commits in common. "0f4af24823b05fc4702426d5f059d655a9378eaa" and "2d0b6962faee4e709834493639bb4396fad55854" have entirely different histories.
0f4af24823
...
2d0b6962fa
7 changed files with 40 additions and 52 deletions
|
|
@ -98,8 +98,6 @@ pkill waybar && waybar &
|
||||||
|
|
||||||
## Future improvements
|
## Future improvements
|
||||||
|
|
||||||
- Correct laptop detection
|
|
||||||
- Optional groups
|
|
||||||
- Waybar switch script
|
- Waybar switch script
|
||||||
- A defaults system allowing you to easily choose your default programs
|
- A defaults system allowing you to easily choose your default programs
|
||||||
- Nvidia cards handling
|
- Nvidia cards handling
|
||||||
|
|
|
||||||
|
|
@ -111,26 +111,26 @@ animations {
|
||||||
animation = global, 1, 10, default
|
animation = global, 1, 10, default
|
||||||
animation = border, 1, 4, easeOutQuint
|
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 = windowsIn, 1, 3.1, easeOutQuint, popin 87%
|
||||||
animation = windowsOut, 1, 1.49, linear, popin 87%
|
animation = windowsOut, 1, 1.49, linear, popin 87%
|
||||||
|
|
||||||
animation = fadeIn, 1, 1.73, easeOutQuint
|
animation = fadeIn, 1, 1.73, almostLinear
|
||||||
animation = fadeOut, 1, 1.46, easeOutQuint
|
animation = fadeOut, 1, 1.46, almostLinear
|
||||||
animation = fade, 1, 3.03, easeOutQuint
|
animation = fade, 1, 3.03, quick
|
||||||
|
|
||||||
animation = layers, 1, 3, easeOutQuint
|
animation = layers, 1, 3.81, easeOutQuint
|
||||||
# animation = layersIn, 1, 2.4, easeOutQuint, popin 85%
|
animation = layersIn, 1, 3, easeOutQuint, popin 85%
|
||||||
# animation = layersOut, 1, 2.4, easeOutQuint, popin 85%
|
animation = layersOut, 1, 3, linear, popin
|
||||||
animation = layersIn, 1, 2.4, easeOutQuint, fade
|
# animation = fadeLayersIn, 1, 1.79, almostLinear
|
||||||
animation = layersOut, 1, 2.4, easeOutQuint, fade
|
# animation = fadeLayersOut, 1, 1.39, almostLinear
|
||||||
animation = fadeLayersIn, 1, 2, easeOutQuint
|
|
||||||
animation = fadeLayersOut, 1, 2, easeOutQuint
|
|
||||||
|
|
||||||
animation = workspaces, 1, 2.8 , easeOutQuint, slidefadevert
|
animation = workspaces, 1, 2.2 , easeOutQuint, slidefadevert
|
||||||
animation = workspacesIn, 1, 2.6, easeOutQuint, slide
|
animation = workspacesIn, 1, 3, easeOutQuint, slide
|
||||||
animation = workspacesOut, 1, 2.6, 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/
|
# Ref https://wiki.hyprland.org/Configuring/Workspace-Rules/
|
||||||
|
|
@ -145,6 +145,7 @@ animations {
|
||||||
|
|
||||||
# See https://wiki.hyprland.org/Configuring/Dwindle-Layout/ for more
|
# See https://wiki.hyprland.org/Configuring/Dwindle-Layout/ for more
|
||||||
dwindle {
|
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
|
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
|
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_hyprland_logo = true # If true disables the random hyprland logo / anime girl background. :(
|
||||||
disable_splash_rendering = true # Disable default wallpapers rendering
|
disable_splash_rendering = true # Disable default wallpapers rendering
|
||||||
|
vfr = true # Lower sent frames when idle
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -41,7 +41,7 @@ $mainMod = SUPER # Sets "Windows" key as main modifier
|
||||||
bind = $mainMod, Q, killactive,
|
bind = $mainMod, Q, killactive,
|
||||||
bind = $mainMod, R, exec, $menu # Omnibar
|
bind = $mainMod, R, exec, $menu # Omnibar
|
||||||
bind = $mainMod, D, exec, $menu # Legacy menu shortcut
|
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, B, exec, ~/.config/hypr/scripts/toggle-waybar.sh # Toggle sidebar
|
||||||
bind = $mainMod SHIFT, R, exec, ~/.config/hypr/scripts/reload.sh # Reload desktop
|
bind = $mainMod SHIFT, R, exec, ~/.config/hypr/scripts/reload.sh # Reload desktop
|
||||||
bind = $mainMod, F11, exec, ~/.config/hypr/scripts/game-mode.sh # Gamemode
|
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
|
bind = $mainMod, A, exec, $notificationManager
|
||||||
bindel = , XF86Launch1, exec, $terminal hx ~/.config/hypr/config # Replace by default editor
|
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
|
# Move focus with mainMod + arrow keys
|
||||||
bind = $mainMod, left, movefocus, l
|
bind = $mainMod, left, movefocus, l
|
||||||
bind = $mainMod, right, movefocus, r
|
bind = $mainMod, right, movefocus, r
|
||||||
|
|
@ -76,9 +70,9 @@ bind = $mainMod SHIFT, down, movewindow, d
|
||||||
|
|
||||||
# Layout
|
# Layout
|
||||||
bind = $mainMod, F, fullscreen,
|
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, T, togglefloating,
|
||||||
bind = $mainMod, Y, pseudo, # Toggle pseudo-tiling
|
bind = $mainMod, H, pseudo, # Toggle pseudo-tiling
|
||||||
|
|
||||||
# Switch workspaces with mainMod + [0-9]
|
# Switch workspaces with mainMod + [0-9]
|
||||||
bind = $mainMod, 1, workspace, 1
|
bind = $mainMod, 1, workspace, 1
|
||||||
|
|
|
||||||
|
|
@ -24,12 +24,12 @@ general {
|
||||||
input-field {
|
input-field {
|
||||||
monitor =
|
monitor =
|
||||||
size = 320, 55
|
size = 320, 55
|
||||||
outline_thickness = 2
|
outline_thickness = -1
|
||||||
dots_size = 0.2 # Scale of input-field height, 0.2 - 0.8
|
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_spacing = 0.2 # Scale of dots' absolute size, 0.0 - 1.0
|
||||||
dots_center = true
|
dots_center = true
|
||||||
outer_color = rgba(200, 200, 200, 0.4)
|
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)
|
font_color = rgb(200, 200, 200)
|
||||||
fade_on_empty = false
|
fade_on_empty = false
|
||||||
font_family = DejaVu Sans
|
font_family = DejaVu Sans
|
||||||
|
|
|
||||||
|
|
@ -142,14 +142,11 @@
|
||||||
},
|
},
|
||||||
"custom/battery_percentage": {
|
"custom/battery_percentage": {
|
||||||
"format": "{}",
|
"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
|
// 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) * 100 / 85 ))%",
|
|
||||||
"exec": "echo $(cat /sys/class/power_supply/BAT*/capacity)%",
|
|
||||||
|
|
||||||
"interval": 10,
|
"interval": 10,
|
||||||
"tooltip": false
|
"tooltip": false
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -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 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'
|
alias battery='cat /sys/class/power_supply/BAT1/capacity'
|
||||||
# Override some default commands with more practical alternatives
|
# 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 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'
|
alias tree='ls --level=3'
|
||||||
# Keep default commands accessible
|
# Keep default commands accessible
|
||||||
alias lsd='/usr/bin/ls --color'
|
alias lsd='/usr/bin/ls --color'
|
||||||
|
|
|
||||||
|
|
@ -544,12 +544,22 @@ install_packages() {
|
||||||
warn "Bulk install failed for group '${group}' — retrying per package"
|
warn "Bulk install failed for group '${group}' — retrying per package"
|
||||||
for pkg in "${pkgs[@]}"; do
|
for pkg in "${pkgs[@]}"; do
|
||||||
local tmp2; tmp2=$(mktemp)
|
local tmp2; tmp2=$(mktemp)
|
||||||
spinner_start " [${group}] $pkg"
|
if [[ $IS_TTY == true ]]; then
|
||||||
if pacman_install "$pkg" >"$tmp2" 2>&1; then
|
spinner_start " [${group}] $pkg"
|
||||||
|
if pacman_install "$pkg" >"$tmp2" 2>&1; then
|
||||||
spinner_stop ok "[${group}] $pkg"; succeeded+=("$pkg")
|
spinner_stop ok "[${group}] $pkg"; succeeded+=("$pkg")
|
||||||
else
|
else
|
||||||
spinner_stop fail "[${group}] $pkg"
|
spinner_stop fail "[${group}] $pkg"
|
||||||
warn "pacman output:"; cat "$tmp2" | indent; failed+=("$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
|
fi
|
||||||
rm -f "$tmp2"
|
rm -f "$tmp2"
|
||||||
done
|
done
|
||||||
|
|
@ -574,12 +584,7 @@ install_packages() {
|
||||||
|
|
||||||
# Build the set of groups that are handled specially so we can exclude them
|
# Build the set of groups that are handled specially so we can exclude them
|
||||||
# when iterating all .pkgs files for automatic groups.
|
# 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=("${HW_CPU}-cpu" "${HW_GPU}-gpu")
|
||||||
|
|
||||||
local hw_groups=(
|
|
||||||
intel-cpu amd-cpu
|
|
||||||
intel-gpu amd-gpu nvidia
|
|
||||||
)
|
|
||||||
local optional_group_names=()
|
local optional_group_names=()
|
||||||
local optional_file="$PACKAGES_DIR/optional.groups"
|
local optional_file="$PACKAGES_DIR/optional.groups"
|
||||||
if [[ -f $optional_file ]]; then
|
if [[ -f $optional_file ]]; then
|
||||||
|
|
@ -756,14 +761,6 @@ setup_waybar() {
|
||||||
enable_services() {
|
enable_services() {
|
||||||
phase "Enabling 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() {
|
enable_service() {
|
||||||
local svc="$1"
|
local svc="$1"
|
||||||
if systemctl is-enabled "$svc" &>/dev/null; then
|
if systemctl is-enabled "$svc" &>/dev/null; then
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue