Merge branch 'main' into 'dev'

# Conflicts:
#   hypr/hyprland.conf
This commit is contained in:
Stephan Raabe 2023-09-22 15:47:36 +00:00
commit f037bc74ab

View File

@ -48,7 +48,7 @@ env = XCURSOR_SIZE,24
# Keyboard layout and mouse
# -----------------------------------------------------
input {
kb_layout = de
kb_layout = us
kb_variant =
kb_model =
kb_options =