diff --git a/.config/X11/xinitrc b/.config/X11/xinitrc index fcb46b2..c470194 100644 --- a/.config/X11/xinitrc +++ b/.config/X11/xinitrc @@ -58,6 +58,7 @@ xserverauthfile=$XAUTHORITY # Stop the accumulation of ~/.serverauth.### files # read the *_IM_MODULE and XMODIFIER variables. source ~/.config/zsh/.zshenv autorandr -c -d "default" +export TERMINAL=/usr/local/bin/st # Start important daemons kill $(pidof fcitx5) 2>/dev/null diff --git a/.config/hypr/hyprland.conf b/.config/hypr/hyprland.conf index dc45443..13ec356 100644 --- a/.config/hypr/hyprland.conf +++ b/.config/hypr/hyprland.conf @@ -9,8 +9,8 @@ monitor=,highrr,auto,auto # Wayland related environment variables. env = XCURSOR_SIZE,24 -env = WLR_NO_HARDWARE_CURSORS=1 - +env = WLR_NO_HARDWARE_CURSORS,1 +env = TERMINAL,footclient # For all categories, see https://wiki.hyprland.org/Configuring/Variables/ input { @@ -20,7 +20,10 @@ input { kb_options = kb_rules = + # Mouse settings follow_mouse = 1 + accel_profile = adaptive # Or else cannot move camera in games + sensitivity = 1 touchpad { natural_scroll = yes @@ -106,15 +109,12 @@ misc { # Example per-device config # See https://wiki.hyprland.org/Configuring/Keywords/#executing for more -device:epic-mouse-v1 { - sensitivity = -0.5 -} +# device:epic-mouse-v1 { +# sensitivity = -0.5 +# } -# Example windowrule v1 -# windowrule = float, ^(kitty)$ -# Example windowrule v2 -# windowrulev2 = float,class:^(kitty)$,title:^(kitty)$ -# See https://wiki.hyprland.org/Configuring/Window-Rules/ for more +# Window rules +windowrule = tile,title:^(VRChat)$ $mainMod = SUPER @@ -130,16 +130,19 @@ bind = $mainMod, P, exec, rofi-pass bind = $mainMod, R, exec, menu-run # System control keybinds -binde = $mainMod, MINUS, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 1%- -binde = $mainMod SHIFT, MINUS, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%- -binde = $mainMod, EQUAL, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 1%+ -binde = $mainMod SHIFT, EQUAL, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+ +binde = $mainMod, MINUS, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 1%-; notify-send -r 44 "$(wpctl get-volume @DEFAULT_AUDIO_SINK@)" +binde = $mainMod SHIFT, MINUS, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-; notify-send -r 44 "$(wpctl get-volume @DEFAULT_AUDIO_SINK@)" +binde = $mainMod, EQUAL, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 1%+; notify-send -r 44 "$(wpctl get-volume @DEFAULT_AUDIO_SINK@)" +binde = $mainMod SHIFT, EQUAL, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+; notify-send -r 44 "$(wpctl get-volume @DEFAULT_AUDIO_SINK@)" binde = ,F7, exec, change-brightness up binde = ,XF86MonBrightnessUp, exec, change-brightness up binde = ,F6, exec, change-brightness down binde = ,XF86MonBrightnessDown, exec, change-brightness down bind = $mainMod, L, exec, hyprctl dispatch dpms off; swaylock -e -c 000000 +# Hide waybar +bind = $mainMod, B, exec, pkill -SIGUSR1 waybar + # Kill commands bind = $mainMod CONTROL SHIFT, Q, exit, bind = $mainMod, Q, killactive, @@ -193,11 +196,17 @@ bind = $mainMod SHIFT, 8, exec, hyprdwm moveto 8 bind = $mainMod SHIFT, 9, exec, hyprdwm moveto 9 bind = $mainMod SHIFT, 9, exec, hyprdwm moveto 10 -# Moving between monitors -bind = $mainMod, COMMA, movewindow, mon:l -bind = $mainMod, LEFT, movewindow, mon:l -bind = $mainMod, PERIOD, movewindow, mon:r -bind = $mainMod, RIGHT, movewindow, mon:r +# Moving windows between monitors +bind = $mainMod SHIFT, COMMA, movewindow, mon:l +bind = $mainMod SHIFT, LEFT, movewindow, mon:l +bind = $mainMod SHIFT, PERIOD, movewindow, mon:r +bind = $mainMod SHIFT, RIGHT, movewindow, mon:r + +# Moving focus between monitors +bind = $mainMod, COMMA, exec, hyprctl dispatch focusmonitor l +bind = $mainMod, LEFT, exec, hyprctl dispatch focusmonitor l +bind = $mainMod, PERIOD, exec, hyprctl dispatch focusmonitor r +bind = $mainMod, RIGHT, exec, hyprctl dispatch focusmonitor r # Scroll through existing workspaces with mainMod + scroll bind = $mainMod, mouse_down, workspace, e+1 @@ -210,13 +219,15 @@ bindm = $mainMod, mouse:273, resizewindow exec-once = swww init # Do this early so the daemon has time to load # Set default workspace per monitor -exec-once = hyprctl dispatch focusmonitor 1; hyprctl dispatch exec 'hyprdwm goto 1' -exec-once = hyprctl dispatch focusmonitor 2; hyprctl dispatch exec 'hyprdwm goto 1' -exec-once = hyprctl dispatch focusmonitor 3; hyprctl dispatch exec 'hyprdwm goto 1' +exec-once = sleep 1 && hyprctl dispatch focusmonitor 1; hyprctl dispatch exec 'hyprdwm goto 1' +exec-once = sleep 1 && hyprctl dispatch focusmonitor 2; hyprctl dispatch exec 'hyprdwm goto 1' +exec-once = sleep 1 && hyprctl dispatch focusmonitor 3; hyprctl dispatch exec 'hyprdwm goto 1' exec-once = waybar exec-once = hyprland-autoname-workspaces -exec-once = kanshi +# exec-once = kanshi +exec-once = ~/.local/bin/hyprmonitors + exec-once = fcitx5 exec-once = foot --server exec-once = sleep 1 && swww img ~/.config/wallpaper diff --git a/.config/hyprland-autoname-workspaces/config.toml b/.config/hyprland-autoname-workspaces/config.toml index 87afac2..cb084bf 100644 --- a/.config/hyprland-autoname-workspaces/config.toml +++ b/.config/hyprland-autoname-workspaces/config.toml @@ -38,6 +38,7 @@ workspace = "{id}:{delim}{clients}" # {id}, {delim} and {clients} are supported "(?i)spotify" = " " "(?i)chromium" = " " "(?i)emacs" = " " +"(?i)steam" = " " # [class_active] # DEFAULT = "*{icon}*" diff --git a/.config/waybar/config b/.config/waybar/config index a1e5d76..1441b83 100644 --- a/.config/waybar/config +++ b/.config/waybar/config @@ -5,7 +5,7 @@ "modules-left": ["hyprland/workspaces", "custom/scratch", "hyprland/mode", "hyprland/window"], "modules-center": [], - "modules-right": ["memory", "network", "pulseaudio", "clock", "tray", "battery"], + "modules-right": ["memory", "network", "pulseaudio", "battery", "tray", "clock"], "hyprland/workspaces": { "disable-scroll": true,