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.
This commit is contained in:
@@ -1,19 +1,16 @@
|
|||||||
-- local terminal = "ghostty -e"
|
|
||||||
local terminal = "foot"
|
local terminal = "foot"
|
||||||
local _notify_cmd = "notify-send"
|
|
||||||
local browser = "gtk-launch firefox.desktop"
|
local browser = "gtk-launch firefox.desktop"
|
||||||
local webapp = "chromium --new-window --ozone-platform=wayland --app="
|
local webapp = "chromium --new-window --ozone-platform=wayland --app="
|
||||||
local music = "gtk-launch spotify.desktop"
|
local music = "gtk-launch spotify.desktop"
|
||||||
|
|
||||||
local LEADER = "SUPER + "
|
|
||||||
local HYPR = "SUPER + CONTROL + SHIFT + ALT + "
|
local HYPR = "SUPER + CONTROL + SHIFT + ALT + "
|
||||||
|
|
||||||
require("monitors")
|
require("sjb/monitors")
|
||||||
require("functions")
|
require("sjb/functions")
|
||||||
require("rules")
|
require("sjb/rules")
|
||||||
|
require("sjb/envs")
|
||||||
|
require("sjb/autostart")
|
||||||
require("theme")
|
require("theme")
|
||||||
require("envs")
|
|
||||||
require("onstart")
|
|
||||||
|
|
||||||
hl.config({
|
hl.config({
|
||||||
input = {
|
input = {
|
||||||
@@ -33,7 +30,7 @@ hl.config({
|
|||||||
clickfinger_behavior = true,
|
clickfinger_behavior = true,
|
||||||
scroll_factor = 0.7,
|
scroll_factor = 0.7,
|
||||||
},
|
},
|
||||||
scroll_method = 2,
|
scroll_method = "2fg",
|
||||||
|
|
||||||
sensitivity = 0, -- -1.0 - 1.0, 0 means no modification.
|
sensitivity = 0, -- -1.0 - 1.0, 0 means no modification.
|
||||||
},
|
},
|
||||||
@@ -35,8 +35,9 @@ hl.monitor({
|
|||||||
scale =
|
scale =
|
||||||
"1.0"
|
"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 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: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: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" })
|
hl.monitor({ output = "desc:GWD ARZOPA 000000000000", mode = "preferred", position = "auto-down", scale = "1.0" })
|
||||||
@@ -51,7 +52,8 @@ hl.monitor({
|
|||||||
})
|
})
|
||||||
hl.monitor({
|
hl.monitor({
|
||||||
output = "desc:Microstep MSI MAG342CQR DB6H252300057",
|
output = "desc:Microstep MSI MAG342CQR DB6H252300057",
|
||||||
mode = "preferred",
|
mode = "3440x1440@144",
|
||||||
|
-- mode = "preferred",
|
||||||
position = "auto-left",
|
position = "auto-left",
|
||||||
scale =
|
scale =
|
||||||
"1.0"
|
"1.0"
|
||||||
@@ -52,8 +52,9 @@ run = [
|
|||||||
|
|
||||||
[tasks.skills]
|
[tasks.skills]
|
||||||
run = [
|
run = [
|
||||||
'npx skills add SjB/skills',
|
"test -d ~/.local/share/skills || git clone https://github.com/SjB/skills.git ~/.local/share/skills",
|
||||||
'npx skills add mattpocock/skills'
|
"git -C ~/.local/share/skills pull --rebase",
|
||||||
|
"ln -snf ~/.local/share/skills/skills ~/.agents/skills"
|
||||||
]
|
]
|
||||||
|
|
||||||
[tasks.herdr_setup]
|
[tasks.herdr_setup]
|
||||||
|
|||||||
@@ -21,7 +21,11 @@ dotfiles.default_mode = "symlink-each"
|
|||||||
"~/.config/fabric" = "config/fabric"
|
"~/.config/fabric" = "config/fabric"
|
||||||
"~/.config/fontconfig" = { source = "config/fontconfig", mode = "copy" }
|
"~/.config/fontconfig" = { source = "config/fontconfig", mode = "copy" }
|
||||||
"~/.config/foot" = "config/foot"
|
"~/.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" = "config/jj"
|
||||||
"~/.config/jj/conf.d/local.toml" = { source = "templates/git-local.tmpl", mode = "template", template = "tera" }
|
"~/.config/jj/conf.d/local.toml" = { source = "templates/git-local.tmpl", mode = "template", template = "tera" }
|
||||||
"~/.config/kitty" = "config/kitty"
|
"~/.config/kitty" = "config/kitty"
|
||||||
|
|||||||
Reference in New Issue
Block a user