diff --git a/modules/user/hyprland.nix b/modules/user/hyprland.nix index 95afabe..247cec9 100644 --- a/modules/user/hyprland.nix +++ b/modules/user/hyprland.nix @@ -157,7 +157,7 @@ in { bind = [ (bind "SUPER + V" (exec "ghostty --title=clipse -e clipse")) (hyprLua.bind "SUPER + SHIFT + V" (hyprLua.execLauncher "qs ipc call launcher clipboard")) - (bind "Print" (exec "qs ipc call snap toggle")) + (bind "Print" (exec "qs ipc call screenshot full")) (bind "SUPER + Print" (exec "qs ipc call screenshot full")) (bind "CTRL + Print" (exec "qs ipc call snap region")) (bind "ALT + Print" (exec "qs ipc call snap window")) diff --git a/modules/user/lucid/lucid-keybinds-rias.json b/modules/user/lucid/lucid-keybinds-rias.json index bd33194..feec909 100644 --- a/modules/user/lucid/lucid-keybinds-rias.json +++ b/modules/user/lucid/lucid-keybinds-rias.json @@ -17,7 +17,7 @@ { "id": "launcher", "keys": "SUPER + D", "desc": "App launcher", "category": "Lucid", "type": "exec", "cmd": "hyprctl eval 'hl.config({ input = { follow_mouse = 2 } })' && qs ipc call launcher toggle" }, { "id": "clipse", "keys": "SUPER + V", "desc": "Clipboard manager", "category": "Apps", "type": "exec", "cmd": "ghostty --title=clipse -e clipse" }, { "id": "clipboard", "keys": "SUPER + SHIFT + V", "desc": "Clipboard history", "category": "Lucid", "type": "exec", "cmd": "hyprctl eval 'hl.config({ input = { follow_mouse = 2 } })' && qs ipc call launcher clipboard" }, - { "id": "screenshot", "keys": "Print", "desc": "Region screenshot", "category": "Screenshots", "type": "exec", "cmd": "qs ipc call snap toggle" }, + { "id": "screenshot", "keys": "Print", "desc": "Full screenshot", "category": "Screenshots", "type": "exec", "cmd": "qs ipc call screenshot full" }, { "id": "screenshot-full", "keys": "SUPER + Print", "desc": "Full screenshot", "category": "Screenshots", "type": "exec", "cmd": "qs ipc call screenshot full" }, { "id": "screenshot-region", "keys": "CTRL + Print", "desc": "Region screenshot", "category": "Screenshots", "type": "exec", "cmd": "qs ipc call snap region" }, { "id": "screenshot-window", "keys": "ALT + Print", "desc": "Window screenshot", "category": "Screenshots", "type": "exec", "cmd": "qs ipc call snap window" }, @@ -43,12 +43,13 @@ { "id": "resize-down", "keys": "SUPER + CTRL + DOWN", "desc": "Resize window down", "category": "Windows", "type": "lua", "lua": "hl.dsp.window.resize({ x = 0, y = 60, relative = true })" }, { "id": "workspace-focus", "keys": "SUPER + {key}", "desc": "Focus workspace {n}", "category": "Workspaces", "type": "lua", "lua": "hl.dsp.focus({ workspace = {n} })", "each": "workspace" }, { "id": "workspace-move", "keys": "SUPER + SHIFT + {key}", "desc": "Move window to workspace {n}", "category": "Workspaces", "type": "lua", "lua": "hl.dsp.window.move({ workspace = {n}, follow = false })", "each": "workspace" }, - { "id": "scratchpad", "keys": "SUPER + SHIFT + S", "desc": "Toggle scratchpad", "category": "Workspaces", "type": "lua", "lua": "specials.scratchpad()" }, + { "id": "scratchpad", "keys": "SUPER + ALT + P", "desc": "Toggle scratchpad", "category": "Workspaces", "type": "lua", "lua": "specials.scratchpad()" }, { "id": "scratchpad-stash", "keys": "SUPER + ALT + S", "desc": "Stash or restore the focused window", "category": "Workspaces", "type": "lua", "lua": "specials.stash()" }, - { "id": "special-music", "keys": "SUPER + SHIFT + M", "desc": "Toggle Music workspace", "category": "Workspaces", "type": "lua", "lua": "specials.toggle('music')" }, - { "id": "special-comms", "keys": "SUPER + SHIFT + D", "desc": "Toggle Comms workspace", "category": "Workspaces", "type": "lua", "lua": "specials.toggle('comms')" }, - { "id": "special-todo", "keys": "SUPER + SHIFT + R", "desc": "Toggle To-do workspace", "category": "Workspaces", "type": "lua", "lua": "specials.toggle('todo')" }, - { "id": "special-sysmon", "keys": "CTRL + SHIFT + ESCAPE", "desc": "Toggle system monitor workspace", "category": "Workspaces", "type": "lua", "lua": "specials.toggle('sysmon')" }, + { "id": "special-music", "keys": "SUPER + ALT + M", "desc": "Toggle Music workspace", "category": "Workspaces", "type": "lua", "lua": "specials.toggle('music')" }, + { "id": "special-comms", "keys": "SUPER + ALT + C", "desc": "Toggle Comms workspace", "category": "Workspaces", "type": "lua", "lua": "specials.toggle('comms')" }, + { "id": "special-todo", "keys": "SUPER + ALT + T", "desc": "Toggle To-do workspace", "category": "Workspaces", "type": "lua", "lua": "specials.toggle('todo')" }, + { "id": "special-sysmon", "keys": "SUPER + ALT + B", "desc": "Toggle system monitor workspace", "category": "Workspaces", "type": "lua", "lua": "specials.toggle('sysmon')" }, + { "id": "daemons-workspace", "keys": "SUPER + ALT + D", "desc": "Daemons workspace", "category": "Workspaces", "type": "lua", "lua": "specials.toggle('daemons')" }, { "id": "fullscreen", "keys": "SUPER + SHIFT + F", "desc": "Toggle fullscreen", "category": "Windows", "type": "lua", "lua": "hl.dsp.window.fullscreen({ action = 'toggle', mode = 'fullscreen' })" }, { "id": "workspace-next-scroll", "keys": "SUPER + mouse_down", "desc": "Next workspace", "category": "Workspaces", "type": "lua", "lua": "hl.dsp.focus({ workspace = 'e-1' })" }, { "id": "workspace-previous-scroll", "keys": "SUPER + mouse_up", "desc": "Previous workspace", "category": "Workspaces", "type": "lua", "lua": "hl.dsp.focus({ workspace = 'e+1' })" }, diff --git a/modules/user/lucid/lucid-monitors-rias.lua b/modules/user/lucid/lucid-monitors-rias.lua index 6521d2f..a090c4d 100644 --- a/modules/user/lucid/lucid-monitors-rias.lua +++ b/modules/user/lucid/lucid-monitors-rias.lua @@ -5,8 +5,5 @@ return { { output = "desc:Huawei Technologies Co. Inc. ZQE-CAA 0xC080F622", mode = "3440x1440@120.00", position = "1920x0", scale = "1" }, { output = "desc:Samsung Electric Company SAMSUNG 0x01000E00", mode = "1920x1080@60.00", position = "0x0", scale = "1" }, }, - workspaces = { - { workspace = "2", monitor = "desc:Huawei Technologies Co. Inc. ZQE-CAA 0xC080F622", default = true }, - { workspace = "11", monitor = "desc:Samsung Electric Company SAMSUNG 0x01000E00", default = true }, - }, + workspaces = {}, } diff --git a/modules/user/lucid/lucid-prefs.json b/modules/user/lucid/lucid-prefs.json index 12700ea..36f1371 100644 --- a/modules/user/lucid/lucid-prefs.json +++ b/modules/user/lucid/lucid-prefs.json @@ -174,7 +174,7 @@ "monitorDockScreen": "", "monitorSetups": "{\"desc:Huawei Technologies Co. Inc. ZQE-CAA 0xC080F622\":{\"x\":1920,\"y\":0,\"mode\":\"3440x1440@120.00\"},\"desc:Samsung Electric Company SAMSUNG 0x01000E00\":{\"x\":0,\"y\":0,\"mode\":\"1920x1080@60.00\"}}", "monitorShellScreen": "desc:Huawei Technologies Co. Inc. ZQE-CAA 0xC080F622", - "monitorWorkspaces": "{\"mode\":\"split\",\"assign\":{\"2\":\"desc:Huawei Technologies Co. Inc. ZQE-CAA 0xC080F622\",\"11\":\"desc:Samsung Electric Company SAMSUNG 0x01000E00\"}}", + "monitorWorkspaces": "{\"mode\":\"shared\",\"assign\":{}}", "motionScale": 1, "nightLight": false, "nightLightFrom": 1260, diff --git a/user/sweetbread/modules/lucid.nix b/user/sweetbread/modules/lucid.nix index 121a5c2..15cd191 100644 --- a/user/sweetbread/modules/lucid.nix +++ b/user/sweetbread/modules/lucid.nix @@ -442,6 +442,12 @@ in { hl.monitor({ output = "desc:Huawei Technologies Co. Inc. ZQE-CAA 0xC080F622", cm = "srgb", supports_hdr = -1 }) end LucidMonitors.apply() + -- Lucid previously left empty workspaces 3-6 persistent on this host. + -- Retire those stale rules after applying the monitor layout so they do + -- not return on the next Hyprland reload. + for _, workspace in ipairs({ "3", "4", "5", "6" }) do + hl.workspace_rule({ workspace = workspace, persistent = false }) + end require("modules.settings") require("modules.glass") require("modules.startup")