diff --git a/.markdownlint.jsonc b/.markdownlint.jsonc new file mode 100644 index 0000000..edf10e1 --- /dev/null +++ b/.markdownlint.jsonc @@ -0,0 +1,3 @@ +{ + "MD013": { "code_blocks": false } +} diff --git a/.prettierrc.yaml b/.prettierrc.yaml new file mode 100644 index 0000000..3032bde --- /dev/null +++ b/.prettierrc.yaml @@ -0,0 +1,2 @@ +proseWrap: always +printWidth: 80 diff --git a/nvim/lazynvim/lazyvim.json b/nvim/lazynvim/lazyvim.json index 6206f7e..3a289a0 100644 --- a/nvim/lazynvim/lazyvim.json +++ b/nvim/lazynvim/lazyvim.json @@ -1,6 +1,24 @@ { "extras": [ - + "lazyvim.plugins.extras.coding.mini-snippets", + "lazyvim.plugins.extras.coding.mini-surround", + "lazyvim.plugins.extras.editor.fzf", + "lazyvim.plugins.extras.editor.harpoon2", + "lazyvim.plugins.extras.formatting.prettier", + "lazyvim.plugins.extras.lang.ansible", + "lazyvim.plugins.extras.lang.clangd", + "lazyvim.plugins.extras.lang.cmake", + "lazyvim.plugins.extras.lang.docker", + "lazyvim.plugins.extras.lang.git", + "lazyvim.plugins.extras.lang.json", + "lazyvim.plugins.extras.lang.markdown", + "lazyvim.plugins.extras.lang.sql", + "lazyvim.plugins.extras.lang.tailwind", + "lazyvim.plugins.extras.lang.tex", + "lazyvim.plugins.extras.lang.toml", + "lazyvim.plugins.extras.lang.yaml", + "lazyvim.plugins.extras.util.project", + "lazyvim.plugins.extras.util.startuptime" ], "install_version": 8, "news": { diff --git a/nvim/lazynvim/lua/config/autocmds.lua b/nvim/lazynvim/lua/config/autocmds.lua index 9b86305..9b70bc1 100644 --- a/nvim/lazynvim/lua/config/autocmds.lua +++ b/nvim/lazynvim/lua/config/autocmds.lua @@ -4,25 +4,25 @@ local spellGroup = vim.api.nvim_create_augroup("SpellGroup", defaultGroupOptions local createCmd = vim.api.nvim_create_autocmd -- Spell check -createCmd("BufEnter", { - pattern = { "*.md", "*.markdown", "*.txt", "*.tex" }, - group = spellGroup, - callback = function(_) - vim.cmd.setlocal("textwidth=100") - vim.cmd.setlocal("spell spelllang=en_us") - end, -}) +-- createCmd("BufEnter", { +-- pattern = { "*.md", "*.markdown", "*.txt", "*.tex" }, +-- group = spellGroup, +-- callback = function(_) +-- vim.cmd.setlocal("textwidth=100") +-- vim.cmd.setlocal("spell spelllang=en_us") +-- end, +-- }) -- Markdown -createCmd("BufWritePost", { - pattern = { "*.md", "*.markdown" }, - group = markdownGroup, - callback = function(_) - local cursor = vim.fn.getpos(".") - vim.cmd("FormatWrite") - vim.fn.setpos(".", cursor) - end, -}) +-- createCmd("BufWritePost", { +-- pattern = { "*.md", "*.markdown" }, +-- group = markdownGroup, +-- callback = function(_) +-- local cursor = vim.fn.getpos(".") +-- vim.cmd("FormatWrite") +-- vim.fn.setpos(".", cursor) +-- end, +-- }) -- Go createCmd("BufWritePre", { diff --git a/nvim/lazynvim/lua/config/lazy.lua b/nvim/lazynvim/lua/config/lazy.lua index d73bfa1..37e86e7 100644 --- a/nvim/lazynvim/lua/config/lazy.lua +++ b/nvim/lazynvim/lua/config/lazy.lua @@ -5,7 +5,7 @@ if not (vim.uv or vim.loop).fs_stat(lazypath) then if vim.v.shell_error ~= 0 then vim.api.nvim_echo({ { "Failed to clone lazy.nvim:\n", "ErrorMsg" }, - { out, "WarningMsg" }, + { out, "WarningMsg" }, { "\nPress any key to exit..." }, }, true, {}) vim.fn.getchar() @@ -18,6 +18,29 @@ require("lazy").setup({ spec = { -- add LazyVim and import its plugins { "LazyVim/LazyVim", import = "lazyvim.plugins" }, + -- { import = "lazyvim.plugins.extras.lang.ansible" }, + -- { import = "lazyvim.plugins.extras.lang.cmake" }, + -- { import = "lazyvim.plugins.extras.lang.docker" }, + -- { import = "lazyvim.plugins.extras.lang.json" }, + -- { import = "lazyvim.plugins.extras.lang.markdown" }, + -- { import = "lazyvim.plugins.extras.lang.yaml" }, + -- { import = "lazyvim.plugins.extras.coding.luasnip" }, + { + import = "lazyvim.plugins.extras.editor.mini-files", + opts = { + options = { + use_as_default_explorer = true, + }, + }, + }, + { + import = "lazyvim.plugins.extras.coding.blink", + keymap = { + preset = "enter", + [""] = { "select_and_accept" }, + }, + }, + -- import/override with your plugins { import = "plugins" }, }, @@ -34,7 +57,7 @@ require("lazy").setup({ checker = { enabled = true, -- check for plugin updates periodically notify = false, -- notify on update - }, -- automatically check for plugin updates + }, -- automatically check for plugin updates performance = { rtp = { -- disable some rtp plugins diff --git a/nvim/lazynvim/lua/plugins/formatter.lua b/nvim/lazynvim/lua/plugins/formatter.lua index affc7bb..f7934e3 100644 --- a/nvim/lazynvim/lua/plugins/formatter.lua +++ b/nvim/lazynvim/lua/plugins/formatter.lua @@ -6,7 +6,7 @@ return { markdown = { "prettier", prepend_args = { - "--print-width", "100", + "--print-width", "80", "--prose-wrap", "always", "--parser", "markdown", }, diff --git a/nvim/lazynvim/lua/plugins/init.lua b/nvim/lazynvim/lua/plugins/init.lua index da6e4a5..f7099b2 100644 --- a/nvim/lazynvim/lua/plugins/init.lua +++ b/nvim/lazynvim/lua/plugins/init.lua @@ -1,32 +1,11 @@ -- Plugins that don't require much configuration are in here. -- return { - { import = "lazyvim.plugins.extras.lang.ansible" }, - { import = "lazyvim.plugins.extras.lang.cmake" }, - { import = "lazyvim.plugins.extras.lang.docker" }, - { import = "lazyvim.plugins.extras.lang.json" }, - { import = "lazyvim.plugins.extras.lang.markdown" }, - { import = "lazyvim.plugins.extras.lang.yaml" }, - { import = "lazyvim.plugins.extras.coding.luasnip" }, - { - import = "lazyvim.plugins.extras.editor.mini-files", - opts = { - options = { - use_as_default_explorer = true, - }, - }, - }, { "folke/snacks.nvim", opts = { indent = { enabled = false }, }, }, - { - import = "lazyvim.plugins.extras.coding.blink", - keymap = { - preset = "enter", - [""] = { "select_and_accept" }, - }, - }, + } diff --git a/nvim/lazynvim/lua/plugins/lint.lua b/nvim/lazynvim/lua/plugins/lint.lua new file mode 100644 index 0000000..2b17cab --- /dev/null +++ b/nvim/lazynvim/lua/plugins/lint.lua @@ -0,0 +1,12 @@ +return { + { + "mfussenegger/nvim-lint", + opts = { + linters = { + markdownlint = { + args = { "--config", "~/.markdownlint.jsonc", "--" }, + }, + }, + }, + }, +} diff --git a/zsh/config/functions/n b/zsh/config/functions/n index 7147390..89f9378 100755 --- a/zsh/config/functions/n +++ b/zsh/config/functions/n @@ -8,17 +8,17 @@ # function n() { - if [ -z "$1" ]; then - local gitdir=$(git rev-parse --show-toplevel 2> /dev/null) - - [ -n "$gitdir" ] \ - && nvim -c ":Telescope git_files" \ - && return 0 - - [ -d "$1" ] \ - && nvim -c ":Telescope find_files" \ - && return 0 - fi + # if [ -z "$1" ]; then + # local gitdir=$(git rev-parse --show-toplevel 2> /dev/null) + # + # [ -n "$gitdir" ] \ + # && nvim -c ":Telescope git_files" \ + # && return 0 + # + # [ -d "$1" ] \ + # && nvim -c ":Telescope find_files" \ + # && return 0 + # fi nvim "$1" }