From b167d7c8312f9c3c016c1bc9d5f1078e6987f5e0 Mon Sep 17 00:00:00 2001 From: Guanran Wang Date: Tue, 30 Jan 2024 13:08:18 +0800 Subject: [PATCH] home: hyprland: cleanup --- home/applications/hyprland/default.nix | 1 - .../applications/hyprland/hypr/autostart.conf | 9 +- home/applications/hyprland/hypr/keybinds.conf | 183 ++++++++---------- home/applications/hyprland/hypr/main.conf | 35 ++-- home/applications/hyprland/hypr/plugins.conf | 40 ---- 5 files changed, 100 insertions(+), 168 deletions(-) delete mode 100644 home/applications/hyprland/hypr/plugins.conf diff --git a/home/applications/hyprland/default.nix b/home/applications/hyprland/default.nix index cf2114b..19ad28e 100644 --- a/home/applications/hyprland/default.nix +++ b/home/applications/hyprland/default.nix @@ -23,7 +23,6 @@ wayland.windowManager.hyprland = { enable = true; - enableNvidiaPatches = true; #plugins = with inputs.hyprland-plugins.packages.${pkgs.stdenv.hostPlatform.system}; [ # csgo-vulkan-fix #]; diff --git a/home/applications/hyprland/hypr/autostart.conf b/home/applications/hyprland/hypr/autostart.conf index cdea8b1..58b967d 100644 --- a/home/applications/hyprland/hypr/autostart.conf +++ b/home/applications/hyprland/hypr/autostart.conf @@ -1,7 +1,2 @@ -# -# Hyprland autostart config -# $HOME/.config/hypr/autostart.conf -# - -exec-once = swww init # wallpaper (not working on nixos somehow) -exec-once = waybar # status bar (bro why would nixos autostart waybar itself) +exec-once = swww init +exec-once = waybar diff --git a/home/applications/hyprland/hypr/keybinds.conf b/home/applications/hyprland/hypr/keybinds.conf index f4b2248..3272c18 100644 --- a/home/applications/hyprland/hypr/keybinds.conf +++ b/home/applications/hyprland/hypr/keybinds.conf @@ -1,131 +1,118 @@ -# -# Hyprland keybinds config -# ~/.config/hypr/keybinds.conf -# - # bind vars -$wp = ~/.local/bin/wrapped-swww -$dwp = ~/.local/bin/wrapped-mpvpaper -$changevolume = ~/.local/bin/wrapped-pamixer # use swayosd instead -$changebrightness = ~/.local/bin/wrapped-brightnessctl -$screenshot = ~/.local/bin/screenshot -$video_path = ~/.var/app/com.valvesoftware.Steam/data/Steam/steamapps/workshop/content/431960 +$wp = ~/.local/bin/wrapped-swww +$dwp = ~/.local/bin/wrapped-mpvpaper +$changevolume = ~/.local/bin/wrapped-pamixer +$changebrightness = ~/.local/bin/wrapped-brightnessctl +$screenshot = ~/.local/bin/screenshot +$video_path = ~/.var/app/com.valvesoftware.Steam/data/Steam/steamapps/workshop/content/431960 # binds -bind = SUPER, return, exec, alacritty -#bind = SUPER, Q, exec, alacritty -bind = SUPER, E, exec, xdg-open ~ -bind = SUPER, W, exec, xdg-open https: # why is this working -bind = CONTROL SHIFT, Escape, exec, gnome-system-monitor +bind = SUPER, return, exec, alacritty +bind = SUPER, E, exec, xdg-open ~ +bind = SUPER, W, exec, xdg-open http: +bind = CONTROL SHIFT, Escape, exec, gnome-system-monitor -bind = ALT, R, exec, zenity --width 500 --entry | wl-copy -bind = SUPER, Backspace, exec, swaylock +bind = ALT, R, exec, zenity --width 500 --entry | wl-copy +bind = SUPER, Backspace, exec, swaylock -bind = SUPER, F, fullscreen, 0 -bind = SUPER SHIFT, F, fullscreen, 1 +bind = SUPER, F, fullscreen, 0 +bind = SUPER SHIFT, F, fullscreen, 1 -bind = SUPER, Q, killactive -bind = CONTROL SUPER SHIFT, Q, exec, hyprctl kill -bind = SUPER SHIFT, R, exec, pkill waybar; waybar -bind = CONTROL ALT, delete, exit, +bind = SUPER, Q, killactive +bind = CONTROL SUPER SHIFT, Q, exec, hyprctl kill +bind = SUPER SHIFT, R, exec, pkill waybar; waybar +bind = CONTROL ALT, delete, exit, # rofi / application launcher -bind = SUPER, D, exec, rofi -show drun -show-icons -icon-theme Tela-dracula-dark -#bind = SUPER, D, exec, anyrun -bind = SUPER SHIFT, D, exec, cliphist list | rofi -dmenu | cliphist decode | wl-copy -bind = SUPER, Period, exec, rofi -modi emoji -show emoji -bind = SUPER SHIFT, L, exec, rofi -modi "power-menu:rofi-power-menu --confirm=reboot/shutdown" -show power-menu +bind = SUPER, D, exec, rofi -show drun -show-icons -icon-theme Tela-dracula-dark +bind = SUPER SHIFT, D, exec, cliphist list | rofi -dmenu | cliphist decode | wl-copy +bind = SUPER, Period, exec, rofi -modi emoji -show emoji +bind = SUPER SHIFT, L, exec, rofi -modi "power-menu:rofi-power-menu --confirm=reboot/shutdown" -show power-menu # screenshot -bind = ,Print, exec, $screenshot fullscreen -bind = SUPER SHIFT, S, exec, $screenshot region -bind = ALT SHIFT, S, exec, $screenshot swappy +bind = ,Print, exec, $screenshot fullscreen +bind = SUPER SHIFT, S, exec, $screenshot region +bind = ALT SHIFT, S, exec, $screenshot swappy # wallpaper switching -bind = SHIFT ALT, 1, exec, $wp /usr/share/backgrounds/odin.jpg # pkg: elementary-wallpapers -bind = SHIFT ALT, 2, exec, $wp /usr/share/backgrounds/odin-dark.jpg -bind = SHIFT ALT, 3, exec, $wp ~/.local/share/backgrounds/Mojave\ Night.jpg -bind = SHIFT ALT, 4, exec, $wp ~/.local/share/backgrounds/wallpaper2.jpg -bind = SHIFT ALT, 5, exec, $wp ~/.local/share/backgrounds/wallpaper3.jpg -bind = SHIFT ALT, 6, exec, $wp ~/.local/share/backgrounds/wallpaper1.png # aur: mint-backgrounds +bind = SHIFT ALT, 1, exec, $wp /usr/share/backgrounds/odin.jpg # pkg: elementary-wallpapers +bind = SHIFT ALT, 2, exec, $wp /usr/share/backgrounds/odin-dark.jpg +bind = SHIFT ALT, 3, exec, $wp ~/.local/share/backgrounds/Mojave\ Night.jpg +bind = SHIFT ALT, 4, exec, $wp ~/.local/share/backgrounds/wallpaper2.jpg +bind = SHIFT ALT, 5, exec, $wp ~/.local/share/backgrounds/wallpaper3.jpg +bind = SHIFT ALT, 6, exec, $wp ~/.local/share/backgrounds/wallpaper1.png # aur: mint-backgrounds # /usr/share/backgrounds/archlinux/simple.png # archlinux-wallpapers # /usr/share/backgrounds/archlinux/small.png # video wallpapers from wallpaper engine -bind = SHIFT ALT, 7, exec, $dwp $video_path/2292710588/KleeWP.mp4 -bind = SHIFT ALT, 8, exec, $dwp $video_path/821372791/灵梦.mp4 -bind = SHIFT ALT, 9, exec, $dwp $video_path/827148653/Gargantua_BGM.mp4 -bind = SHIFT ALT, 0, exec, $dwp $video_path/1661372823/EP03.mp4 -bind = SHIFT ALT, Minus, exec, $dwp $video_path/2855732285/彩虹鸭鸭.mp4 -bind = SHIFT ALT, Backspace, exec, pkill mpvpaper +bind = SHIFT ALT, 7, exec, $dwp $video_path/2292710588/KleeWP.mp4 +bind = SHIFT ALT, 8, exec, $dwp $video_path/821372791/灵梦.mp4 +bind = SHIFT ALT, 9, exec, $dwp $video_path/827148653/Gargantua_BGM.mp4 +bind = SHIFT ALT, 0, exec, $dwp $video_path/1661372823/EP03.mp4 +bind = SHIFT ALT, Minus, exec, $dwp $video_path/2855732285/彩虹鸭鸭.mp4 +bind = SHIFT ALT, Backspace, exec, pkill mpvpaper # keyboard fn buttons -binde = ,XF86MonBrightnessUp, exec, $changebrightness up +binde = ,XF86MonBrightnessUp, exec, $changebrightness up binde = ,XF86MonBrightnessDown, exec, $changebrightness down -binde = ,XF86AudioRaiseVolume, exec, $changevolume up -binde = ,XF86AudioLowerVolume, exec, $changevolume down -bind = ,XF86AudioMute, exec, $changevolume mute +binde = ,XF86AudioRaiseVolume, exec, $changevolume up +binde = ,XF86AudioLowerVolume, exec, $changevolume down +bind = ,XF86AudioMute, exec, $changevolume mute -#binde = ,XF86MonBrightnessUp, exec, swayosd --brightness raise -#binde = ,XF86MonBrightnessDown, exec, swayosd --brightness lower -#binde = ,XF86AudioRaiseVolume, exec, swayosd --output-volume raise -#binde = ,XF86AudioLowerVolume, exec, swayosd --output-volume lower -#bind = ,XF86AudioMute, exec, swayosd --output-volume mute-toggle - -bind = ,XF86AudioPlay, exec, playerctl play-pause -bind = ,XF86AudioPrev, exec, playerctl previous -bind = ,XF86AudioNext, exec, playerctl next -bind = ,XF86AudioStop, exec, playerctl stop -bind = ,XF86AudioMedia, exec, playerctl play-pause +bind = ,XF86AudioPlay, exec, playerctl play-pause +bind = ,XF86AudioPrev, exec, playerctl previous +bind = ,XF86AudioNext, exec, playerctl next +bind = ,XF86AudioStop, exec, playerctl stop +bind = ,XF86AudioMedia, exec, playerctl play-pause # window mode -bind = SUPER, C, pseudo # dwindle -bind = SUPER, S, togglesplit # dwindle -bind = SUPER, V, togglefloating +bind = SUPER, C, pseudo # dwindle +bind = SUPER, S, togglesplit # dwindle +bind = SUPER, V, togglefloating # window size -binde = SUPER, Minus, splitratio, -0.1 -binde = SUPER, Equal, splitratio, 0.1 +binde = SUPER, Minus, splitratio, -0.1 +binde = SUPER, Equal, splitratio, 0.1 # move window focus -bind = SUPER, H, movefocus, l -bind = SUPER, J, movefocus, d -bind = SUPER, K, movefocus, u -bind = SUPER, L, movefocus, r +bind = SUPER, H, movefocus, l +bind = SUPER, J, movefocus, d +bind = SUPER, K, movefocus, u +bind = SUPER, L, movefocus, r -bind = SUPER, left, movefocus, l -bind = SUPER, right, movefocus, r -bind = SUPER, up, movefocus, u -bind = SUPER, down, movefocus, d +bind = SUPER, left, movefocus, l +bind = SUPER, right, movefocus, r +bind = SUPER, up, movefocus, u +bind = SUPER, down, movefocus, d -bind = SUPER, Tab, cyclenext # change focus to another window -bind = SUPER, Tab, bringactivetotop # bring it to the top +bind = SUPER, Tab, cyclenext # change focus to another window +bind = SUPER, Tab, bringactivetotop # bring it to the top # workspaces binds -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 +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 -bind = SUPER SHIFT, 1, movetoworkspacesilent, 1 -bind = SUPER SHIFT, 2, movetoworkspacesilent, 2 -bind = SUPER SHIFT, 3, movetoworkspacesilent, 3 -bind = SUPER SHIFT, 4, movetoworkspacesilent, 4 -bind = SUPER SHIFT, 5, movetoworkspacesilent, 5 -bind = SUPER SHIFT, 6, movetoworkspacesilent, 6 -bind = SUPER SHIFT, 7, movetoworkspacesilent, 7 -bind = SUPER SHIFT, 8, movetoworkspacesilent, 8 -bind = SUPER SHIFT, 9, movetoworkspacesilent, 9 -bind = SUPER SHIFT, 0, movetoworkspacesilent, 10 +bind = SUPER SHIFT, 1, movetoworkspacesilent, 1 +bind = SUPER SHIFT, 2, movetoworkspacesilent, 2 +bind = SUPER SHIFT, 3, movetoworkspacesilent, 3 +bind = SUPER SHIFT, 4, movetoworkspacesilent, 4 +bind = SUPER SHIFT, 5, movetoworkspacesilent, 5 +bind = SUPER SHIFT, 6, movetoworkspacesilent, 6 +bind = SUPER SHIFT, 7, movetoworkspacesilent, 7 +bind = SUPER SHIFT, 8, movetoworkspacesilent, 8 +bind = SUPER SHIFT, 9, movetoworkspacesilent, 9 +bind = SUPER SHIFT, 0, movetoworkspacesilent, 10 # mouse binds -bind = SUPER, mouse_down, workspace, e-1 # scroll wheels -bind = SUPER, mouse_up, workspace, e+1 -bindm = SUPER, mouse:272, movewindow # left click -bindm = SUPER, mouse:273, resizewindow # right click +bind = SUPER, mouse_down, workspace, e-1 # scroll wheels +bind = SUPER, mouse_up, workspace, e+1 +bindm = SUPER, mouse:272, movewindow # left click +bindm = SUPER, mouse:273, resizewindow # right click diff --git a/home/applications/hyprland/hypr/main.conf b/home/applications/hyprland/hypr/main.conf index 84298b6..3412e72 100644 --- a/home/applications/hyprland/hypr/main.conf +++ b/home/applications/hyprland/hypr/main.conf @@ -1,14 +1,7 @@ -# -# Hyprland main config -# ~/.config/hypr/hyprland.conf -# wiki: https://wiki.hyprland.org/ -# # Display settings monitor = ,preferred, auto, 1 -#monitor= ,addreserved, 28, 0, 0, 0 # eww bar monitor = eDP-1, 1920x1080@60, 0x0, 1.25 # laptop screen eDP-1 -# Multi GPU -#env = WLR_DRM_DEVICES, /dev/dri/card1:/dev/dri/card0 + # General settings general { gaps_in = 4 @@ -16,6 +9,7 @@ general { border_size = 2 layout = dwindle } + # Decorations decoration { blur { @@ -28,18 +22,18 @@ decoration { col.shadow = 0x88000000 col.shadow_inactive = 0x44000000 } + # Animations -# animation=NAME,ONOFF,SPEED,CURVE,STYLE or -# animation=NAME,ONOFF,SPEED,CURVE animations { bezier = easeOutExpo, 0.16, 1, 0.3, 1 bezier = easeOutQuint, 0.22, 1, 0.36, 1 - animation = windows, 1, 6, default, popin # slide or popin + animation = windows, 1, 6, default, popin animation = fade, 1, 8, default animation = border, 1, 8, default animation = borderangle, 1, 8, default animation = workspaces, 1, 4, default } + # Input settings input { accel_profile = flat @@ -51,39 +45,36 @@ input { drag_lock = true } } + # idk dwindle { pseudotile = true preserve_split = true } + # Touchpad gestures gestures { workspace_swipe = true # touchpad swipe to switch workspaces workspace_swipe_distance = 600 # doubles gesture distance } + # XWayland XWayland { - use_nearest_neighbor = false + #use_nearest_neighbor = false force_zero_scaling = true } + misc { disable_hyprland_logo = true disable_splash_rendering = true animate_manual_resizes = true } + # Windows rules windowrule = float, ^(pavucontrol)$ -windowrule = float, ^(blueberry)$ -windowrule = float, ^(gnome-system-monitor)$ windowrule = float, ^(org.gnome.Calculator)$ -windowrule = float, ^(org.gnome.Weather)$ -windowrule = float, ^(zenity)$ # popups, input boxes, etc... -windowrule = float, title:^(Friends List)$ # steam friend list -windowrule = float, title:^(File Conflict)$ # nautilus -windowrule = float, title:^(Merge Folder)$ # another nautilus -windowrule = noblur, ^(xdg-desktop-portal-gtk)$ # i dont really know why did i add this -windowrule = noborder, ^(wechat-uos)$ + # Layer rules layerrule = blur, notifications layerrule = blur, rofi -layerrule = ignorezero, notifications \ No newline at end of file +layerrule = ignorezero, notifications diff --git a/home/applications/hyprland/hypr/plugins.conf b/home/applications/hyprland/hypr/plugins.conf deleted file mode 100644 index d424469..0000000 --- a/home/applications/hyprland/hypr/plugins.conf +++ /dev/null @@ -1,40 +0,0 @@ -# need to be absolute path -#plugin = $HOME/.config/hypr/plugins/csgo-vulkan-fix.so -plugin = $HOME/.config/hypr/plugins/hyprfocus.so - -plugin { - csgo-vulkan-fix { - res_w = 1440 - res_h = 1080 - } - - hyprfocus { - enabled = false - - keyboard_focus_animation = flash - mouse_focus_animation = flash - - bezier = bezIn, 0.5,0.0,1.0,0.5 - bezier = bezOut, 0.0,0.5,0.5,1.0 - } - - flash { - flash_opacity = 0.7 - - in_bezier = bezIn - in_speed = 0.5 - - out_bezier = bezOut - out_speed = 3 - } - - shrink { - shrink_percentage = 0.99 - - in_bezier = bezIn - in_speed = 0.5 - - out_bezier = bezOut - out_speed = 3 - } -}