janishutz/dotfiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

[Hyprland] Fix merge error

Browse Source
This commit is contained in:
Admin 2025-04-28 08:56:38 +02:00
parent ac6b47449a
commit 7f7a755e32
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
config/hypr/hyprland_laptop.conf
View File

@ -68,12 +68,7 @@ bind = $mainMod CTRL, E, exec, hyprctl keyword monitor HDMI-A-1, 1920x1080@60, 1
bind = $mainMod ALT, E, exec, hyprctl keyword monitor eDP-1, 2880x1800@60, 0x0, 1.5 && cpupower-gui -b && notify-send 'Set to battery optimized settings' bind = $mainMod ALT, E, exec, hyprctl keyword monitor eDP-1, 2880x1800@60, 0x0, 1.5 && cpupower-gui -b && notify-send 'Set to battery optimized settings'
bind = $mainMod ALT, P, exec, hyprctl keyword monitor eDP-1, 2880x1800@120, 0x0, 1.5 && cpupower-gui -p && notify-send 'Set to performance optimized settings' bind = $mainMod ALT, P, exec, hyprctl keyword monitor eDP-1, 2880x1800@120, 0x0, 1.5 && cpupower-gui -p && notify-send 'Set to performance optimized settings'
<<<<<<< HEAD:laptop/configs/hypr/hyprland.conf
# Vivado inversion
=======
# ── Vivado inversion ──────────────────────────────────────────────── # ── Vivado inversion ────────────────────────────────────────────────
>>>>>>> v2:config/hypr/hyprland_laptop.conf
windowrule = plugin:invertwindow, class:Vivado windowrule = plugin:invertwindow, class:Vivado
windowrule = tile, title:(.*)Vivado(.*) windowrule = tile, title:(.*)Vivado(.*)