Compare commits
3 Commits
b148fcc256
..
main
| Author | SHA1 | Date | |
|---|---|---|---|
| 2d5a4e9f4c | |||
| 8d2aa49668 | |||
| f60b7e263b |
@@ -44,11 +44,43 @@ hl.bind(mainMod .. " + L", hl.dsp.focus({ direction = "r" }), { desc = "Focus ri
|
|||||||
hl.bind(mainMod .. " + K", hl.dsp.focus({ direction = "u" }), { desc = "Focus up" })
|
hl.bind(mainMod .. " + K", hl.dsp.focus({ direction = "u" }), { desc = "Focus up" })
|
||||||
hl.bind(mainMod .. " + J", hl.dsp.focus({ direction = "d" }), { desc = "Focus down" })
|
hl.bind(mainMod .. " + J", hl.dsp.focus({ direction = "d" }), { desc = "Focus down" })
|
||||||
|
|
||||||
-- Cycle workspaces on the active monitor with mainMod + arrows (m+1/m-1 stay
|
-- Cycle workspaces on the active monitor with mainMod + arrows. Advancing past
|
||||||
-- on the current monitor; plain +1/-1 would follow the workspace if it moves
|
-- the last workspace on the monitor creates a fresh (empty) workspace there;
|
||||||
-- to another monitor). These only visit non-empty workspaces.
|
-- going before the first wraps around to the last one on the monitor.
|
||||||
hl.bind(mainMod .. " + Left", hl.dsp.focus({ workspace = "m-1" }), { desc = "Previous workspace (active monitor)" })
|
local function step_workspace(dir)
|
||||||
hl.bind(mainMod .. " + Right", hl.dsp.focus({ workspace = "m+1" }), { desc = "Next workspace (active monitor)" })
|
local mon = hl.get_active_monitor()
|
||||||
|
if not mon then return end
|
||||||
|
local current = mon.active_workspace.id
|
||||||
|
|
||||||
|
local mon_ids, all_max = {}, 0
|
||||||
|
for _, ws in ipairs(hl.get_workspaces()) do
|
||||||
|
if ws.id > all_max then all_max = ws.id end
|
||||||
|
if ws.monitor and ws.monitor.id == mon.id then
|
||||||
|
table.insert(mon_ids, ws.id)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
table.sort(mon_ids)
|
||||||
|
|
||||||
|
local target
|
||||||
|
if dir > 0 then
|
||||||
|
for _, id in ipairs(mon_ids) do
|
||||||
|
if id > current then target = id break end
|
||||||
|
end
|
||||||
|
-- No next workspace on this monitor: create one right here.
|
||||||
|
if not target then target = all_max + 1 end
|
||||||
|
else
|
||||||
|
for i = #mon_ids, 1, -1 do
|
||||||
|
if mon_ids[i] < current then target = mon_ids[i] break end
|
||||||
|
end
|
||||||
|
-- No previous workspace on this monitor: wrap to the last one.
|
||||||
|
if not target and #mon_ids > 0 then target = mon_ids[#mon_ids] end
|
||||||
|
end
|
||||||
|
|
||||||
|
if target then hl.dispatch(hl.dsp.focus({ workspace = target })) end
|
||||||
|
end
|
||||||
|
|
||||||
|
hl.bind(mainMod .. " + Left", function() step_workspace(-1) end, { desc = "Previous workspace (active monitor)" })
|
||||||
|
hl.bind(mainMod .. " + Right", function() step_workspace(1) end, { desc = "Next workspace (active monitor); creates one past the end" })
|
||||||
|
|
||||||
-- Switch workspaces with mainMod + [0-9]
|
-- Switch workspaces with mainMod + [0-9]
|
||||||
for i = 1, 10 do
|
for i = 1, 10 do
|
||||||
|
|||||||
@@ -41,8 +41,8 @@ hl.config({
|
|||||||
|
|
||||||
hl.config({
|
hl.config({
|
||||||
binds = {
|
binds = {
|
||||||
-- Let SUPER+Left/Right (and scroll) wrap around instead of stopping at the
|
-- Let SUPER+scroll workspace cycling wrap around instead of stopping at
|
||||||
-- edge when cycling workspaces on the active monitor.
|
-- the edges. (SUPER+Left/Right wrapping is handled directly in binds.lua.)
|
||||||
allow_workspace_cycles = true,
|
allow_workspace_cycles = true,
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -2,33 +2,8 @@
|
|||||||
|
|
||||||
hl.monitor({
|
hl.monitor({
|
||||||
output = "desc:BOE 0x0BC9",
|
output = "desc:BOE 0x0BC9",
|
||||||
disabled = true,
|
mode = "2560x1600@165",
|
||||||
})
|
position = "0x0",
|
||||||
|
|
||||||
hl.monitor({
|
|
||||||
output = "desc:Dell Inc. DELL U2515HX GMDK46C4053L",
|
|
||||||
mode = "2560x1440@59.951",
|
|
||||||
position = "5488x345",
|
|
||||||
scale = 1,
|
|
||||||
cm = "srgb",
|
|
||||||
sdr_min_luminance = 0.2,
|
|
||||||
sdr_max_luminance = 80,
|
|
||||||
})
|
|
||||||
|
|
||||||
hl.monitor({
|
|
||||||
output = "desc:Dell Inc. DELL U2518D 0WG2J9C5B3WL",
|
|
||||||
mode = "2560x1440@59.951",
|
|
||||||
position = "2928x345",
|
|
||||||
scale = 1,
|
|
||||||
cm = "srgb",
|
|
||||||
sdr_min_luminance = 0.2,
|
|
||||||
sdr_max_luminance = 80,
|
|
||||||
})
|
|
||||||
|
|
||||||
hl.monitor({
|
|
||||||
output = "desc:Viewteck Co. Ltd. GNV34DB",
|
|
||||||
mode = "3440x1440@50",
|
|
||||||
position = "3795x1785",
|
|
||||||
scale = 1,
|
scale = 1,
|
||||||
cm = "srgb",
|
cm = "srgb",
|
||||||
sdr_min_luminance = 0.2,
|
sdr_min_luminance = 0.2,
|
||||||
|
|||||||
@@ -43,7 +43,6 @@
|
|||||||
actions: (
|
actions: (
|
||||||
actions: [
|
actions: [
|
||||||
lock_screen,
|
lock_screen,
|
||||||
hibernate,
|
|
||||||
logout,
|
logout,
|
||||||
reboot,
|
reboot,
|
||||||
shutdown,
|
shutdown,
|
||||||
|
|||||||
@@ -51,7 +51,7 @@
|
|||||||
"reserved_bottom": 0,
|
"reserved_bottom": 0,
|
||||||
"reserved_left": 0,
|
"reserved_left": 0,
|
||||||
"reserved_right": 0,
|
"reserved_right": 0,
|
||||||
"enabled": false,
|
"enabled": true,
|
||||||
"focus_at_startup": false
|
"focus_at_startup": false
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -275,5 +275,5 @@
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
"workspace_rules": [],
|
"workspace_rules": [],
|
||||||
"last_applied_time": 1788817484.835665
|
"last_applied_time": 1788832961.6364207
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,7 +1,16 @@
|
|||||||
{
|
{
|
||||||
"last_applied_time": 0.0,
|
"name": "laptop",
|
||||||
"monitors": [
|
"monitors": [
|
||||||
{
|
{
|
||||||
|
"name": "eDP-2",
|
||||||
|
"description": "BOE 0x0BC9",
|
||||||
|
"make": "BOE",
|
||||||
|
"model": "0x0BC9",
|
||||||
|
"serial": "",
|
||||||
|
"width": 2560,
|
||||||
|
"height": 1600,
|
||||||
|
"refresh_rate": 165.0,
|
||||||
|
"resolution_mode": "explicit",
|
||||||
"available_modes": [
|
"available_modes": [
|
||||||
"2560x1600@165.00Hz",
|
"2560x1600@165.00Hz",
|
||||||
"2560x1600@60.00Hz",
|
"2560x1600@60.00Hz",
|
||||||
@@ -17,44 +26,35 @@
|
|||||||
"800x600@165.00Hz",
|
"800x600@165.00Hz",
|
||||||
"640x480@165.00Hz"
|
"640x480@165.00Hz"
|
||||||
],
|
],
|
||||||
"bitdepth": 8,
|
"x": 0,
|
||||||
"color_management": "srgb",
|
"y": 0,
|
||||||
"description": "BOE 0x0BC9",
|
|
||||||
"enabled": true,
|
|
||||||
"focus_at_startup": false,
|
|
||||||
"height": 1600,
|
|
||||||
"icc_profile": "",
|
|
||||||
"make": "BOE",
|
|
||||||
"max_avg_luminance": 0.0,
|
|
||||||
"max_luminance": 0.0,
|
|
||||||
"min_luminance": 0.0,
|
|
||||||
"mirror_of": "",
|
|
||||||
"model": "0x0BC9",
|
|
||||||
"name": "eDP-2",
|
|
||||||
"position_mode": "explicit",
|
"position_mode": "explicit",
|
||||||
"refresh_rate": 165.0,
|
"scale": 1,
|
||||||
|
"scale_mode": "explicit",
|
||||||
|
"transform": 0,
|
||||||
|
"mirror_of": "",
|
||||||
|
"bitdepth": 8,
|
||||||
|
"vrr": 0,
|
||||||
|
"color_management": "srgb",
|
||||||
|
"icc_profile": "",
|
||||||
|
"sdr_brightness": 1,
|
||||||
|
"sdr_saturation": 1,
|
||||||
|
"sdr_eotf": 0,
|
||||||
|
"supports_hdr": 0,
|
||||||
|
"supports_wide_color": 0,
|
||||||
|
"sdr_min_luminance": 0.2,
|
||||||
|
"sdr_max_luminance": 80,
|
||||||
|
"min_luminance": 0.0,
|
||||||
|
"max_luminance": 0.0,
|
||||||
|
"max_avg_luminance": 0.0,
|
||||||
|
"reserved_top": 0,
|
||||||
"reserved_bottom": 0,
|
"reserved_bottom": 0,
|
||||||
"reserved_left": 0,
|
"reserved_left": 0,
|
||||||
"reserved_right": 0,
|
"reserved_right": 0,
|
||||||
"reserved_top": 0,
|
"enabled": true,
|
||||||
"resolution_mode": "explicit",
|
"focus_at_startup": false
|
||||||
"scale": 1,
|
|
||||||
"scale_mode": "explicit",
|
|
||||||
"sdr_brightness": 1,
|
|
||||||
"sdr_eotf": 0,
|
|
||||||
"sdr_max_luminance": 80,
|
|
||||||
"sdr_min_luminance": 0.2,
|
|
||||||
"sdr_saturation": 1,
|
|
||||||
"serial": "",
|
|
||||||
"supports_hdr": 0,
|
|
||||||
"supports_wide_color": 0,
|
|
||||||
"transform": 0,
|
|
||||||
"vrr": 0,
|
|
||||||
"width": 2560,
|
|
||||||
"x": 0,
|
|
||||||
"y": 0
|
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"name": "laptop",
|
"workspace_rules": [],
|
||||||
"workspace_rules": []
|
"last_applied_time": 1788832965.6726744
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,5 +2,5 @@
|
|||||||
"clamshell_mode": true,
|
"clamshell_mode": true,
|
||||||
"update_sddm": true,
|
"update_sddm": true,
|
||||||
"migrate_workspaces": true,
|
"migrate_workspaces": true,
|
||||||
"active_profile": "desk"
|
"active_profile": "laptop"
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
Submodule nvim/.config/nvim updated: 94b2c40db1...b548abcf80
@@ -89,10 +89,11 @@
|
|||||||
"menu": "on-click",
|
"menu": "on-click",
|
||||||
"menu-file": "~/.config/waybar/power_menu.xml",
|
"menu-file": "~/.config/waybar/power_menu.xml",
|
||||||
"menu-actions": {
|
"menu-actions": {
|
||||||
"shutdown": "shutdown",
|
|
||||||
"reboot": "reboot",
|
|
||||||
"suspend": "systemctl suspend",
|
"suspend": "systemctl suspend",
|
||||||
"hibernate": "systemctl hibernate",
|
"lock": "hyprlock",
|
||||||
|
"logout": "hyprctl dispatch exit",
|
||||||
|
"reboot": "reboot",
|
||||||
|
"shutdown": "shutdown",
|
||||||
},
|
},
|
||||||
"escape": true
|
"escape": true
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -7,21 +7,26 @@
|
|||||||
</object>
|
</object>
|
||||||
</child>
|
</child>
|
||||||
<child>
|
<child>
|
||||||
<object class="GtkMenuItem" id="hibernate">
|
<object class="GtkMenuItem" id="lock">
|
||||||
<property name="label">Hibernate</property>
|
<property name="label">Lock</property>
|
||||||
</object>
|
</object>
|
||||||
</child>
|
</child>
|
||||||
<child>
|
<child>
|
||||||
<object class="GtkMenuItem" id="shutdown">
|
<object class="GtkMenuItem" id="logout">
|
||||||
<property name="label">Shutdown</property>
|
<property name="label">Logout</property>
|
||||||
|
</object>
|
||||||
|
</child>
|
||||||
|
<child>
|
||||||
|
<object class="GtkMenuItem" id="reboot">
|
||||||
|
<property name="label">Restart</property>
|
||||||
</object>
|
</object>
|
||||||
</child>
|
</child>
|
||||||
<child>
|
<child>
|
||||||
<object class="GtkSeparatorMenuItem" id="delimiter1" />
|
<object class="GtkSeparatorMenuItem" id="delimiter1" />
|
||||||
</child>
|
</child>
|
||||||
<child>
|
<child>
|
||||||
<object class="GtkMenuItem" id="reboot">
|
<object class="GtkMenuItem" id="shutdown">
|
||||||
<property name="label">Reboot</property>
|
<property name="label">Shutdown</property>
|
||||||
</object>
|
</object>
|
||||||
</child>
|
</child>
|
||||||
</object>
|
</object>
|
||||||
|
|||||||
Reference in New Issue
Block a user