From ba05ef2a6d8ecf6b210c5bc63c74a7e01fc19326 Mon Sep 17 00:00:00 2001 From: Steve Beaulac Date: Thu, 24 Sep 2026 15:55:50 -0400 Subject: [PATCH] refactor(hypr): namespace config under sjb/ Move the Hyprland Lua modules into config/hypr/sjb/ with init.lua as the entry point, so the whole config tree can be symlinked per-file and the unmanaged hypr*.conf files keep their own symlinks. Add an sjb block that requires the new entry point. While here: bind the second Lenovo L15, force 3440x1440@144 on the MAG342CQR, use the named 2fg scroll method, and drop dead locals. Switch the skills mise task to clone/pull SjB/skills into ~/.local/share/skills and symlink it, replacing the npx skills adds. --- config/hypr/{onstart.lua => sjb/autostart.lua} | 0 config/hypr/{ => sjb}/envs.lua | 0 config/hypr/{ => sjb}/functions.lua | 0 config/hypr/{hyprland.lua => sjb/init.lua} | 15 ++++++--------- config/hypr/{ => sjb}/monitors.lua | 6 ++++-- config/hypr/{ => sjb}/rules.lua | 0 config/mise/config.toml | 5 +++-- mise.toml | 6 +++++- 8 files changed, 18 insertions(+), 14 deletions(-) rename config/hypr/{onstart.lua => sjb/autostart.lua} (100%) rename config/hypr/{ => sjb}/envs.lua (100%) rename config/hypr/{ => sjb}/functions.lua (100%) rename config/hypr/{hyprland.lua => sjb/init.lua} (99%) rename config/hypr/{ => sjb}/monitors.lua (90%) rename config/hypr/{ => sjb}/rules.lua (100%) diff --git a/config/hypr/onstart.lua b/config/hypr/sjb/autostart.lua similarity index 100% rename from config/hypr/onstart.lua rename to config/hypr/sjb/autostart.lua diff --git a/config/hypr/envs.lua b/config/hypr/sjb/envs.lua similarity index 100% rename from config/hypr/envs.lua rename to config/hypr/sjb/envs.lua diff --git a/config/hypr/functions.lua b/config/hypr/sjb/functions.lua similarity index 100% rename from config/hypr/functions.lua rename to config/hypr/sjb/functions.lua diff --git a/config/hypr/hyprland.lua b/config/hypr/sjb/init.lua similarity index 99% rename from config/hypr/hyprland.lua rename to config/hypr/sjb/init.lua index 7081a8d..32b532c 100644 --- a/config/hypr/hyprland.lua +++ b/config/hypr/sjb/init.lua @@ -1,19 +1,16 @@ --- local terminal = "ghostty -e" local terminal = "foot" -local _notify_cmd = "notify-send" local browser = "gtk-launch firefox.desktop" local webapp = "chromium --new-window --ozone-platform=wayland --app=" local music = "gtk-launch spotify.desktop" -local LEADER = "SUPER + " local HYPR = "SUPER + CONTROL + SHIFT + ALT + " -require("monitors") -require("functions") -require("rules") +require("sjb/monitors") +require("sjb/functions") +require("sjb/rules") +require("sjb/envs") +require("sjb/autostart") require("theme") -require("envs") -require("onstart") hl.config({ input = { @@ -33,7 +30,7 @@ hl.config({ clickfinger_behavior = true, scroll_factor = 0.7, }, - scroll_method = 2, + scroll_method = "2fg", sensitivity = 0, -- -1.0 - 1.0, 0 means no modification. }, diff --git a/config/hypr/monitors.lua b/config/hypr/sjb/monitors.lua similarity index 90% rename from config/hypr/monitors.lua rename to config/hypr/sjb/monitors.lua index 06c21bf..2b7a18e 100644 --- a/config/hypr/monitors.lua +++ b/config/hypr/sjb/monitors.lua @@ -35,8 +35,9 @@ hl.monitor({ scale = "1.0" }) -hl.monitor({ output = "desc:Lenovo Group Limited L15 U133R0A2", mode = "preferred", position = "auto-left", scale = 1 }) +hl.monitor({ output = "desc:Lenovo Group Limited L15 U133R0A2", mode = "preferred", position = "auto-down", scale = 1 }) hl.monitor({ output = "desc:Lenovo Group Limited M15 V30F2A15", mode = "preferred", position = "auto-left", scale = 1 }) +hl.monitor({ output = "desc:Lenovo Group Limited L15 U133X4PG", mode = "preferred", position = "auto-down", scale = 1 }) hl.monitor({ output = "desc:Proteon TYPE-C 8R33926O00QS", mode = "preferred", position = "auto-right", scale = "1.0" }) hl.monitor({ output = "desc:Stargate Technology TYPE-C", mode = "preferred", position = "auto-down", scale = "1.0" }) hl.monitor({ output = "desc:GWD ARZOPA 000000000000", mode = "preferred", position = "auto-down", scale = "1.0" }) @@ -51,7 +52,8 @@ hl.monitor({ }) hl.monitor({ output = "desc:Microstep MSI MAG342CQR DB6H252300057", - mode = "preferred", + mode = "3440x1440@144", + -- mode = "preferred", position = "auto-left", scale = "1.0" diff --git a/config/hypr/rules.lua b/config/hypr/sjb/rules.lua similarity index 100% rename from config/hypr/rules.lua rename to config/hypr/sjb/rules.lua diff --git a/config/mise/config.toml b/config/mise/config.toml index 9ff8048..00ce074 100644 --- a/config/mise/config.toml +++ b/config/mise/config.toml @@ -52,8 +52,9 @@ run = [ [tasks.skills] run = [ - 'npx skills add SjB/skills', - 'npx skills add mattpocock/skills' + "test -d ~/.local/share/skills || git clone https://github.com/SjB/skills.git ~/.local/share/skills", + "git -C ~/.local/share/skills pull --rebase", + "ln -snf ~/.local/share/skills/skills ~/.agents/skills" ] [tasks.herdr_setup] diff --git a/mise.toml b/mise.toml index 3183428..d65b2c4 100644 --- a/mise.toml +++ b/mise.toml @@ -21,7 +21,11 @@ dotfiles.default_mode = "symlink-each" "~/.config/fabric" = "config/fabric" "~/.config/fontconfig" = { source = "config/fontconfig", mode = "copy" } "~/.config/foot" = "config/foot" -"~/.config/hypr" = "config/hypr" +"~/.config/hypr/sjb" = "config/hypr/sjb" +"~/.config/hypr/hypridle.conf" = { source = "config/hypr/hypridle.conf", mode = "symlink" } +"~/.config/hypr/hyprlock.conf" = { source = "config/hypr/hyprlock.conf", mode = "symlink" } +"~/.config/hypr/hyprpm.conf" = { source = "config/hypr/hyprpm.conf", mode = "symlink" } +"~/.config/hypr/hyprland.lua/sjb" = { block = 'require("sjb.init")' } "~/.config/jj" = "config/jj" "~/.config/jj/conf.d/local.toml" = { source = "templates/git-local.tmpl", mode = "template", template = "tera" } "~/.config/kitty" = "config/kitty"