From 9015796dd74eefa762dfc5f3ee4fd160e1bb8fe1 Mon Sep 17 00:00:00 2001 From: Price Hiller Date: Fri, 15 Mar 2024 23:18:05 -0500 Subject: [PATCH] refactor(hypr): improve config layout --- .../hypr/conf/application/gromit-mpx.conf | 21 +++++++++++++++++++ .../hypr/{wm => conf/core}/appearance.conf | 3 +++ .../hypr/{wm => conf/core}/bindings.conf | 13 ++++++------ .../hypr/{wm => conf/core}/colors.conf | 0 dots/.config/hypr/{wm => conf/core}/env.conf | 0 .../hypr/{wm => conf/core}/general.conf | 0 .../hypr/{wm => conf/core}/monitors.conf | 0 .../hypr/{wm => conf/core}/window-rules.conf | 2 -- dots/.config/hypr/conf/init.conf | 12 +++++++++++ dots/.config/hypr/hyprland.conf | 8 ++----- 10 files changed, 44 insertions(+), 15 deletions(-) create mode 100644 dots/.config/hypr/conf/application/gromit-mpx.conf rename dots/.config/hypr/{wm => conf/core}/appearance.conf (90%) rename dots/.config/hypr/{wm => conf/core}/bindings.conf (95%) rename dots/.config/hypr/{wm => conf/core}/colors.conf (100%) rename dots/.config/hypr/{wm => conf/core}/env.conf (100%) rename dots/.config/hypr/{wm => conf/core}/general.conf (100%) rename dots/.config/hypr/{wm => conf/core}/monitors.conf (100%) rename dots/.config/hypr/{wm => conf/core}/window-rules.conf (83%) create mode 100644 dots/.config/hypr/conf/init.conf diff --git a/dots/.config/hypr/conf/application/gromit-mpx.conf b/dots/.config/hypr/conf/application/gromit-mpx.conf new file mode 100644 index 00000000..f9e878c0 --- /dev/null +++ b/dots/.config/hypr/conf/application/gromit-mpx.conf @@ -0,0 +1,21 @@ +### GROMIT-MPX ### +workspace = special:gromit,gapsin:0,gapsout:0,decorate:false,border:false,on-created-empty:gromit-mpx -a +windowrulev2 = noblur,class:^(Gromit-mpx)$ +windowrulev2 = opacity 1 override, 1 override,class:^(Gromit-mpx)$ +windowrulev2 = noshadow,class:^(Gromit-mpx)$ +windowrulev2 = nofullscreenrequest,class:^(Gromit-mpx)$ +windowrulev2 = noanim,class:^(Gromit-mpx)$ +windowrulev2 = size 100% 100%,class:^(Gromit-mpx)$ + +# Gromit Bindings +bind = CTRLSUPER,x,togglespecialworkspace,gromit +bind = CTRLSUPER,x,submap,gromit +submap = gromit +bind = ,c,exec, gromit-mpx --clear +bind = CTRL,z,exec, gromit-mpx --undo +bind = ,z,exec, gromit-mpx --redo +bind = CTRLSUPER,x,togglespecialworkspace,gromit +bind = CTRLSUPER,x,submap,reset +bind = ,escape,togglespecialworkspace,gromit +bind = ,escape,submap,reset +submap = reset diff --git a/dots/.config/hypr/wm/appearance.conf b/dots/.config/hypr/conf/core/appearance.conf similarity index 90% rename from dots/.config/hypr/wm/appearance.conf rename to dots/.config/hypr/conf/core/appearance.conf index ebf4dd40..812bb766 100644 --- a/dots/.config/hypr/wm/appearance.conf +++ b/dots/.config/hypr/conf/core/appearance.conf @@ -12,8 +12,11 @@ decoration { shadow_ignore_window = true shadow_range = 45 shadow_render_power = 6 + dim_special = 0.05 } +animation=specialWorkspace,0 + animations { enabled = 1 bezier = overshot,0.08,0.8,0,1.1 diff --git a/dots/.config/hypr/wm/bindings.conf b/dots/.config/hypr/conf/core/bindings.conf similarity index 95% rename from dots/.config/hypr/wm/bindings.conf rename to dots/.config/hypr/conf/core/bindings.conf index 5c8ba9fb..a6b5fb4a 100644 --- a/dots/.config/hypr/wm/bindings.conf +++ b/dots/.config/hypr/conf/core/bindings.conf @@ -67,11 +67,14 @@ bind = SUPER,Q,killactive, bind = SUPER,A,togglefloating, bind = SUPER,D,exec,makoctl dismiss -a bind = SUPERSHIFT,Q,exec,swaylock -bind = SUPER,S,exec,grim -g "$(slurp)" - | wl-copy --type image/png -bind = CTRLSUPER,S,exec,grim -g "$(slurp)" - | swappy -f - +bind = SUPERSHIFT,M,exit + +### Screen Captures ### +# May be videos or screenshots +bind = SUPER,S,exec,grim -g "$(slurp)" - | swappy -f - +bind = CTRLSUPER,S,exec,grim -g "$(slurp)" - | wl-copy --type image/png bind = SUPERSHIFT,S,exec,~/.config/hypr/scripts/screen-cap.bash bind = SUPERSHIFT,A,exec,~/.config/hypr/scripts/screen-cap.bash gif -bind = SUPERSHIFT,M,exit # Mediakey bindings as taken from `wev` bindl = ,XF86AudioPrev,exec,playerctl previous @@ -120,7 +123,3 @@ bind = SUPERCTRL,6,exec,~/.config/hypr/scripts/move-workspace-mon.bash 6 bind = SUPERCTRL,7,exec,~/.config/hypr/scripts/move-workspace-mon.bash 7 bind = SUPERCTRL,8,exec,~/.config/hypr/scripts/move-workspace-mon.bash 8 bind = SUPERCTRL,9,exec,~/.config/hypr/scripts/move-workspace-mon.bash 9 - -### Special Workspace ### -bind = SUPERCTRL,s,togglespecialworkspace -bind = SUPERCTRL,a,movetoworkspace,special diff --git a/dots/.config/hypr/wm/colors.conf b/dots/.config/hypr/conf/core/colors.conf similarity index 100% rename from dots/.config/hypr/wm/colors.conf rename to dots/.config/hypr/conf/core/colors.conf diff --git a/dots/.config/hypr/wm/env.conf b/dots/.config/hypr/conf/core/env.conf similarity index 100% rename from dots/.config/hypr/wm/env.conf rename to dots/.config/hypr/conf/core/env.conf diff --git a/dots/.config/hypr/wm/general.conf b/dots/.config/hypr/conf/core/general.conf similarity index 100% rename from dots/.config/hypr/wm/general.conf rename to dots/.config/hypr/conf/core/general.conf diff --git a/dots/.config/hypr/wm/monitors.conf b/dots/.config/hypr/conf/core/monitors.conf similarity index 100% rename from dots/.config/hypr/wm/monitors.conf rename to dots/.config/hypr/conf/core/monitors.conf diff --git a/dots/.config/hypr/wm/window-rules.conf b/dots/.config/hypr/conf/core/window-rules.conf similarity index 83% rename from dots/.config/hypr/wm/window-rules.conf rename to dots/.config/hypr/conf/core/window-rules.conf index 0cd60bea..2bbcec31 100644 --- a/dots/.config/hypr/wm/window-rules.conf +++ b/dots/.config/hypr/conf/core/window-rules.conf @@ -1,5 +1,3 @@ -windowrule = noblur,fullscreen:1,title:^(gromit-mpx)$ - # Xwayland Video Bridge Rules windowrulev2 = opacity 0.0 override 0.0 override,class:^(xwaylandvideobridge)$ windowrulev2 = noanim,class:^(xwaylandvideobridge)$ diff --git a/dots/.config/hypr/conf/init.conf b/dots/.config/hypr/conf/init.conf new file mode 100644 index 00000000..34f1c990 --- /dev/null +++ b/dots/.config/hypr/conf/init.conf @@ -0,0 +1,12 @@ +$configDir = ~/.config/hypr/conf + +### Core Config ### +source = $configDir/core/env.conf +source = $configDir/core/general.conf +source = $configDir/core/bindings.conf +source = $configDir/core/appearance.conf +source = $configDir/core/monitors.conf +source = $configDir/core/window-rules.conf + +### Application Specific ### +source = $configDir/application/gromit-mpx.conf diff --git a/dots/.config/hypr/hyprland.conf b/dots/.config/hypr/hyprland.conf index 9f61b405..60f6e015 100644 --- a/dots/.config/hypr/hyprland.conf +++ b/dots/.config/hypr/hyprland.conf @@ -1,9 +1,5 @@ -source = ~/.config/hypr/wm/env.conf -source = ~/.config/hypr/wm/general.conf -source = ~/.config/hypr/wm/bindings.conf -source = ~/.config/hypr/wm/appearance.conf -source = ~/.config/hypr/wm/monitors.conf -source = ~/.config/hypr/wm/window-rules.conf +source = ~/.config/hypr/conf/init.conf + exec = systemd-run --user --unit=udiskie udiskie --tray || systemctl --user restart udiskie exec = systemd-run --user --unit=blueman-applet blueman-applet || systemctl --user restart blueman-applet exec = systemd-run --user --unit=slimbookbattery slimbookbattery --minimize || systemctl --user restart slimbookbattery