Skip to content

Commit

Permalink
cleanup: Remove default and invalid values
Browse files Browse the repository at this point in the history
There is no reason to have this shipped in our configuration, especially now that the configuration resides
in the root directory, and will NEVER be touched by the user.

A couple of things that have been removed:
- cursor.allow_dumb_copy - We disable hw cursor for NVIDIA so there is no reason for this to be enabled.
- Dropped "epic-mouse-v1" - WTF is this?
- misc.vfr - vfr is boolean so 1 is invalid. I assume this should be VRR, in which case 1 is also just a bad default

Signed-off-by: Eric Naim <[email protected]>
  • Loading branch information
1Naim committed Nov 30, 2024
1 parent 74e08c5 commit c259245
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 82 deletions.
11 changes: 1 addition & 10 deletions usr/share/cachyos-hyprland-settings/decorations.conf
Original file line number Diff line number Diff line change
Expand Up @@ -8,22 +8,13 @@ source = /usr/share/cachyos-hyprland-settings/colors.conf

decoration {
active_opacity = 0.98
inactive_opacity = 1.0
fullscreen_opacity = 1.0
rounding = 4
dim_inactive = false
#dim_special = 0.2
#dim_around = 0.4
#screen_shader =


# https://wiki.hyprland.org/0.45.0/Configuring/Variables/#blur
blur {
enabled = true
size = 15
passes = 2 # more passes = more resource intensive.
new_optimizations = true
xray = true
ignore_opacity = false
}

# https://wiki.hyprland.org/0.45.0/Configuring/Variables/#shadow
Expand Down
16 changes: 0 additions & 16 deletions usr/share/cachyos-hyprland-settings/input.conf
Original file line number Diff line number Diff line change
Expand Up @@ -5,22 +5,6 @@
# Input wiki https://wiki.hyprland.org/0.45.0/Configuring/Variables/#input

input {
kb_layout = us
# kb_variant = abnt2
kb_model =
#kb_options = grp:caps_toggle,grp_led:caps,altwin:swap_alt_win,ctrl:rctrl_ralt
kb_options =
kb_rules =
follow_mouse = 2 # 0|1|2|3
float_switch_override_focus = 2
sensitivity = 0 # -1.0 - 1.0, 0 means no modification.

# https://wiki.hyprland.org/0.45.0/Configuring/Variables/#touchpad
touchpad {
natural_scroll = false
#scroll_factor = 1.0
#tap-to-click = true
#tap-and-drag = true
}

}
58 changes: 2 additions & 56 deletions usr/share/cachyos-hyprland-settings/variables.conf
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,6 @@ general {
# https://wiki.hyprland.org/0.45.0/Configuring/Variables/#snap
snap {
enabled = true
window_gap = 10
monitor_gap = 10
border_overlap = false
}

}
Expand All @@ -30,27 +27,20 @@ gestures {
workspace_swipe = true
workspace_swipe_fingers = 4
workspace_swipe_distance = 250
workspace_swipe_invert = true
workspace_swipe_min_speed_to_force = 15
workspace_swipe_cancel_ratio = 0.5
workspace_swipe_create_new = false
}

# https://wiki.hyprland.org/0.45.0/Configuring/Variables/#group
group {
auto_group = true
insert_after_current = true
focus_removed_window = true
col.border_active = $cachydgreen
col.border_inactive = $cachylgreen
col.border_locked_active = $cachymgreen
col.border_locked_inactive = $cachydblue

# https://wiki.hyprland.org/0.45.0/Configuring/Variables/#groupbar
groupbar {
enabled = true
font_family = "JetBrainsMono Nerd Font"
font_size = 8
text_color = $cachydblue
col.active = $cachydgreen
col.inactive = $cachylgreen
Expand All @@ -62,72 +52,28 @@ group {
misc {
font_family = "JetBrainsMono Nerd Font"
splash_font_family = "JetBrainsMono Nerd Font"
#disable_autoreload = true
disable_hyprland_logo = true
col.splash = $cachylgreen
background_color = $cachydblue
always_follow_on_dnd = true
layers_hog_keyboard_focus = true
animate_manual_resizes = false
enable_swallow = true
swallow_regex = ^(cachy-browser|firefox|nautilus|nemo|thunar|btrfs-assistant.)$
focus_on_activate = true
vfr = 1
}

# https://wiki.hyprland.org/0.45.0/Configuring/Variables/#xwayland
xwayland {
enabled = true
use_nearest_neighbor = true
force_zero_scaling = false
}

# https://wiki.hyprland.org/0.45.0/Configuring/Variables/#opengl
opengl {
nvidia_anti_flicker = true
force_introspection = 2
}

# https://wiki.hyprland.org/0.45.0/Configuring/Variables/#render
render {
explicit_sync = 2
explicit_sync_kms = 2
direct_scanout = true
expand_undersized_textures = true
}

# https://wiki.hyprland.org/0.45.0/Configuring/Variables/#cursor
cursor {
no_hardware_cursors = 2
allow_dumb_copy = true
enable_hyprcursor = true
hide_on_touch = true
# default_monitor = $exter
sync_gsettings_theme = true
}
# End of Variables Section

# See https://wiki.hyprland.org/0.45.0/Configuring/Dwindle-Layout/ for more
dwindle {
force_split = 0
special_scale_factor = 0.8
split_width_multiplier = 1.0
use_active_for_splits = true
pseudotile = yes # master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below
preserve_split = yes
pseudotile = true # master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below
preserve_split = true
}

# See https://wiki.hyprland.org/0.45.0/Configuring/Master-Layout/ for more
master {
new_status = master
special_scale_factor = 0.8
inherit_fullscreen = true
smart_resizing = true
drop_at_cursor = true
}

# https://wiki.hyprland.org/0.45.0/Configuring/Keywords/#per-device-input-configs
device {
name = epic-mouse-v1
sensitivity = -0.5
}

2 comments on commit c259245

@msmafra
Copy link
Contributor

@msmafra msmafra commented on c259245 Dec 1, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cursor.allow_dumb_copy - We disable hw cursor for NVIDIA so there is no reason for this to be enabled.

no_hardware_cursors = 2 is the replacement for nvidia cursor situation now automatically detecting it. allow_dumb_copy will be replace by use_cpu_buffer (hyprwm/Hyprland#8424 (comment))

Dropped "epic-mouse-v1" - WTF is this?

Default from the hyprland.conf file.

grep device /usr/share/hypr/hyprland.conf -A 4
# Example per-device config
# See https://wiki.hyprland.org/Configuring/Keywords/#per-device-input-configs for more
device {
    name = epic-mouse-v1
    sensitivity = -0.5
}

misc.vfr - vfr is boolean so 1 is invalid. I assume this should be VRR, in which case 1 is also just a bad default

The VFR is not invalid:
vfr = 1 is correct https://wiki.hyprland.org/0.45.0/Configuring/Variables/#variable-types.
vfr: "controls the VFR status of Hyprland. Heavily recommended to leave enabled to conserve resources."

@1Naim
Copy link
Member Author

@1Naim 1Naim commented on c259245 Dec 1, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no_hardware_cursors = 2 is the replacement for nvidia cursor situation now automatically detecting it. allow_dumb_copy will be replace by use_cpu_buffer (hyprwm/Hyprland#8424 (comment))

Yeah, it's disabled. No reason to set this.

Dropped "epic-mouse-v1" - WTF is this?

Default from the hyprland.conf file.

So why do we need to set it in the conf file again?

misc.vfr - vfr is boolean so 1 is invalid. I assume this should be VRR, in which case 1 is also just a bad default

The VFR is not invalid: vfr = 1 is correct https://wiki.hyprland.org/0.45.0/Configuring/Variables/#variable-types. vfr: "controls the VFR status of Hyprland. Heavily recommended to leave enabled to conserve resources."

Yeah, I missed that. But it's default true so it doesn't matter. With boolean stuff in mind, you're not consistent with the types being used, sometimes there's true, other times there's yes and here you're using 1. I changed any occurences of yes to true but please be consistent in one type next time.

Please sign in to comment.