From 6f7d32f4cf80b79ae1466f4edb0a78abbc2c412b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergio=20La=C3=ADn?= Date: Tue, 20 Feb 2024 01:08:53 +0100 Subject: [PATCH] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20refactor(hypr):=20moved=20?= =?UTF-8?q?individual=20modules=20of=20hypr=20conf=20into=20their=20own=20?= =?UTF-8?q?files?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit now themes are more modular --- .config/hypr/configs/input.conf | 13 +++ .config/hypr/configs/misc.conf | 29 ++++++ .config/hypr/hyprland.conf | 11 +-- .config/hypr/themes/luna/animations.conf | 18 ++++ .config/hypr/themes/luna/decoration.conf | 47 ++++++++++ .config/hypr/themes/luna/luna.conf | 3 + .config/hypr/themes/luna/theme.conf | 109 ----------------------- 7 files changed, 116 insertions(+), 114 deletions(-) create mode 100644 .config/hypr/configs/input.conf create mode 100644 .config/hypr/configs/misc.conf create mode 100644 .config/hypr/themes/luna/animations.conf create mode 100644 .config/hypr/themes/luna/decoration.conf create mode 100644 .config/hypr/themes/luna/luna.conf delete mode 100644 .config/hypr/themes/luna/theme.conf diff --git a/.config/hypr/configs/input.conf b/.config/hypr/configs/input.conf new file mode 100644 index 00000000..8a32c6bc --- /dev/null +++ b/.config/hypr/configs/input.conf @@ -0,0 +1,13 @@ +input { + kb_layout = us, es + kb_options = compose:rctrl, level3:ralt_switch, grp:win_space_toggle + + follow_mouse = 1 + numlock_by_default = true + + touchpad { + natural_scroll = yes + disable_while_typing = true + scroll_factor = 1 + } +} diff --git a/.config/hypr/configs/misc.conf b/.config/hypr/configs/misc.conf new file mode 100644 index 00000000..f4ad1c54 --- /dev/null +++ b/.config/hypr/configs/misc.conf @@ -0,0 +1,29 @@ +general { + allow_tearing = true +} + +misc { + always_follow_on_dnd = true + disable_hyprland_logo = true + vrr = 0 + animate_manual_resizes = true + animate_mouse_windowdragging = false + enable_swallow = true +} + +xwayland { + force_zero_scaling = true +} + +dwindle { + pseudotile = yes # Master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below + preserve_split = yes # You probably want this + pseudotile = true # Enable pseudotiling on dwindle + force_split = 0 + preserve_split = true +} + +gestures { + workspace_swipe = yes + workspace_swipe_fingers = 4 +} diff --git a/.config/hypr/hyprland.conf b/.config/hypr/hyprland.conf index 67c8ccb8..7cfecd0f 100755 --- a/.config/hypr/hyprland.conf +++ b/.config/hypr/hyprland.conf @@ -3,14 +3,15 @@ source = ~/.config/hypr/configs/env.conf source = ~/.config/hypr/configs/binds.conf source = ~/.config/hypr/configs/monitors.conf source = ~/.config/hypr/configs/workspaces.conf +source = ~/.config/hypr/configs/input.conf +source = ~/.config/hypr/configs/misc.conf # Autostart exec-once = $HOME/.config/hypr/scripts/autostart/services exec-once = $HOME/.config/hypr/scripts/autostart/apps -# Theme -source = ~/.config/hypr/themes/luna/theme.conf -source = ~/.config/hypr/themes/luna/rules.conf +# Theme (Add the theme you want) +source = ~/.config/hypr/themes/luna/luna.conf -# Plugins -exec-once = hyprpm reload -n +# Plugins (Uncomment this line if you are going to use the plugins) +# exec-once = hyprpm reload -n diff --git a/.config/hypr/themes/luna/animations.conf b/.config/hypr/themes/luna/animations.conf new file mode 100644 index 00000000..4e7df525 --- /dev/null +++ b/.config/hypr/themes/luna/animations.conf @@ -0,0 +1,18 @@ +animations { + enabled = 1 + + bezier = default, 0.05, 0.9, 0.1, 1.05 + bezier = wind, 0.05, 0.9, 0.1, 1.05 + bezier = overshot, 0.13, 0.99, 0.29, 1.1 + bezier = liner, 1, 1, 1, 1 + + animation = windows, 1, 7, wind,popin + animation = windowsIn, 1, 7, overshot, popin + animation = windowsOut, 1, 5, overshot, popin + animation = windowsMove, 1, 6, overshot, slide + animation = fadeIn, 1, 10, default + animation = fadeOut, 1, 10, default + animation = workspaces, 1, 7, overshot, slide + animation = border, 1, 1, liner + animation = borderangle, 1, 30, liner, loop +} diff --git a/.config/hypr/themes/luna/decoration.conf b/.config/hypr/themes/luna/decoration.conf new file mode 100644 index 00000000..362e5e44 --- /dev/null +++ b/.config/hypr/themes/luna/decoration.conf @@ -0,0 +1,47 @@ +general { + border_size = 2 + col.inactive_border = rgba(b7bdf869) + col.active_border = rgba(c6d0f5ee) rgba(b7bdf869) rgba(b7bdf869) rgba(c6d0f5ee) 45deg + + gaps_in = 10 + gaps_out = 20 +} + +decoration { + rounding = 7 + + active_opacity = 0.95 + inactive_opacity = 0.9 + + blur { + enabled = yes + size = 5 + passes = 4 + ignore_opacity = true + new_optimizations = true + xray = true + noise = 0.0 + } + + dim_inactive = false + dim_strength = 0.05 + + drop_shadow = yes + shadow_range = 100 + shadow_render_power = 5 + col.shadow = 0x53000000 + col.shadow_inactive = 0x32000000 +} + +group { + col.border_inactive = rgba(b7bdf869) + col.border_active = rgba(c6d0f5ee) rgba(b7bdf869) rgba(b7bdf869) rgba(c6d0f5ee) 45deg + + groupbar { + col.active = rgba(b7bdf8ff) + col.inactive = rgba(c6d0f599) + font_family = JetBrainsMono Nerd Font + font_size = 11 + text_color = rgba(cad3f5ff) + } +} diff --git a/.config/hypr/themes/luna/luna.conf b/.config/hypr/themes/luna/luna.conf new file mode 100644 index 00000000..ac9b9cb4 --- /dev/null +++ b/.config/hypr/themes/luna/luna.conf @@ -0,0 +1,3 @@ +source = ./animations.conf +source = ./rules.conf +source = ./decoration.conf diff --git a/.config/hypr/themes/luna/theme.conf b/.config/hypr/themes/luna/theme.conf deleted file mode 100644 index 2af06f27..00000000 --- a/.config/hypr/themes/luna/theme.conf +++ /dev/null @@ -1,109 +0,0 @@ -general { - border_size = 2 - col.inactive_border = rgba(b7bdf869) - col.active_border = rgba(c6d0f5ee) rgba(b7bdf869) rgba(b7bdf869) rgba(c6d0f5ee) 45deg - - gaps_in = 10 - gaps_out = 20 - - allow_tearing = true -} - -decoration { - rounding = 7 - - active_opacity = 0.95 - inactive_opacity = 0.9 - - blur { - enabled = yes - size = 5 - passes = 4 - ignore_opacity = true - new_optimizations = true - xray = true - noise = 0.0 - } - - dim_inactive = false - dim_strength = 0.05 - - drop_shadow = yes - shadow_range = 100 - shadow_render_power = 5 - col.shadow = 0x53000000 - col.shadow_inactive = 0x32000000 -} - -animations { - enabled = 1 - - bezier = default, 0.05, 0.9, 0.1, 1.05 - bezier = wind, 0.05, 0.9, 0.1, 1.05 - bezier = overshot, 0.13, 0.99, 0.29, 1.1 - bezier = liner, 1, 1, 1, 1 - - animation = windows, 1, 7, wind,popin - animation = windowsIn, 1, 7, overshot, popin - animation = windowsOut, 1, 5, overshot, popin - animation = windowsMove, 1, 6, overshot, slide - animation = fadeIn, 1, 10, default - animation = fadeOut, 1, 10, default - animation = workspaces, 1, 7, overshot, slide - animation = border, 1, 1, liner - animation = borderangle, 1, 30, liner, loop -} - -# Mouse and keyboard Config -input { - kb_layout = us, es - kb_options = compose:rctrl, level3:ralt_switch, grp:win_space_toggle - - follow_mouse = 1 - numlock_by_default = true - - touchpad { - natural_scroll = yes - disable_while_typing = true - scroll_factor = 1 - } -} - -misc { - always_follow_on_dnd = true - disable_hyprland_logo = true - vrr = 0 - animate_manual_resizes = true - animate_mouse_windowdragging = false - enable_swallow = true -} - -group { - col.border_inactive = rgba(b7bdf869) - col.border_active = rgba(c6d0f5ee) rgba(b7bdf869) rgba(b7bdf869) rgba(c6d0f5ee) 45deg - - groupbar { - col.active = rgba(b7bdf8ff) - col.inactive = rgba(c6d0f599) - font_family = JetBrainsMono Nerd Font - font_size = 11 - text_color = rgba(cad3f5ff) - } -} - -xwayland { - force_zero_scaling = true -} - -dwindle { - pseudotile = yes # Master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below - preserve_split = yes # You probably want this - pseudotile = true # Enable pseudotiling on dwindle - force_split = 0 - preserve_split = true -} - -gestures { - workspace_swipe = yes - workspace_swipe_fingers = 4 -}