diff options
| author | Pinapelz <yukais@pinapelz.com> | 2026-07-10 11:26:01 -0700 |
|---|---|---|
| committer | Pinapelz <yukais@pinapelz.com> | 2026-07-10 11:26:01 -0700 |
| commit | faf25cdabe65291dd8b596e03cbb431cb2ad8f1f (patch) | |
| tree | f46832184ebbba8d657b1a86e186152ceb1bbe4b /config/hypr | |
| parent | 24de2a31a52d17b6f7214197bdbfeab7428742dd (diff) | |
fix: merge artifact
Diffstat (limited to 'config/hypr')
| -rw-r--r-- | config/hypr/configs/Keybinds.conf | 3 | ||||
| -rw-r--r-- | config/hypr/configs/Startup_Apps.conf | 1 | ||||
| -rw-r--r-- | config/hypr/configs/SystemSettings.conf | 2 | ||||
| -rw-r--r-- | config/hypr/lua/settings.lua | 2 |
4 files changed, 3 insertions, 5 deletions
diff --git a/config/hypr/configs/Keybinds.conf b/config/hypr/configs/Keybinds.conf index f65fb401..caf3b4b1 100644 --- a/config/hypr/configs/Keybinds.conf +++ b/config/hypr/configs/Keybinds.conf @@ -46,13 +46,10 @@ bindd = $mainMod SHIFT, B, Set static Rainbow Border, exec, $UserScripts/Rainbow bindd = $mainMod SHIFT, H, Toggle Mute/Unmute for Active-Window, exec, $scriptsDir/Toggle-Active-Window-Audio.sh bindd = ALT SHIFT, S, Hyprshot Screen Capture, exec, $scriptsDir/hyprshot.sh -m region -o $HOME/Pictures/Screenshots -<<<<<<< HEAD bindd = $mainMod ,F , Fullscreen, fullscreen bindd = $mainMod SHIFT, F, Maximize window, fullscreen, 1 -======= bindd = $mainMod SHIFT, F, Fullscreen, fullscreen bindd = $mainMod, F, Maximize window, fullscreen, 1 ->>>>>>> upstream bindd = $mainMod, SPACE, Float current window, togglefloating, bindd = $mainMod ALT, SPACE, Float all windows, exec, $scriptsDir/Float-all-Windows.sh # NOTE: Dropterminal is currently certified only with kitty. Not all terminals behave correctly as a dropdown. diff --git a/config/hypr/configs/Startup_Apps.conf b/config/hypr/configs/Startup_Apps.conf index 94a4837a..41f6761b 100644 --- a/config/hypr/configs/Startup_Apps.conf +++ b/config/hypr/configs/Startup_Apps.conf @@ -61,3 +61,4 @@ exec-once = blueman-applet exec-once = $scriptsDir/KeybindsLayoutInit.sh exec-once = ags exec-once = qs +exec-once = rog-control-center diff --git a/config/hypr/configs/SystemSettings.conf b/config/hypr/configs/SystemSettings.conf index 40389096..8ba74408 100644 --- a/config/hypr/configs/SystemSettings.conf +++ b/config/hypr/configs/SystemSettings.conf @@ -157,7 +157,7 @@ render { cursor { sync_gsettings_theme = true - no_hardware_cursors = 0 # change to 1 if want to disable + no_hardware_cursors = 0 # change to 1 if want to disable enable_hyprcursor = true warp_on_change_workspace = 2 no_warps = true diff --git a/config/hypr/lua/settings.lua b/config/hypr/lua/settings.lua index eaa5aeeb..2d57c181 100644 --- a/config/hypr/lua/settings.lua +++ b/config/hypr/lua/settings.lua @@ -159,7 +159,7 @@ hl.config({ hl.config({ cursor = { sync_gsettings_theme = true, - no_hardware_cursors = 0, + no_hardware_cursors = 0, enable_hyprcursor = true, warp_on_change_workspace = 2, no_warps = true, |