diff --git a/basic/keybinds.lua b/basic/keybinds.lua index ff85cf2..7ef0073 100644 --- a/basic/keybinds.lua +++ b/basic/keybinds.lua @@ -3,7 +3,9 @@ ------@meta --## @declaration hl, ipc, mainMod local mainMod = "SUPER" -- Sets "Windows" key as main modifier -local ipc = "qs -c noctalia-shell ipc call " +-- local ipc = "qs -c noctalia-shell ipc call " +local ipc = "noctalia msg " +local ipp = "noctalia msg plugin " local custom = require("custom-functions") local hyper = "MOD3" require("basic/submaps") @@ -140,33 +142,30 @@ hl.bind(mainMod .. "+ CTRL + G" ,hl.dsp.exec_cmd("kitty agy" ,{ tag = "popu ---- 6. CUSTOM SCRIPTS AND FUNCTIONS ---- -- 6.1 custom key assignments hl.config({ input = { kb_options = "caps:hyper", }}) --- hl.bind(hyper.. " + Hyper_L" ,function() hl.dispatch(hl.dsp.exec_cmd(ipc .. "plugin:clipper openPanel")) hl.dispatch(hl.dsp.submap("hyper-submap")) end) -hl.bind(hyper .. " + Hyper_L" ,hl.dsp.exec_cmd("noctalia msg panel-toggle clipboard")) +hl.bind(hyper .. " + Hyper_L" ,hl.dsp.exec_cmd(ipc .. "panel-toggle clipboard")) -- TODO fix remote screen and remote keyboard shortcuts hl.bind(mainMod .. " + CTRL + I" ,custom.remoteKM) -- Send Keyboard and Mouse input to phone via scrcpy hl.bind(mainMod .. " + ALT + I" ,custom.remoteScreen) -- Open Phone Screen via scrcpy hl.bind(mainMod .. "+ grave" ,custom.ToggleOddessyConnection) -- Toggle Oddesy monitor connection in hyprland ----- 7. -hl.bind(mainMod .. " + comma" ,hl.dsp.exec_cmd(ipc .. "controlCenter toggle")) -hl.bind(mainMod .. " + period" ,hl.dsp.exec_cmd(ipc .. "settings toggle")) -hl.bind(mainMod .. " + CTRL + SHIFT + L " ,hl.dsp.exec_cmd(ipc .. "lockScreen lock")) +---- 7. c +hl.bind(mainMod .. " + comma" ,hl.dsp.exec_cmd(ipc .. "panel-toggle control-center")) -- cant seem to find?? +hl.bind(mainMod .. " + CTRL + SHIFT + L " ,hl.dsp.exec_cmd(ipc .. "lockScreen-lock")) hl.bind(mainMod .. " + ALT + L " ,hl.dsp.exec_cmd(ipc .. "lockScreen lock")) -hl.bind("ALT + C" ,hl.dsp.exec_cmd(ipc .. "plugin:clipper openPanel")) -hl.bind("code:148" ,hl.dsp.exec_cmd(ipc .. "plugin:noctalia-calulator toggle")) +hl.bind(mainMod .. " + period" ,hl.dsp.exec_cmd(ipc .. "settings-toggle")) hl.bind("PRINT" ,hl.dsp.exec_cmd("hyprshot -m active -m window --output-folder ~/Images/Screenshots")) -hl.bind("SHIFT + PRINT" ,hl.dsp.exec_cmd(ipc .. " plugin:screen-toolkit annotate")) -hl.bind("ALT + PRINT" ,hl.dsp.exec_cmd(ipc .. " plugin:screen-toolkit annotateWindow")) -hl.bind("CTRL + PRINT" ,hl.dsp.exec_cmd(ipc .. " plugin:screen-toolkit annotateFullscreen")) --- hl.bind("SHIFT + PRINT" , hl.dsp.exec_cmd("hyprshot -m region --output-folder ~/Images/Screenshots")) --- hl.bind("ALT + PRINT" , hl.dsp.exec_cmd("hyprshot -m active -m output --output-folder ~/Images/Screenshots")) +-- Screen capture and annotation +local stk = ipc .. "plugin alexander/screen-toolkit:service all " +hl.bind("SHIFT + PRINT" ,hl.dsp.exec_cmd(stk .. "annotate")) +hl.bind("ALT + PRINT" ,hl.dsp.exec_cmd(stk .. "annotateWindow")) +hl.bind("CTRL + PRINT" ,hl.dsp.exec_cmd(stk .. "annotateFullscreen")) ---- 14. SUBMAP DISPATCHERS ---- +hl.bind(mainMod .. "+ PRINT" ,function() hl.dispatch(hl.dsp.exec_cmd(stk .. "toggle")) hl.dispatch(hl.dsp.submap("screen-toolkit")) end) hl.bind(mainMod .. " + O " ,hl.dsp.submap("open-apps")) -hl.bind(mainMod .. " + M " ,function() hl.dispatch(hl.dsp.exec_cmd(ipc .. "controlCenter toggle ")) hl.dispatch(hl.dsp.submap("quick-settings")) end) -hl.bind(mainMod .. "+ PRINT" ,function() hl.exec_cmd(ipc .. "plugin:screen-toolkit toggle") hl.dispatch(hl.dsp.submap("screen-toolkit")) end) -hl.bind(mainMod .. " + T" ,function() hl.dispatch(hl.dsp.submap("timer")) hl.exec_cmd(ipc .. "plugin:timer toggle") end) +hl.bind(mainMod .. " + M " ,function() hl.dispatch(hl.dsp.exec_cmd(ipc .. "panel-toggle control-center")) hl.dispatch(hl.dsp.submap("quick-settings")) end) +hl.bind(mainMod .. " + T" ,function() hl.dispatch(hl.dsp.submap("timer")) hl.exec_cmd(ipc .. "panel-toggle noctalia/timer:panel") end) diff --git a/basic/submaps.lua b/basic/submaps.lua index 5c7435e..66adcf9 100644 --- a/basic/submaps.lua +++ b/basic/submaps.lua @@ -1,5 +1,5 @@ local mainMod = "SUPER" -- Sets "Windows" key as main modifier -local ipc = "qs -c noctalia-shell ipc call " +local ipc = "noctalia msg " local custom = require("custom-functions") local function vim_motions_rebind_keys() -- Pressing H, J, K, L sends Left, Down, Up, Right to the active window @@ -10,37 +10,38 @@ local function vim_motions_rebind_keys() -- Pressing H, J, K, L sends Left, Down end local function clipper_submap_keys() -- A submap for quick access to certain clipboard and screen tools. Pressing H, J, K, L sends Left, Down, Up, Right to the active window. - hl.bind("C" ,hl.dsp.exec_cmd(ipc .. "plugin:clipper openPanel")) + hl.bind("C" ,hl.dsp.exec_cmd(ipc .. "panel-toggle clipboard")) vim_motions_rebind_keys() - local function exit() hl.dispatch(hl.dsp.submap("reset")) hl.dispatch(hl.dsp.exec_cmd(ipc .. "plugin:clipper closePanel")) end + local function exit() hl.dispatch(hl.dsp.submap("reset")) hl.dispatch(hl.dsp.exec_cmd(ipc .. "panel-close clipboard")) end hl.bind("escape" ,exit ) hl.bind("MOD3" .. " + Hyper_L" ,exit ) end hl.define_submap("hyper-submap", function() clipper_submap_keys() - hl.bind("S" ,hl.dsp.exec_cmd(ipc .. "plugin:screen-toolkit toggle")) - hl.bind("T" ,hl.dsp.exec_cmd(ipc .. "plugin:timer toggle")) - hl.bind("M" ,hl.dsp.exec_cmd(ipc .. "controlCenter toggle")) + hl.bind("S" ,hl.dsp.exec_cmd(ipc .. "plugin alexander/screen-toolkit:service all toggle")) + hl.bind("T" ,hl.dsp.exec_cmd(ipc .. "panel-toggle noctalia/timer:panel")) + hl.bind("M" ,hl.dsp.exec_cmd(ipc .. "panel-toggle control-center")) end) hl.define_submap("screen-toolkit", "reset", function() -- Access the screen toolkit options - hl.bind("S" ,hl.dsp.exec_cmd(ipc .. " plugin:screen-toolkit toggle")) - hl.bind("C" ,hl.dsp.exec_cmd(ipc .. " plugin:screen-toolkit color")) - hl.bind("P" ,hl.dsp.exec_cmd(ipc .. " plugin:screen-toolkit pallete")) - hl.bind("O" ,hl.dsp.exec_cmd(ipc .. " plugin:screen-toolkit ocr")) - hl.bind("L" ,hl.dsp.exec_cmd(ipc .. " plugin:screen-toolkit lens")) - hl.bind("A" ,hl.dsp.exec_cmd(ipc .. " plugin:screen-toolkit annotate")) - hl.bind("SHIFT + A" ,hl.dsp.exec_cmd(ipc .. " plugin:screen-toolkit annotateWindow")) - hl.bind("R" ,hl.dsp.exec_cmd(ipc .. " plugin:screen-toolkit recordMp4")) - hl.bind("SHIFT + R" ,hl.dsp.exec_cmd(ipc .. " plugin:screen-toolkit recordFullscreenMp4")) + local stk = ipc .. "plugin alexander/screen-toolkit:service all " + hl.bind("S" ,hl.dsp.exec_cmd(stk .. "toggle")) + hl.bind("C" ,hl.dsp.exec_cmd(stk .. "color")) + hl.bind("P" ,hl.dsp.exec_cmd(stk .. "pallete")) + hl.bind("O" ,hl.dsp.exec_cmd(stk .. "ocr")) + hl.bind("L" ,hl.dsp.exec_cmd(stk .. "lens")) + hl.bind("A" ,hl.dsp.exec_cmd(stk .. "annotate")) + hl.bind("W" ,hl.dsp.exec_cmd(stk .. "annotateWindow")) + hl.bind("R" ,hl.dsp.exec_cmd(stk .. "recordMp4")) + hl.bind("M" ,hl.dsp.exec_cmd(stk .. "recordFullscreenMp4")) hl.bind("catchall" ,function () hl.dispatch(hl.dsp.submap("reset")) - hl.dispatch(hl.dsp.exec_cmd(ipc .. "plugin:screen-toolkit toggle ")) end) end) hl.define_submap("timer", function () -- Open and create timers, pause, reset, and start timers. + -- depricated with noctalia v5 hl.bind("T" ,hl.dsp.exec_cmd(ipc .. "plugin:timer toggle")) hl.bind("P" ,hl.dsp.exec_cmd(ipc .. "plugin:timer pause")) hl.bind("R" ,hl.dsp.exec_cmd(ipc .. "plugin:timer reset")) @@ -55,7 +56,7 @@ end) hl.define_submap("quick-settings", function () -- An Interface for quickly accessing settings and toggling certain features. hl.bind("V" ,hl.dsp.exec_cmd("protonvpn-app & hyprctl dispatch submap vpn")) - hl.bind("S" ,hl.dsp.exec_cmd(ipc .. "settings toggle")) + hl.bind("S" ,hl.dsp.exec_cmd(ipc .. "panel-toggle settings")) hl.bind("C" ,hl.dsp.exec_cmd(ipc .. "plugin:clipper togglePanel ")) hl.bind("P" ,hl.dsp.exec_cmd(ipc .. "sessionMenu toggle")) hl.bind("R" ,hl.dsp.exec_cmd(ipc .. "systemMonitor toggle"))