This commit is contained in:
Norm Rasmussen
2022-07-07 16:45:13 -04:00
parent 763faa9748
commit e1984cbb56
12 changed files with 146 additions and 135 deletions

71
lua/plugins/mkdnflow.lua Normal file
View File

@ -0,0 +1,71 @@
-- ** DEFAULT SETTINGS; TO USE THESE, PASS AN EMPTY TABLE TO THE SETUP FUNCTION **
require('mkdnflow').setup({
filetypes = {md = true, rmd = true, markdown = true},
create_dirs = true,
perspective = {
priority = 'first',
fallback = 'current',
root_tell = false,
nvim_wd_heel = true
},
wrap = false,
bib = {
default_path = nil,
find_in_root = true
},
silent = false,
links = {
style = 'markdown',
conceal = false,
implicit_extension = nil,
transform_implicit = false,
transform_explicit = function(text)
text = text:gsub(" ", "-")
text = text:lower()
text = os.date('%Y-%m-%d_')..text
return(text)
end
},
to_do = {
symbols = {' ', '-', 'X'},
update_parents = true,
not_started = ' ',
in_progress = '-',
complete = 'X'
},
tables = {
trim_whitespace = true,
format_on_move = true
},
use_mappings_table = true,
mappings = {
MkdnNextLink = {'n', '<Tab>'},
MkdnPrevLink = {'n', '<S-Tab>'},
MkdnNextHeading = {'n', '<leader>]'},
MkdnPrevHeading = {'n', '<leader>['},
MkdnGoBack = {'n', '<BS>'},
MkdnGoForward = {'n', '<Del>'},
MkdnFollowLink = {{'n', 'v'}, '<CR>'},
MkdnDestroyLink = {'n', '<M-CR>'},
MkdnMoveSource = {'n', '<F2>'},
MkdnYankAnchorLink = {'n', 'ya'},
MkdnYankFileAnchorLink = {'n', 'yfa'},
MkdnIncreaseHeading = {'n', '+'},
MkdnDecreaseHeading = {'n', '-'},
MkdnToggleToDo = {{'n', 'v'}, '<C-Space>'},
MkdnNewListItem = false,
MkdnExtendList = false,
MkdnUpdateNumbering = {'n', '<leader>nn'},
MkdnTableNextCell = {'i', '<leader>nc'},
MkdnTablePrevCell = {'i', '<leader>pc'},
MkdnTableNextRow = false,
MkdnTablePrevRow = {'i', '<M-CR>'},
MkdnTableNewRowBelow = {{'n', 'i'}, '<leader>ir'},
MkdnTableNewRowAbove = {{'n', 'i'}, '<leader>iR'},
MkdnTableNewColAfter = {{'n', 'i'}, '<leader>ic'},
MkdnTableNewColBefore = {{'n', 'i'}, '<leader>iC'},
MkdnCR = false,
MkdnTab = false,
MkdnSTab = false
}
})

View File

@ -86,7 +86,7 @@ https://github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.m
-- Use a loop to conveniently call 'setup' on multiple servers and
-- map buffer local keybindings when the language server attaches
local servers = { 'bashls', 'pyright', 'pylsp', 'clangd', 'html', 'tsserver', 'grammarly', 'dockerls', 'cssls', 'cssmodules_ls', 'arduino_language_server', 'pyre', 'gopls', 'theme_check' }
local servers = { 'bashls', 'pyright', 'pylsp', 'clangd', 'html', 'tsserver', 'marksman', 'prosemd_lsp', 'dockerls', 'cssls', 'cssmodules_ls', 'arduino_language_server', 'pyre', 'gopls', 'theme_check' }
-- Set settings for language servers:

View File

@ -6,7 +6,15 @@
-- Plugin: nvim-treesitter
-- url: https://github.com/nvim-treesitter/nvim-treesitter
local parser_configs = require("nvim-treesitter.parsers").get_parser_configs()
parser_configs.markdown = {
install_info = {
url = "https://github.com/ikatyang/tree-sitter-markdown",
files = { "src/parser.c", "src/scanner.cc" },
},
filetype = "markdown",
}
require('nvim-treesitter.configs').setup {
highlight = {

View File

@ -14,12 +14,22 @@ return require'packer'.startup(function()
-- Markdown Extension for Customizable Keymappings
use 'SidOfc/mkdx'
-- Markdown Flow
use {
"jakewvincent/mkdnflow.nvim",
config = function()
require('mkdnflow').setup()
end
}
-- Headlines Extension
use 'lukas-reineke/headlines.nvim'
-- Follow MD Links
use 'jghauser/follow-md-links.nvim'
-- Glow, a Markdown Preview plugin
use {"ellisonleao/glow.nvim", branch = 'main'}
-- Treesitter Language Stuff
use 'nvim-treesitter/nvim-treesitter'
@ -66,7 +76,7 @@ return require'packer'.startup(function()
use {
'sudormrfbin/cheatsheet.nvim',
requires = {
{'nvim-telescope/telescope.nvim'},
--{'nvim-telescope/telescope.nvim'},
{'nvim-lua/popup.nvim'},
{'nvim-lua/plenary.nvim'},
}
@ -76,7 +86,7 @@ return require'packer'.startup(function()
tag = 'v1.*',
config = function()
require('toggleterm').setup({
shell = '/usr/bin/local/fish',
shell = '/usr/bin/local/zsh',
})
end,
}
@ -97,7 +107,7 @@ return require'packer'.startup(function()
'goolord/alpha-nvim',
requires = { 'kyazdani42/nvim-web-devicons' },
}
use {
--[[use {
"nvim-telescope/telescope.nvim",
requires = {
"nvim-lua/popup.nvim",
@ -106,7 +116,7 @@ return require'packer'.startup(function()
config = function()
require "plugins/telescope"
end,
}
}]]--
use {
'windwp/nvim-autopairs',
config = function()

View File

@ -1,104 +0,0 @@
local actions = require "telescope.actions"
local M = {}
M.project_files = function()
local opts = {} -- define here if you want to define something
local ok = pcall(require("telescope.builtin").git_files, opts)
if not ok then
require("telescope.builtin").find_files(opts)
end
end
require("telescope").setup {
defaults = {
prompt_prefix = "/ ",
selection_caret = "",
color_devicons = false,
mappings = {
i = {
["<Esc>"] = actions.close,
["<C-n>"] = actions.move_selection_next,
["<C-p>"] = actions.move_selection_previous,
["<C-j>"] = actions.move_selection_next,
["<C-k>"] = actions.move_selection_previous,
["<C-c>"] = actions.close,
["<Down>"] = false,
["<Up>"] = false,
["<CR>"] = actions.select_default + actions.center,
["<C-x>"] = actions.select_horizontal,
["<C-v>"] = actions.select_vertical,
["<C-u>"] = actions.preview_scrolling_up,
["<C-d>"] = actions.preview_scrolling_down,
},
n = {
["<Esc>"] = actions.close,
["<CR>"] = actions.select_default + actions.center,
["<C-x>"] = actions.select_horizontal,
["<C-v>"] = actions.select_vertical,
["j"] = actions.move_selection_next,
["k"] = actions.move_selection_previous,
["<Down>"] = false,
["<Up>"] = false,
["<C-u>"] = actions.preview_scrolling_up,
["<C-d>"] = actions.preview_scrolling_down,
},
},
file_ignore_patterns = {
".git/*",
"node_modules/*",
"bower_components/*",
".svn/*",
".hg/*",
"CVS/*",
".next/*",
".docz/*",
".DS_Store",
},
layout_strategy = "flex",
scroll_strategy = "cycle",
},
pickers = {
find_files = {
theme = "ivy",
},
git_files = {
theme = "ivy",
},
live_grep = {
theme = "ivy",
previewer = false,
},
file_browser = {
theme = "ivy",
previewer = false,
},
},
}
vim.api.nvim_set_keymap(
"n",
"<C-p>",
'<cmd>lua require("plugins/telescope").project_files()<CR>',
{ noremap = true, silent = true }
)
vim.api.nvim_set_keymap(
"n",
"<Leader>g",
'<cmd>lua require("telescope.builtin").live_grep()<CR>',
{ noremap = true, silent = true }
)
vim.api.nvim_set_keymap(
"n",
"<Leader>f",
'<cmd>lua require("telescope.builtin").file_browser()<CR>',
{ noremap = true, silent = true }
)
vim.api.nvim_set_keymap(
"n",
"<Leader>b",
'<cmd>lua require("telescope.builtin").buffers()<CR>',
{ noremap = true, silent = true }
)
return M

View File

@ -5,7 +5,7 @@ end
toggleterm.setup({
size = 10,
open_mapping = [[<c-\>]],
open_mapping = [[<c-==>]],
hide_numbers = true,
shade_filetypes = {},
shade_terminals = true,

View File

@ -22,6 +22,7 @@ g.vista_default_executive = 'ctags'
-- Ensure you have installed some decent font to show these pretty symbols,
--- then you can enable icon for the kind.
cmd [[let g:vista#renderer#enable_icon = 1]]
cmd [[let g:vista_enable_markdown_extension = 1]]
-- Change some default icons