From ad3090d16136744cb37dd1a56b18193174b37e32 Mon Sep 17 00:00:00 2001 From: Donovan Glover Date: Fri, 12 May 2023 01:43:32 -0400 Subject: [PATCH] hyprland: Simplify config Less is more. --- hyprland/.config/hypr/gamemode.sh | 16 ---- hyprland/.config/hypr/hyprland.conf | 117 +++++++++------------------- 2 files changed, 38 insertions(+), 95 deletions(-) delete mode 100755 hyprland/.config/hypr/gamemode.sh diff --git a/hyprland/.config/hypr/gamemode.sh b/hyprland/.config/hypr/gamemode.sh deleted file mode 100755 index 6f53f22b..00000000 --- a/hyprland/.config/hypr/gamemode.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/usr/bin/env sh -# NOTE: This script was taken from the Hyprland wiki -# TODO: Integrate hyprctl commands into your own workflow. -HYPRGAMEMODE=$(hyprctl getoption animations:enabled | sed -n '2p' | awk '{print $2}') -if [ $HYPRGAMEMODE = 1 ] ; then - hyprctl --batch "\ - keyword animations:enabled 0;\ - keyword decoration:drop_shadow 0;\ - keyword decoration:blur 0;\ - keyword general:gaps_in 0;\ - keyword general:gaps_out 0;\ - keyword general:border_size 1;\ - keyword decoration:rounding 0" - exit -fi -hyprctl reload diff --git a/hyprland/.config/hypr/hyprland.conf b/hyprland/.config/hypr/hyprland.conf index 94e4b2e6..30307410 100644 --- a/hyprland/.config/hypr/hyprland.conf +++ b/hyprland/.config/hypr/hyprland.conf @@ -1,12 +1,12 @@ -# Change the scale of the monitor -monitor=eDP-1,preferred,auto,1 - -# Make it easy to plug in other monitors +env=XCURSOR_SIZE,24 +env=BROWSER,librewolf +env=GTK_IM_MODULE,fcitx +env=QT_IM_MODULE,fcitx +env=XMODIFIERS,@im=fcitx +env=SDL_IM_MODULE,fcitx +env=GLFW_IM_MODULE,ibus monitor=,preferred,auto,1 -#monitor=,highrr,auto,1 # Use the highest refresh rate -#monitor=,highres,auto,1 # Use the highest resolution -# Execute your favorite apps at launch exec-once = swaybg --mode fill --image "$(fd -d 1 wallpaper.png /nix/store/)" exec-once = wpctl set-volume @DEFAULT_AUDIO_SINK@ 20% exec-once = sleep 0.5 && waybar @@ -14,71 +14,56 @@ exec-once = fcitx5 # Japanese input support exec-once = mullvad-vpn exec-once = wl-paste -p --watch wl-copy -pc # Disable middle click paste exec-once = udiskie # Auto-mount drives -# exec-once = hyprland-autoname-workspaces --dedup -# exec-once = play ~/start.flac - -# Some default env vars. -env = XCURSOR_SIZE,24 -env = BROWSER,librewolf -env = GTK_IM_MODULE,fcitx -env = QT_IM_MODULE,fcitx -env = XMODIFIERS,@im=fcitx -env = SDL_IM_MODULE,fcitx -env = GLFW_IM_MODULE,ibus input { kb_layout = us accel_profile = flat - follow_mouse = 1 - + sensitivity = 0 touchpad { natural_scroll = yes disable_while_typing = no } - - sensitivity = 0 # -1.0 - 1.0, 0 means no modification. } general { - gaps_in = 0 - gaps_out = 0 - border_size = 1 - col.active_border = rgba(33ccffee) rgba(00ff99ee) 45deg - col.inactive_border = rgba(595959aa) - layout = master - resize_on_border = yes + gaps_in = 0 + gaps_out = 0 + border_size = 1 + col.active_border = rgba(33ccffee) rgba(00ff99ee) 45deg + col.inactive_border = rgba(595959aa) + layout = master + resize_on_border = yes } decoration { - rounding = 0 - blur = yes - #inactive_opacity = 0.3 - blur_size = 3 - blur_passes = 1 - blur_new_optimizations = yes - drop_shadow = yes - shadow_range = 4 - shadow_render_power = 3 - col.shadow = rgba(1a1a1aee) + rounding = 0 + blur = yes + blur_size = 3 + blur_passes = 1 + blur_new_optimizations = yes + drop_shadow = yes + shadow_range = 4 + shadow_render_power = 3 + col.shadow = rgba(1a1a1aee) } animations { - enabled = yes - bezier = myBezier, 0.05, 0.9, 0.1, 1.05 - animation = windows, 1, 7, myBezier - animation = windowsOut, 1, 7, default, popin 80% - animation = border, 1, 10, default - animation = borderangle, 1, 8, default - animation = fade, 1, 7, default - animation = workspaces, 1, 6, default - animation = specialWorkspace, 1, 6, default + enabled = yes + bezier = myBezier, 0.05, 0.9, 0.1, 1.05 + animation = windows, 1, 7, myBezier + animation = windowsOut, 1, 7, default, popin 80% + animation = border, 1, 10, default + animation = borderangle, 1, 8, default + animation = fade, 1, 7, default + animation = workspaces, 1, 6, default + animation = specialWorkspace, 1, 6, default } dwindle { - preserve_split = yes - no_gaps_when_only = yes - special_scale_factor = 0.95 + preserve_split = yes + no_gaps_when_only = yes + special_scale_factor = 0.95 } master { @@ -101,13 +86,10 @@ device:synps/2-synaptics-touchpad { } device:tpps/2-elan-trackpoint { - sensitivity = 0.5 - accel_profile = flat + sensitivity = 0.5 + accel_profile = flat } -bind = SUPER, Z, exec, rofi -show -bind = SUPER_SHIFT, Z, workspace, empty -bind = SUPER_SHIFT, Z, exec, rofi -show bind = SUPER_SHIFT, Return, exec, kitty bind = SUPER, Tab, workspace, e+1 bind = SUPER_SHIFT, Tab, workspace, e-1 @@ -143,42 +125,21 @@ bind = SUPER, L, layoutmsg, removemaster bind = SUPER_SHIFT, H, splitratio, -0.05 bind = SUPER_SHIFT, L, splitratio, +0.05 -# Switch workspaces with super + [0-9] bind = SUPER, 1, workspace, 1 bind = SUPER, 2, workspace, 2 bind = SUPER, 3, workspace, 3 bind = SUPER, 4, workspace, 4 bind = SUPER, 5, workspace, 5 -bind = SUPER, 6, workspace, 6 -bind = SUPER, 7, workspace, 7 -bind = SUPER, 8, workspace, 8 -bind = SUPER, 9, workspace, 9 -bind = SUPER, 0, workspace, 10 - -# Move active window to a workspace with super + shift + [0-9] bind = SUPER_SHIFT, 1, movetoworkspace, 1 bind = SUPER_SHIFT, 2, movetoworkspace, 2 bind = SUPER_SHIFT, 3, movetoworkspace, 3 bind = SUPER_SHIFT, 4, movetoworkspace, 4 bind = SUPER_SHIFT, 5, movetoworkspace, 5 -bind = SUPER_SHIFT, 6, movetoworkspace, 6 -bind = SUPER_SHIFT, 7, movetoworkspace, 7 -bind = SUPER_SHIFT, 8, movetoworkspace, 8 -bind = SUPER_SHIFT, 9, movetoworkspace, 9 -bind = SUPER_SHIFT, 0, movetoworkspace, 10 - -# Toggle workspaces with super + ctrl + [0-9] -# TODO: Use 0 to show windows in all workspaces bind = SUPER_CTRL, 1, exec, ~/.config/hypr/tags.sh 1 bind = SUPER_CTRL, 2, exec, ~/.config/hypr/tags.sh 2 bind = SUPER_CTRL, 3, exec, ~/.config/hypr/tags.sh 3 bind = SUPER_CTRL, 4, exec, ~/.config/hypr/tags.sh 4 bind = SUPER_CTRL, 5, exec, ~/.config/hypr/tags.sh 5 -bind = SUPER_CTRL, 6, exec, ~/.config/hypr/tags.sh 6 -bind = SUPER_CTRL, 7, exec, ~/.config/hypr/tags.sh 7 -bind = SUPER_CTRL, 8, exec, ~/.config/hypr/tags.sh 8 -bind = SUPER_CTRL, 9, exec, ~/.config/hypr/tags.sh 9 -bind = SUPER_CTRL, 0, exec, ~/.config/hypr/tags.sh 10 layerrule = blur,waybar @@ -198,8 +159,6 @@ bindl=, XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%- && bindl=, XF86MonBrightnessDown, exec, brightnessctl set 5%- && notify-send -t 2000 "Decreased brightness to" "$(brightnessctl get)" bindl=, XF86MonBrightnessUp, exec, brightnessctl set +5% && notify-send -t 2000 "Increased brightness to" "$(brightnessctl get)" -bind = WIN, F1, exec, ~/.config/hypr/gamemode.sh - misc { disable_hyprland_logo = yes animate_mouse_windowdragging = yes