This commit is contained in:
Solomon Laing 2022-11-08 19:59:59 +10:30
parent e6172d13f4
commit ade987bb98
5 changed files with 237 additions and 248 deletions

View File

@ -1,19 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<actions> <actions>
<action>
<icon>user-trash</icon>
<name>Move to Trash</name>
<unique-id>1663752025909170-1</unique-id>
<command>trash %F</command>
<description>Moves item to trash with trash-cli</description>
<patterns>*</patterns>
<directories/>
<audio-files/>
<image-files/>
<other-files/>
<text-files/>
<video-files/>
</action>
<action> <action>
<icon>lxterminal</icon> <icon>lxterminal</icon>
<name>Open Terminal Here</name> <name>Open Terminal Here</name>

View File

@ -22,6 +22,7 @@ local servers = {
"tsserver", "tsserver",
"pyright", "pyright",
"yamlls", "yamlls",
"texlab",
"bashls", "bashls",
"clangd", "clangd",
"rust_analyzer", "rust_analyzer",

View File

@ -79,8 +79,8 @@ return packer.startup(function(use)
-- LaTeX -- LaTeX
-- use "SirVer/ultisnips" -- use "SirVer/ultisnips"
use("lervag/vimtex") -- use("lervag/vimtex")
use("ludovicchabant/vim-gutentags") -- use("ludovicchabant/vim-gutentags")
-- Snippet -- Snippet
use("L3MON4D3/LuaSnip") -- snippet engine use("L3MON4D3/LuaSnip") -- snippet engine

View File

@ -1,269 +1,270 @@
local status_ok, which_key = pcall(require, "which-key") local status_ok, which_key = pcall(require, "which-key")
if not status_ok then if not status_ok then
return return
end end
local setup = { local setup = {
plugins = { plugins = {
marks = true, -- shows a list of your marks on ' and ` marks = true, -- shows a list of your marks on ' and `
registers = true, -- shows your registers on " in NORMAL or <C-r> in INSERT mode registers = true, -- shows your registers on " in NORMAL or <C-r> in INSERT mode
spelling = { spelling = {
enabled = true, -- enabling this will show WhichKey when pressing z= to select spelling suggestions enabled = true, -- enabling this will show WhichKey when pressing z= to select spelling suggestions
suggestions = 20, -- how many suggestions should be shown in the list? suggestions = 20, -- how many suggestions should be shown in the list?
}, },
-- the presets plugin, adds help for a bunch of default keybindings in Neovim -- the presets plugin, adds help for a bunch of default keybindings in Neovim
-- No actual key bindings are created -- No actual key bindings are created
presets = { presets = {
operators = false, -- adds help for operators like d, y, ... and registers them for motion / text object completion operators = false, -- adds help for operators like d, y, ... and registers them for motion / text object completion
motions = false, -- adds help for motions motions = false, -- adds help for motions
text_objects = false, -- help for text objects triggered after entering an operator text_objects = false, -- help for text objects triggered after entering an operator
windows = true, -- default bindings on <c-w> windows = true, -- default bindings on <c-w>
nav = true, -- misc bindings to work with windows nav = true, -- misc bindings to work with windows
z = true, -- bindings for folds, spelling and others prefixed with z z = true, -- bindings for folds, spelling and others prefixed with z
g = true, -- bindings for prefixed with g g = true, -- bindings for prefixed with g
}, },
}, },
key_labels = { key_labels = {
-- override the label used to display some keys. It doesn't effect WK in any other way. -- override the label used to display some keys. It doesn't effect WK in any other way.
["<leader>"] = "SPC", ["<leader>"] = "SPC",
}, },
icons = { icons = {
breadcrumb = "»", -- symbol used in the command line area that shows your active key combo breadcrumb = "»", -- symbol used in the command line area that shows your active key combo
separator = "", -- symbol used between a key and it's label separator = "", -- symbol used between a key and it's label
group = "+", -- symbol prepended to a group group = "+", -- symbol prepended to a group
}, },
popup_mappings = { popup_mappings = {
scroll_down = "<C-d>", -- binding to scroll down inside the popup scroll_down = "<C-d>", -- binding to scroll down inside the popup
scroll_up = "<C-u>", -- binding to scroll up inside the popup scroll_up = "<C-u>", -- binding to scroll up inside the popup
}, },
window = { window = {
border = "rounded", -- none, single, double, shadow border = "rounded", -- none, single, double, shadow
position = "bottom", -- bottom, top position = "bottom", -- bottom, top
margin = { 1, 0, 1, 0 }, -- extra window margin [top, right, bottom, left] margin = { 1, 0, 1, 0 }, -- extra window margin [top, right, bottom, left]
padding = { 2, 2, 2, 2 }, -- extra window padding [top, right, bottom, left] padding = { 2, 2, 2, 2 }, -- extra window padding [top, right, bottom, left]
winblend = 0, winblend = 0,
}, },
layout = { layout = {
height = { min = 4, max = 25 }, -- min and max height of the columns height = { min = 4, max = 25 }, -- min and max height of the columns
width = { min = 20, max = 50 }, -- min and max width of the columns width = { min = 20, max = 50 }, -- min and max width of the columns
spacing = 3, -- spacing between columns spacing = 3, -- spacing between columns
align = "center", -- align columns left, center or right align = "center", -- align columns left, center or right
}, },
ignore_missing = true, -- enable this to hide mappings for which you didn't specify a label ignore_missing = true, -- enable this to hide mappings for which you didn't specify a label
hidden = { "<silent>", "<cmd>", "<Cmd>", "<CR>", "call", "lua", "^:", "^ " }, -- hide mapping boilerplate hidden = { "<silent>", "<cmd>", "<Cmd>", "<CR>", "call", "lua", "^:", "^ " }, -- hide mapping boilerplate
show_help = false, -- show help message on the command line when the popup is visible show_help = false, -- show help message on the command line when the popup is visible
triggers_blacklist = { triggers_blacklist = {
-- list of mode / prefixes that should never be hooked by WhichKey -- list of mode / prefixes that should never be hooked by WhichKey
-- this is mostly relevant for key maps that start with a native binding -- this is mostly relevant for key maps that start with a native binding
-- most people should not need to change this -- most people should not need to change this
i = { "j", "k" }, i = { "j", "k" },
v = { "j", "k" }, v = { "j", "k" },
}, },
} }
local opts = { local opts = {
mode = "n", -- NORMAL mode mode = "n", -- NORMAL mode
prefix = "<leader>", prefix = "<leader>",
buffer = nil, -- Global mappings. Specify a buffer number for buffer local mappings buffer = nil, -- Global mappings. Specify a buffer number for buffer local mappings
silent = true, -- use `silent` when creating keymaps silent = true, -- use `silent` when creating keymaps
noremap = true, -- use `noremap` when creating keymaps noremap = true, -- use `noremap` when creating keymaps
nowait = true, -- use `nowait` when creating keymaps nowait = true, -- use `nowait` when creating keymaps
} }
local m_opts = { local m_opts = {
mode = "n", -- NORMAL mode mode = "n", -- NORMAL mode
prefix = "m", prefix = "m",
buffer = nil, -- Global mappings. Specify a buffer number for buffer local mappings buffer = nil, -- Global mappings. Specify a buffer number for buffer local mappings
silent = true, -- use `silent` when creating keymaps silent = true, -- use `silent` when creating keymaps
noremap = true, -- use `noremap` when creating keymaps noremap = true, -- use `noremap` when creating keymaps
nowait = true, -- use `nowait` when creating keymaps nowait = true, -- use `nowait` when creating keymaps
} }
local m_mappings = { local m_mappings = {
m = { '<cmd>lua require("harpoon.mark").add_file()<cr>', "Harpoon" }, m = { '<cmd>lua require("harpoon.mark").add_file()<cr>', "Harpoon" },
l = { '<cmd>lua require("harpoon.ui").nav_next()<cr>', "Harpoon Next" }, l = { '<cmd>lua require("harpoon.ui").nav_next()<cr>', "Harpoon Next" },
h = { '<cmd>lua require("harpoon.ui").nav_prev()<cr>', "Harpoon Prev" }, h = { '<cmd>lua require("harpoon.ui").nav_prev()<cr>', "Harpoon Prev" },
s = { "<cmd>Telescope harpoon marks<cr>", "Search Files" }, s = { "<cmd>Telescope harpoon marks<cr>", "Search Files" },
u = { '<cmd>lua require("harpoon.ui").toggle_quick_menu()<cr>', "Harpoon UI" }, u = { '<cmd>lua require("harpoon.ui").toggle_quick_menu()<cr>', "Harpoon UI" },
} }
local mappings = { local mappings = {
a = { "<cmd>CodeActionMenu<cr>", "Action" }, a = { "<cmd>CodeActionMenu<cr>", "Action" },
c = { "<cmd>Bdelete<cr>", "Close Buffer" }, c = { "<cmd>Bdelete<cr>", "Close Buffer" },
C = { "<cmd>w! | !compiler %<cr>", "Compile File" }, C = { "<cmd>w! | !compiler %<cr>", "Compile File" },
h = { "<cmd>split<cr>", "split" }, h = { "<cmd>split<cr>", "split" },
n = { "<cmd>NvimTreeToggle<cr>", "Explorer" }, n = { "<cmd>NvimTreeToggle<cr>", "Explorer" },
O = { "<cmd>setlocal spell! spelllang=en_us<CR>", "Toggle Spelling" }, O = { "<cmd>setlocal spell! spelllang=en_us<CR>", "Toggle Spelling" },
P = { "<cmd>!opout %<cr><cr>", "Preview Document" }, P = { "<cmd>!opout %<cr><cr>", "Preview Document" },
q = { '<cmd>lua require("user.functions").smart_quit()<CR>', "Quit" }, q = { '<cmd>lua require("user.functions").smart_quit()<CR>', "Quit" },
v = { "<cmd>vsplit<cr>", "vsplit" }, v = { "<cmd>vsplit<cr>", "vsplit" },
w = { "<cmd>w<CR>", "Write" }, w = { "<cmd>w<CR>", "Write" },
z = { "<cmd>ZenMode<cr>", "Zen" }, z = { "<cmd>ZenMode<cr>", "Zen" },
["/"] = { '<cmd>lua require("Comment.api").toggle.linewise.current()<CR>', "Comment" }, ["/"] = { '<cmd>lua require("Comment.api").toggle.linewise.current()<CR>', "Comment" },
["'"] = { '<cmd>close<CR>', "Close split" }, ["'"] = { "<cmd>close<CR>", "Close split" },
b = { b = {
name = "Buffer", name = "Buffer",
b = { "<cmd>Telescope buffers<cr>", "Telescope" }, b = { "<cmd>Telescope buffers<cr>", "Telescope" },
c = { "<cmd>Bdelete!<cr>", "Close Buffer" }, c = { "<cmd>Bdelete!<cr>", "Close Buffer" },
h = { "<cmd>BufferLineCyclePrev<cr>", "Cycle Previous" }, h = { "<cmd>BufferLineCyclePrev<cr>", "Cycle Previous" },
l = { "<cmd>BufferLineCycleNext<cr>", "Cycle Next" }, l = { "<cmd>BufferLineCycleNext<cr>", "Cycle Next" },
p = { "<cmd>BufferLinePickClose", "Pick Close" }, p = { "<cmd>BufferLinePickClose", "Pick Close" },
}, },
p = { p = {
name = "Packer", name = "Packer",
c = { "<cmd>PackerCompile<cr>", "Compile" }, c = { "<cmd>PackerCompile<cr>", "Compile" },
i = { "<cmd>PackerInstall<cr>", "Install" }, i = { "<cmd>PackerInstall<cr>", "Install" },
s = { "<cmd>PackerSync<cr>", "Sync" }, s = { "<cmd>PackerSync<cr>", "Sync" },
S = { "<cmd>PackerStatus<cr>", "Status" }, S = { "<cmd>PackerStatus<cr>", "Status" },
u = { "<cmd>PackerUpdate<cr>", "Update" }, u = { "<cmd>PackerUpdate<cr>", "Update" },
}, },
o = { o = {
name = "Options", name = "Options",
c = { '<cmd>lua vim.g.cmp_active=false<cr>', "Completion off" }, c = { "<cmd>lua vim.g.cmp_active=false<cr>", "Completion off" },
C = { '<cmd>lua vim.g.cmp_active=true<cr>', "Completion on" }, C = { "<cmd>lua vim.g.cmp_active=true<cr>", "Completion on" },
w = { '<cmd>lua require("user.functions").toggle_option("wrap")<cr>', "Wrap" }, w = { '<cmd>lua require("user.functions").toggle_option("wrap")<cr>', "Wrap" },
r = { '<cmd>lua require("user.functions").toggle_option("relativenumber")<cr>', "Relative" }, r = { '<cmd>lua require("user.functions").toggle_option("relativenumber")<cr>', "Relative" },
l = { '<cmd>lua require("user.functions").toggle_option("cursorline")<cr>', "Cursorline" }, l = { '<cmd>lua require("user.functions").toggle_option("cursorline")<cr>', "Cursorline" },
s = { '<cmd>lua require("user.functions").toggle_option("spell")<cr>', "Spell" }, s = { '<cmd>lua require("user.functions").toggle_option("spell")<cr>', "Spell" },
t = { '<cmd>lua require("user.functions").toggle_tabline()<cr>', "Tabline" }, t = { '<cmd>lua require("user.functions").toggle_tabline()<cr>', "Tabline" },
}, },
r = { r = {
name = "Replace", name = "Replace",
r = { "<cmd>lua require('spectre').open()<cr>", "Replace" }, r = { "<cmd>lua require('spectre').open()<cr>", "Replace" },
w = { "<cmd>lua require('spectre').open_visual({select_word=true})<cr>", "Replace Word" }, w = { "<cmd>lua require('spectre').open_visual({select_word=true})<cr>", "Replace Word" },
f = { "<cmd>lua require('spectre').open_file_search()<cr>", "Replace Buffer" }, f = { "<cmd>lua require('spectre').open_file_search()<cr>", "Replace Buffer" },
}, },
d = { d = {
name = "Debug", name = "Debug",
b = { "<cmd>lua require'dap'.toggle_breakpoint()<cr>", "Breakpoint" }, b = { "<cmd>lua require'dap'.toggle_breakpoint()<cr>", "Breakpoint" },
c = { "<cmd>lua require'dap'.continue()<cr>", "Continue" }, c = { "<cmd>lua require'dap'.continue()<cr>", "Continue" },
i = { "<cmd>lua require'dap'.step_into()<cr>", "Into" }, i = { "<cmd>lua require'dap'.step_into()<cr>", "Into" },
o = { "<cmd>lua require'dap'.step_over()<cr>", "Over" }, o = { "<cmd>lua require'dap'.step_over()<cr>", "Over" },
O = { "<cmd>lua require'dap'.step_out()<cr>", "Out" }, O = { "<cmd>lua require'dap'.step_out()<cr>", "Out" },
r = { "<cmd>lua require'dap'.repl.toggle()<cr>", "Repl" }, r = { "<cmd>lua require'dap'.repl.toggle()<cr>", "Repl" },
l = { "<cmd>lua require'dap'.run_last()<cr>", "Last" }, l = { "<cmd>lua require'dap'.run_last()<cr>", "Last" },
u = { "<cmd>lua require'dapui'.toggle()<cr>", "UI" }, u = { "<cmd>lua require'dapui'.toggle()<cr>", "UI" },
x = { "<cmd>lua require'dap'.terminate()<cr>", "Exit" }, x = { "<cmd>lua require'dap'.terminate()<cr>", "Exit" },
}, },
f = { f = {
name = "Find", name = "Find",
b = { "<cmd>Telescope git_branches<cr>", "Checkout branch" }, b = { "<cmd>Telescope git_branches<cr>", "Checkout branch" },
c = { "<cmd>Telescope colorscheme<cr>", "Colorscheme" }, c = { "<cmd>Telescope colorscheme<cr>", "Colorscheme" },
f = { "<cmd>Telescope find_files<cr>", "Find files" }, f = { "<cmd>Telescope find_files<cr>", "Find files" },
t = { "<cmd>Telescope live_grep<cr>", "Find Text" }, t = { "<cmd>Telescope live_grep<cr>", "Find Text" },
s = { "<cmd>Telescope grep_string<cr>", "Find String" }, s = { "<cmd>Telescope grep_string<cr>", "Find String" },
h = { "<cmd>Telescope help_tags<cr>", "Help" }, h = { "<cmd>Telescope help_tags<cr>", "Help" },
H = { "<cmd>Telescope highlights<cr>", "Highlights" }, H = { "<cmd>Telescope highlights<cr>", "Highlights" },
l = { "<cmd>Telescope resume<cr>", "Last Search" }, l = { "<cmd>Telescope resume<cr>", "Last Search" },
M = { "<cmd>Telescope man_pages<cr>", "Man Pages" }, M = { "<cmd>Telescope man_pages<cr>", "Man Pages" },
r = { "<cmd>Telescope oldfiles<cr>", "Recent File" }, r = { "<cmd>Telescope oldfiles<cr>", "Recent File" },
R = { "<cmd>Telescope registers<cr>", "Registers" }, R = { "<cmd>Telescope registers<cr>", "Registers" },
k = { "<cmd>Telescope keymaps<cr>", "Keymaps" }, k = { "<cmd>Telescope keymaps<cr>", "Keymaps" },
C = { "<cmd>Telescope commands<cr>", "Commands" }, C = { "<cmd>Telescope commands<cr>", "Commands" },
}, },
g = { g = {
name = "Git", name = "Git",
g = { "<cmd>lua _LAZYGIT_TOGGLE()<CR>", "Lazygit" }, g = { "<cmd>lua _LAZYGIT_TOGGLE()<CR>", "Lazygit" },
j = { "<cmd>lua require 'gitsigns'.next_hunk()<cr>", "Next Hunk" }, j = { "<cmd>lua require 'gitsigns'.next_hunk()<cr>", "Next Hunk" },
k = { "<cmd>lua require 'gitsigns'.prev_hunk()<cr>", "Prev Hunk" }, k = { "<cmd>lua require 'gitsigns'.prev_hunk()<cr>", "Prev Hunk" },
l = { "<cmd>GitBlameToggle<cr>", "Blame" }, l = { "<cmd>GitBlameToggle<cr>", "Blame" },
p = { "<cmd>lua require 'gitsigns'.preview_hunk()<cr>", "Preview Hunk" }, p = { "<cmd>lua require 'gitsigns'.preview_hunk()<cr>", "Preview Hunk" },
r = { "<cmd>lua require 'gitsigns'.reset_hunk()<cr>", "Reset Hunk" }, r = { "<cmd>lua require 'gitsigns'.reset_hunk()<cr>", "Reset Hunk" },
R = { "<cmd>lua require 'gitsigns'.reset_buffer()<cr>", "Reset Buffer" }, R = { "<cmd>lua require 'gitsigns'.reset_buffer()<cr>", "Reset Buffer" },
s = { "<cmd>lua require 'gitsigns'.stage_hunk()<cr>", "Stage Hunk" }, s = { "<cmd>lua require 'gitsigns'.stage_hunk()<cr>", "Stage Hunk" },
u = { u = {
"<cmd>lua require 'gitsigns'.undo_stage_hunk()<cr>", "<cmd>lua require 'gitsigns'.undo_stage_hunk()<cr>",
"Undo Stage Hunk", "Undo Stage Hunk",
}, },
o = { "<cmd>Telescope git_status<cr>", "Open changed file" }, o = { "<cmd>Telescope git_status<cr>", "Open changed file" },
b = { "<cmd>Telescope git_branches<cr>", "Checkout branch" }, b = { "<cmd>Telescope git_branches<cr>", "Checkout branch" },
c = { "<cmd>Telescope git_commits<cr>", "Checkout commit" }, c = { "<cmd>Telescope git_commits<cr>", "Checkout commit" },
d = { d = {
"<cmd>Gitsigns diffthis HEAD<cr>", "<cmd>Gitsigns diffthis HEAD<cr>",
"Diff", "Diff",
}, },
}, },
l = { l = {
name = "LSP", name = "LSP",
a = { "<cmd>CodeActionMenu<cr>", "Code Action" }, a = { "<cmd>CodeActionMenu<cr>", "Code Action" },
d = { "<cmd>TroubleToggle document_diagnostics<cr>", "Diagnostics" }, d = { "<cmd>TroubleToggle document_diagnostics<cr>", "Diagnostics" },
D = { "<cmd>lua vim.lsp.buf.definition()<cr>", "Definition" }, D = { "<cmd>lua vim.lsp.buf.definition()<cr>", "Definition" },
w = { w = {
"<cmd>TroubleToggle workspace_diagnostics<cr>", "<cmd>TroubleToggle workspace_diagnostics<cr>",
"Workspace Diagnostics", "Workspace Diagnostics",
}, },
f = { "<cmd>lua vim.lsp.buf.format({ async = true })<cr>", "Format" }, f = { "<cmd>lua vim.lsp.buf.format({ async = true })<cr>", "Format" },
F = { "<cmd>LspToggleAutoFormat<cr>", "Toggle Autoformat" }, F = { "<cmd>LspToggleAutoFormat<cr>", "Toggle Autoformat" },
h = { "<cmd>lua vim.lsp.buf.hover()<CR>", "Hover" }, h = { "<cmd>lua vim.lsp.buf.hover()<CR>", "Hover" },
i = { "<cmd>lua vim.lsp.buf.implementation()<cr>", "Implementation" }, i = { "<cmd>lua vim.lsp.buf.implementation()<cr>", "Implementation" },
I = { "<cmd>LspInfo<cr>", "Info" }, I = { "<cmd>LspInfo<cr>", "Info" },
j = { j = {
"<cmd>lua vim.diagnostic.goto_next({buffer=0})<CR>", "<cmd>lua vim.diagnostic.goto_next({buffer=0})<CR>",
"Next Diagnostic", "Next Diagnostic",
}, },
k = { k = {
"<cmd>lua vim.diagnostic.goto_prev({buffer=0})<cr>", "<cmd>lua vim.diagnostic.goto_prev({buffer=0})<cr>",
"Prev Diagnostic", "Prev Diagnostic",
}, },
v = { "<cmd>lua require('lsp_lines').toggle()<cr>", "Virtual Text" }, v = { "<cmd>lua require('lsp_lines').toggle()<cr>", "Virtual Text" },
l = { "<cmd>lua vim.lsp.codelens.run()<cr>", "CodeLens Action" }, l = { "<cmd>lua vim.lsp.codelens.run()<cr>", "CodeLens Action" },
o = { "<cmd>SymbolsOutline<cr>", "Outline" }, o = { "<cmd>SymbolsOutline<cr>", "Outline" },
r = { "<cmd>lua vim.lsp.buf.rename()<cr>", "Rename" }, r = { "<cmd>lua vim.lsp.buf.rename()<cr>", "Rename" },
R = { "<cmd>TroubleToggle lsp_references<cr>", "References" }, R = { "<cmd>TroubleToggle lsp_references<cr>", "References" },
s = { "<cmd>Telescope lsp_document_symbols<cr>", "Document Symbols" }, s = { "<cmd>Telescope lsp_document_symbols<cr>", "Document Symbols" },
S = { S = {
"<cmd>Telescope lsp_dynamic_workspace_symbols<cr>", "<cmd>Telescope lsp_dynamic_workspace_symbols<cr>",
"Workspace Symbols", "Workspace Symbols",
}, },
t = { '<cmd>lua require("user.functions").toggle_diagnostics()<cr>', "Toggle Diagnostics" }, t = { '<cmd>lua require("user.functions").toggle_diagnostics()<cr>', "Toggle Diagnostics" },
u = { "<cmd>LuaSnipUnlinkCurrent<cr>", "Unlink Snippet" }, u = { "<cmd>LuaSnipUnlinkCurrent<cr>", "Unlink Snippet" },
}, M = { "<cmd>Mason<cr>", "Open Mason UI" },
},
t = { t = {
name = "Terminal", name = "Terminal",
["1"] = { ":1ToggleTerm<cr>", "1" }, ["1"] = { ":1ToggleTerm<cr>", "1" },
["2"] = { ":2ToggleTerm<cr>", "2" }, ["2"] = { ":2ToggleTerm<cr>", "2" },
["3"] = { ":3ToggleTerm<cr>", "3" }, ["3"] = { ":3ToggleTerm<cr>", "3" },
["4"] = { ":4ToggleTerm<cr>", "4" }, ["4"] = { ":4ToggleTerm<cr>", "4" },
t = { "<cmd>lua _HTOP_TOGGLE()<cr>", "htop" }, t = { "<cmd>lua _HTOP_TOGGLE()<cr>", "htop" },
d = { "<cmd>lua _DOTNET_RUN_TOGGLE()<cr>", "dotnet run" }, d = { "<cmd>lua _DOTNET_RUN_TOGGLE()<cr>", "dotnet run" },
f = { "<cmd>ToggleTerm direction=float<cr>", "Float" }, f = { "<cmd>ToggleTerm direction=float<cr>", "Float" },
h = { "<cmd>ToggleTerm direction=horizontal<cr>", "Horizontal" }, h = { "<cmd>ToggleTerm direction=horizontal<cr>", "Horizontal" },
}, },
T = { T = {
name = "Treesitter", name = "Treesitter",
h = { "<cmd>TSHighlightCapturesUnderCursor<cr>", "Highlight" }, h = { "<cmd>TSHighlightCapturesUnderCursor<cr>", "Highlight" },
p = { "<cmd>TSPlaygroundToggle<cr>", "Playground" }, p = { "<cmd>TSPlaygroundToggle<cr>", "Playground" },
r = { "<cmd>TSToggle rainbow<cr>", "Rainbow" }, r = { "<cmd>TSToggle rainbow<cr>", "Rainbow" },
}, },
N = { N = {
name = "Notes (zk)", name = "Notes (zk)",
n = { "<cmd>ZkNew<cr>", "New Note" }, n = { "<cmd>ZkNew<cr>", "New Note" },
e = { "<cmd>ZkNotes<cr>", "Edit Notes" }, e = { "<cmd>ZkNotes<cr>", "Edit Notes" },
} },
} }
local vopts = { local vopts = {
mode = "v", -- VISUAL mode mode = "v", -- VISUAL mode
prefix = "<leader>", prefix = "<leader>",
buffer = nil, -- Global mappings. Specify a buffer number for buffer local mappings buffer = nil, -- Global mappings. Specify a buffer number for buffer local mappings
silent = true, -- use `silent` when creating keymaps silent = true, -- use `silent` when creating keymaps
noremap = true, -- use `noremap` when creating keymaps noremap = true, -- use `noremap` when creating keymaps
nowait = true, -- use `nowait` when creating keymaps nowait = true, -- use `nowait` when creating keymaps
} }
local vmappings = { local vmappings = {
["/"] = { '<ESC><CMD>lua require("Comment.api").toggle.linewise(vim.fn.visualmode())<CR>', "Comment" }, ["/"] = { '<ESC><CMD>lua require("Comment.api").toggle.linewise(vim.fn.visualmode())<CR>', "Comment" },
} }
which_key.setup(setup) which_key.setup(setup)

View File

@ -385,6 +385,7 @@ myStandardEZKeys =
--NOTE extras --NOTE extras
, ("M-S-/", spawn "xmonad-keys-help") -- show keybinds , ("M-S-/", spawn "xmonad-keys-help") -- show keybinds
, ("M-<Print>", spawn "maimpick") -- take full screenshot , ("M-<Print>", spawn "maimpick") -- take full screenshot
, ("M-<F1>", spawn "kbswitcher") -- set keyboard to dvorak
] ]
-- The following lines are needed for named scratchpads. -- The following lines are needed for named scratchpads.
where nonNSP = WSIs (return (\ws -> W.tag ws /= "NSP")) where nonNSP = WSIs (return (\ws -> W.tag ws /= "NSP"))