norm/dotfiles
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleaned up keymaps and a few files.

Browse Source
This commit is contained in:
Norm Rasmussen
2023-09-01 17:11:17 -04:00
parent c08235014a
commit 9814c1a966
61 changed files with 110 additions and 2763 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
nvim/.config/nvim/init.lua
View File

@ -10,13 +10,14 @@ local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
})
end
vim.opt.rtp:prepend(lazypath)
require('lazy').setup('plugins')
vim.g.mapleader = ','
vim.g.localmapleader = ','
vim.opt.textwidth = 85
vim.opt.colorcolumn = '+2'
require('lazy').setup('plugins')
-----------------------------------------------------------
-- General Neovim settings and configuration
-----------------------------------------------------------

7
nvim/.config/nvim/lazy-lock.json
View File

@ -1,7 +1,7 @@
{
"LuaSnip": { "branch": "master", "commit": "0b4950a237ce441a6a3a947d501622453f6860ea" },
"adjacent.nvim": { "branch": "main", "commit": "a555ab92d61aa6fbbfa1bfaef4633b663563f04e" },
"alpha-nvim": { "branch": "main", "commit": "63a860e7ed3ae41ee92481ea65a48fb35431ae21" },
"alpha-nvim": { "branch": "main", "commit": "5f211a1597b06be24b1600d72a62b94cab1e2df9" },
"auto-hlsearch.nvim": { "branch": "main", "commit": "8f28246d53e9478717ca3b51c8112083fbebd7e3" },
"barbar.nvim": { "branch": "master", "commit": "dd852401ee902745b67fc09a83d113b3fe82a96f" },
"cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
@ -37,7 +37,7 @@
"mini.surround": { "branch": "main", "commit": "eeaf96562947f75afa51a6266e066529369ca7ef" },
"mini.trailspace": { "branch": "main", "commit": "c41ab1035d184ff20c1aebd76639320c055afebe" },
"mkdnflow.nvim": { "branch": "main", "commit": "a728a3533bb57502fdfd6fdb4e5839fc87430edc" },
"moonfly": { "branch": "master", "commit": "fe8d67b8f3848ecdaadafcbfbcb8ee7585b4819a" },
"moonfly": { "branch": "master", "commit": "1e81cbb88a34c41572fde43cd633bd6d60727274" },
"neorg": { "branch": "main", "commit": "064f8f65dd32f4fe728e76acfa3e4e153b121147" },
"neorg-templates": { "branch": "main", "commit": "1078ced1f995cc053cdb10b51bd5e5dd5d76f78a" },
"neoscroll.nvim": { "branch": "master", "commit": "4bc0212e9f2a7bc7fe7a6bceb15b33e39f0f41fb" },
@ -51,10 +51,9 @@
"nvim-dap-python": { "branch": "master", "commit": "37b4cba02e337a95cb62ad1609b3d1dccb2e5d42" },
"nvim-dap-ui": { "branch": "master", "commit": "85b16ac2309d85c88577cd8ee1733ce52be8227e" },
"nvim-lspconfig": { "branch": "master", "commit": "a27356f1ef9c11e1f459cc96a3fcac5c265e72d6" },
"nvim-mapper": { "branch": "main", "commit": "baad83aad85d420cce24dd60106114421ed59039" },
"nvim-notify": { "branch": "master", "commit": "ea9c8ce7a37f2238f934e087c255758659948e0f" },
"nvim-tree.lua": { "branch": "master", "commit": "00741206c2df9c4b538055def19b99790f0c95c8" },
"nvim-treesitter": { "branch": "master", "commit": "f8c2825220bff70919b527ee68fe44e7b1dae4b2" },
"nvim-treesitter": { "branch": "master", "commit": "691d73287a94e8ed82a383df82aabfe77ab4bcaa" },
"nvim-web-devicons": { "branch": "master", "commit": "cfc8824cc1db316a276b36517f093baccb8e799a" },
"plenary.nvim": { "branch": "master", "commit": "0dbe561ae023f02c2fb772b879e905055b939ce3" },
"popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" },

58
nvim/.config/nvim/lua/core/keymaps.lua
View File

@ -20,3 +20,61 @@ map('n', '<leader>w', ':bprev<CR>', default_opts)
map('n', '<leader>d', ':bdelete<CR>', default_opts)
map('n', '<leader>r', '<Plug>vem_move_buffer_right', default_opts)
map('n', '<leader>q', '<Plug>vem_move_buffer_left', default_opts)
-- Nvim-Tree
map('n', '<leader>v', ':NvimTreeToggle<CR>', default_opts)
-- Nvim Sidebar
map('n', '<leader>n', ':SidebarNvimToggle<CR>', default_opts)
map('n', '<leader>q', ':SidebarNvimUpdate<CR>', default_opts)
-- Telescope
map('n', '<leader>ff', ':Telescope find_files<CR>', default_opts)
map('n', '<leader>fg', ':Telescope live_grep<CR>', default_opts)
map('n', '<leader>fb', ':Telescope buffers<CR>', default_opts)
map('n', '<leader>fe', ':Telescope file_browser<CR>', default_opts)
map('n', '<leader>fk', ':Telescope keymaps<CR>', default_opts)
map('n', '<leader>fa', ':Telescope adjacent<CR>', default_opts)
-- Formatting
map('n', '<leader>b', ':! black %<CR>', default_opts)
map('n', '<leader>m', ':! markdownlint -f %<CR>', default_opts)
------------------------------------------------
-- Old Keymaps from Nvim-Mapper (Sunsetted)
------------------------------------------------
--[[
-- Macros for Todo Trouble
M('n', '<C-t>', "@t<CR>", default_opts,
"Add Todo", "todo_todo", "Add To-do/Task to the beginning of the line"
)
M('n', '<C-s>', "@s<CR>", default_opts,
"Add Solutions Engineering", "todo_seng", "Add Solutions Engineering to the beginning of the line"
)
M('n', '<C-f>', "@f<CR>", default_opts,
"Add Feature", "add_feat", "Add Feature Request tag to the beginning of the line. "
)
M( 'n', '<C-x>', "@c<CR>", default_opts,
"Replace with Complete", "add_complete", "Replace tag with Complete tag at beginning of the line."
)
M('n', '<C-r>', "@w<CR>", default_opts,
"Add Warning/Error", "add_error", "Add Warning/Error tag at the beginning of the line."
)
M('n', '<leader>ce', ":TodoTrouble keywords=TODO<CR>", default_opts,
"Show Todo Tags", "show_todos", "Show Todo Tags."
)
M('n', '<leader>cf', ":TodoTrouble keywords=FEAT<CR>", default_opts,
"Show Feature Tags", "show_features", "Show Feature Requests."
)
M('n', '<leader>cq', ":TodoTrouble keywords=ERROR, WARN<CR>", default_opts,
"Show Warning Tags", "show_warnings", "Show Errors Tags."
)
--]]

14
nvim/.config/nvim/lua/plugins/init.lua
View File

@ -351,5 +351,15 @@ return {
-- 'eandrju/cellular-automaton.nvim',
-- Wakatime Tracking
'wakatime/vim-wakatime'
}
'wakatime/vim-wakatime',
----------------------------------------------
--- Custom Plugins and Tests
----------------------------------------------
{
dir = '/Users/normrasmussen/Documents/Projects/tasksPlugin.nvim/',
dev = true,
name = "Mkdn Tasks (DEV)",
},
}

12
nvim/.config/nvim/lua/plugins/mason-null-ls.lua
View File

@ -16,13 +16,13 @@ return {
sources = {
null_ls.builtins.completion.spell,
null_ls.builtins.diagnostics.codespell,
-- null_ls.builtins.diagnostics.markdownlint.with({ extra_args = { "--disable", "MD024", "MD013", "--" }
-- ,}),
-- null_ls.builtins.diagnostics.ruff,
-- null_ls.builtins.diagnostics.pylama,
null_ls.builtins.diagnostics.markdownlint.with({ extra_args = { "--disable", "MD024", "MD013", "--" }
,}),
null_ls.builtins.formatting.black,
-- null_ls.builtins.diagnostics.pylint,
-- null_ls.builtins.diagnostics.pycodestyle,
null_ls.builtins.diagnostics.ruff,
-- null_ls.builtins.diagnostics.pylama,
-- null_ls.builtins.diagnostics.pylint,
-- null_ls.builtins.diagnostics.pycodestyle,
},
})
end

88
nvim/.config/nvim/lua/plugins/nvim-mapper.lua
View File

@ -1,88 +0,0 @@
-- For Neovim >= 0.7.0
return {
"gregorias/nvim-mapper",
before = "telescope.nvim",
config = function()
Mapper = require("nvim-mapper")
local M = Mapper.map
local default_opts = {noremap=true, silent=true}
-- Sidebar Plugin
M('n', '<leader>n', ':SidebarNvimToggle<CR>', default_opts,
"Sidebar Toggle", "sidebar-toggle", "Open or Close Sidebar"
)
M('n', '<leader>q', ':SidebarNvimUpdate<CR>', default_opts,
"Sidebar Update", "sidebar-update", "Refresh the Sidebar"
)
-- Nvim Tree Plugin
M('n', '<leader>v', ':NvimTreeToggle<CR>', default_opts,
"Nvim Tree Sidebar", "nvim-tree-toggle", "OpenClose NvimTree Sidebar"
)
-- Telescope Options
M('n', '<leader>ff', ':Telescope find_files<CR>', default_opts,
"Find Files", "find-files", "Find Files in Telescope pop-up"
)
M('n', '<leader>fg', ':Telescope live_grep<CR>', default_opts,
"Live Grep", "live-grep", "Grep Files in Telescope pop-up"
)
M('n', '<leader>fb', ':Telescope buffers<CR>', default_opts,
"Buffers", "buffers", "See Buffers in Telescope pop-up"
)
M('n', '<leader>fe', ":Telescope file_browser<CR>", default_opts,
"Telescope Files", "telescope-file-browser", "Find files and directories in telescope"
)
M('n', '<leader>fk', ":Telescope keymaps<CR>", default_opts,
"Telescope Keymaps", "telescope-keymaps", "Easily find Keymaps using Telescope")
M('n', '<leader>fa', ":Telescope adjacent<CR>", default_opts,
"Telescope Adjacent", "telescope-adjacent", "Open file browser based on current buffer")
-- Macros for Todo Trouble
M('n', '<C-t>', "@t<CR>", default_opts,
"Add Todo", "todo_todo", "Add To-do/Task to the beginning of the line"
)
M('n', '<C-s>', "@s<CR>", default_opts,
"Add Solutions Engineering", "todo_seng", "Add Solutions Engineering to the beginning of the line"
)
M('n', '<C-f>', "@f<CR>", default_opts,
"Add Feature", "add_feat", "Add Feature Request tag to the beginning of the line. "
)
M( 'n', '<C-x>', "@c<CR>", default_opts,
"Replace with Complete", "add_complete", "Replace tag with Complete tag at beginning of the line."
)
M('n', '<C-r>', "@w<CR>", default_opts,
"Add Warning/Error", "add_error", "Add Warning/Error tag at the beginning of the line."
)
M('n', '<leader>ce', ":TodoTrouble keywords=TODO<CR>", default_opts,
"Show Todo Tags", "show_todos", "Show Todo Tags."
)
M('n', '<leader>cf', ":TodoTrouble keywords=FEAT<CR>", default_opts,
"Show Feature Tags", "show_features", "Show Feature Requests."
)
M('n', '<leader>cq', ":TodoTrouble keywords=ERROR, WARN<CR>", default_opts,
"Show Warning Tags", "show_warnings", "Show Errors Tags."
)
-- Formatting Keymaps
M('n', '<leader>b', ":! black %<CR>", default_opts,
"Black Formatting", "black_current_file", "Use Black Formatting on Current File."
)
M('n', '<leader>m', ":! markdownlint -f %<CR>", default_opts,
"Markdownlint", "md_lint_format", "Use mdlint Formatting on Current File."
)
M('n', '<leader>r30', ":resize 30<CR>", default_opts,
"Resize30", "resize_30", "Resize Window to #30"
)
end,
}

1
nvim/.config/nvim/lua/plugins/telescope.lua
View File

@ -152,7 +152,6 @@ return {
}
})
require("telescope").load_extension "file_browser"
require("telescope").load_extension "mapper"
require("telescope").load_extension "live_grep_args"
require("telescope").load_extension "fzf"
require("telescope").load_extension "adjacent"