ItsDrike/dotfiles
1
0
Fork 0
mirror of https://github.com/ItsDrike/dotfiles.git synced 2025-06-30 12:30:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use utility module for keymap/abbrev functions

Browse source
This commit is contained in:
ItsDrike 2021-12-06 22:49:03 +01:00
parent 950d19e1a0
commit 768764a899
No known key found for this signature in database
GPG key ID: FB8CA11A2CF3A843
8 changed files with 110 additions and 116 deletions
Download patch file Download diff file Expand all files Collapse all files

5
home/.config/nvim/lua/pluginconf/commentary.lua
View file

@ -1,9 +1,10 @@
local m = require("utility.mappings")
local vim = require("vim")
local cmd = vim.cmd
-- Set up shortcuts to quickly comment some code
Keymap("n", "<A-/>", ":Commentary<CR>")
Keymap("v", "<A-/>", ":Commentary<CR>")
m.keymap("n", "<A-/>", ":Commentary<CR>")
m.keymap("v", "<A-/>", ":Commentary<CR>")
-- Set up comments for unhandled file types
cmd[[autocmd FileType apache setlocal commentstring=#\ %s]]

15
home/.config/nvim/lua/pluginconf/fzf.lua
View file

@ -1,3 +1,4 @@
local m = require("utility.mappings")
local vim = require("vim")
local cmd = vim.cmd
local g = vim.g
@ -26,10 +27,10 @@ command! -bang -nargs=? -complete=dir AllFiles
\ call fzf#run(fzf#wrap('allfiles', fzf#vim#with_preview({ 'dir': <q-args>, 'sink': 'e', 'source': 'rg --files --hidden --no-ignore' }), <bang>0))
]]
Keymap("n", "<leader>f", ":Files<CR>")
Keymap("n", "<leader>F", ":AllFiles<CR>")
Keymap("n", "<leader>b", ":Buffers<CR>")
Keymap("n", "<leader>h", ":History<CR>")
Keymap("n", "<leader>r", ":Rg<CR>")
Keymap("n", "<leader>R", ":Rg<space>", { silent = false })
Keymap("n", "<leader>gb", ":GBranches<CR>")
m.keymap("n", "<leader>f", ":Files<CR>")
m.keymap("n", "<leader>F", ":AllFiles<CR>")
m.keymap("n", "<leader>b", ":Buffers<CR>")
m.keymap("n", "<leader>h", ":History<CR>")
m.keymap("n", "<leader>r", ":Rg<CR>")
m.keymap("n", "<leader>R", ":Rg<space>", { silent = false })
m.keymap("n", "<leader>gb", ":GBranches<CR>")

5
home/.config/nvim/lua/pluginconf/nerdtree.lua
View file

@ -1,3 +1,4 @@
local m = require("utility.mappings")
local vim = require("vim")
local g = vim.g
local fn = vim.fn
@ -5,7 +6,7 @@ local cmd = vim.cmd
-- Implement manual NERDTreeToggle, but use NERDTreeFind for openning.
-- This makes NERDTree open with the current file pre-selected
Keymap("n", "<C-n>", "g:NERDTree.IsOpen() ? ':NERDTreeClose<CR>' : @% == '' ? ':NERDTree<CR>' : ':NERDTreeFind<CR>'", {expr=true})
m.keymap("n", "<C-n>", "g:NERDTree.IsOpen() ? ':NERDTreeClose<CR>' : @% == '' ? ':NERDTree<CR>' : ':NERDTreeFind<CR>'", {expr=true})
g.NERDTreeShowHidden = 1
g.NERDTreeMinimalUI = 1
@ -31,6 +32,8 @@ autocmd VimEnter * if argc() == 1 && isdirectory(argv()[0]) && !exists('s:std_in
]]
-- Exit Vim if NERDTree is the only window left.
-- WARNING: This causes issues when closing buffers
--[[
cmd[[
autocmd BufEnter * if tabpagenr('$') == 1 && winnr('$') == 1 && exists('b:NERDTree') && b:NERDTree.isTabTree() |
\ quit | endif

25
home/.config/nvim/lua/pluginconf/nvim-dap.lua
View file

@ -1,17 +1,18 @@
local m = require("utility.mappings")
local vim = require("vim")
local cmd = vim.cmd
-- Define dap mappings (:help dap-mapping)
local prefix = ":lua require('dap')."
Keymap("n", "<F5>", prefix .. "continue()<CR>")
Keymap("n", "<F10>", prefix .. "step_over()<CR>")
Keymap("n", "<F11>", prefix .. "step_into()<CR>")
Keymap("n", "<leader><F11>", prefix .. "step_out()<CR>")
Keymap("n", "<F9>", prefix .. "toggle_breakpoint()<CR>")
Keymap("n", "<leader><F9>", prefix .. "set_breakpoint(vim.fn.input('Breakpoint condition: '))<CR>")
Keymap("n", "<F8>", prefix .. "set_breakpoint(nil, nil, vim.fn.input('Log point message: '))<CR>")
Keymap("n", "<leader>di", prefix .. "repl.open()<CR>")
Keymap("n", "<leader>dl", prefix .. "run_last()<CR>")
m.keymap("n", "<F5>", prefix .. "continue()<CR>")
m.keymap("n", "<F10>", prefix .. "step_over()<CR>")
m.keymap("n", "<F11>", prefix .. "step_into()<CR>")
m.keymap("n", "<leader><F11>", prefix .. "step_out()<CR>")
m.keymap("n", "<F9>", prefix .. "toggle_breakpoint()<CR>")
m.keymap("n", "<leader><F9>", prefix .. "set_breakpoint(vim.fn.input('Breakpoint condition: '))<CR>")
m.keymap("n", "<F8>", prefix .. "set_breakpoint(nil, nil, vim.fn.input('Log point message: '))<CR>")
m.keymap("n", "<leader>di", prefix .. "repl.open()<CR>")
m.keymap("n", "<leader>dl", prefix .. "run_last()<CR>")
-- Setup dap for python (requires nvim-dap-python plugin)
require('dap-python').setup('/usr/bin/python') -- Path to python with `debugpy` library installed
@ -19,6 +20,6 @@ require('dap-python').test_runner = 'pytest' -- Use pytest to run unit tests
-- Python mappings
local pyprefix = ":lua require('dap-python')."
Keymap("n", "<leader>dptm", pyprefix .. "test_method()<CR>")
Keymap("n", "<leader>dptc", pyprefix .. "test_class()<CR>")
Keymap("v", "<leader>ds", "<ESC>" .. pyprefix .. "debug_selection()<CR>")
m.keymap("n", "<leader>dptm", pyprefix .. "test_method()<CR>")
m.keymap("n", "<leader>dptc", pyprefix .. "test_class()<CR>")
m.keymap("v", "<leader>ds", "<ESC>" .. pyprefix .. "debug_selection()<CR>")