diff --git a/fnl/init.fnl b/fnl/init.fnl index 41d1037..5b7ff26 100644 --- a/fnl/init.fnl +++ b/fnl/init.fnl @@ -1,4 +1,3 @@ -;; Package Management via lazy.nvim (let [lazy (require :lazy) lazypath (.. (vim.fn.stdpath :data) :/lazy/lazy.nvim)] (if (not (vim.loop.fs_stat lazypath)) @@ -10,6 +9,7 @@ lazypath])) (vim.opt.rtp:prepend lazypath) (lazy.setup ["https://github.com/rktjmp/hotpot.nvim" + "https://github.com/preservim/vim-markdown" {:url "https://github.com/nvim-telescope/telescope.nvim" :tag :0.1.2 :dependencies [:nvim-lua/plenary.nvim]} diff --git a/fnl/personalize.fnl b/fnl/personalize.fnl index 6d8ae1b..876cc89 100644 --- a/fnl/personalize.fnl +++ b/fnl/personalize.fnl @@ -2,11 +2,13 @@ luasnip (require :luasnip)] {:options (fn [] (set vim.o.termguicolors true) - (set vim.o.mouse :a) (set vim.o.clipboard :unnamedplus) (set vim.o.wrap false) (set vim.opt.colorcolumn "80,120") - (vim.cmd.colorscheme :everforest)) + (vim.cmd.colorscheme :everforest) + ;; http://neovim.io/doc/user/change.html#fo-table + (set vim.o.formatoptions :tcro) + (set vim.o.conceallevel 2)) :keymap (fn [] (let [nmap #(vim.keymap.set [:n] $1 $2 {:desc $3})] (nmap : ":bnext" "Next Buffer") @@ -29,7 +31,8 @@ :fennel_language_server {:filetypes [:fennel] :fennel {:workspace {:library (vim.api.nvim_list_runtime_paths)} :diagnostics {:globals [:vim]}}} - :bashls {:filetypes [:bash]}} + :bashls {:filetypes [:bash]} + :marksman {:filetypes [:markdown]}} :lsp-attach (fn [_ bufnr] (let [nmap #(vim.keymap.set :n $1 $2 {:buffer bufnr @@ -38,10 +41,7 @@ (nmap :gd vim.lsp.buf.definition "[G]o to [D]efiniton") (nmap :gr telescope.lsp_references "[G]o to [R]eferences") (nmap :gI vim.lsp.buf.implementation - "[G]o to [I]mplementation") - (vim.api.nvim_buf_create_user_command bufnr :Format - #(vim.lsp.buf.format) - "Format current buffer with LSP"))) + "[G]o to [I]mplementation"))) :cmp-mapping {: (cmp.mapping.select_next_item) : (cmp.mapping.select_prev_item) : (cmp.mapping.scroll_docs -4) diff --git a/ftdetect/markdown.vim b/ftdetect/markdown.vim new file mode 100644 index 0000000..458e5e4 --- /dev/null +++ b/ftdetect/markdown.vim @@ -0,0 +1 @@ +au BufRead,BufNewFile *.md set syntax=markdown diff --git a/lazy-lock.json b/lazy-lock.json index 9b6164b..23361e7 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -9,14 +9,15 @@ "fidget.nvim": { "branch": "main", "commit": "0ba1e16d07627532b6cae915cc992ecac249fb97" }, "friendly-snippets": { "branch": "main", "commit": "bc38057e513458cb2486b6cd82d365fa294ee398" }, "hotpot.nvim": { "branch": "master", "commit": "026eba9596b506ab6f807fd4aa93cd5f76255725" }, - "lazy.nvim": { "branch": "main", "commit": "3ad55ae678876516156cca2f361c51f7952a924b" }, + "lazy.nvim": { "branch": "main", "commit": "dac844ed617dda4f9ec85eb88e9629ad2add5e05" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "e86a4c84ff35240639643ffed56ee1c4d55f538e" }, "mason.nvim": { "branch": "main", "commit": "fe9e34a9ab4d64321cdc3ecab4ea1809239bb73f" }, - "neodev.nvim": { "branch": "main", "commit": "f57e5210d450b47aa02ea6d9e50a37414f570b4c" }, + "neodev.nvim": { "branch": "main", "commit": "2973d6c56cbde46c04e12476bb40eefd516d5f35" }, "nvim-cmp": { "branch": "main", "commit": "c4e491a87eeacf0408902c32f031d802c7eafce8" }, "nvim-lspconfig": { "branch": "master", "commit": "b6091272422bb0fbd729f7f5d17a56d37499c54f" }, - "nvim-treesitter": { "branch": "master", "commit": "6aababfca4e3d72cb1e8fbbdac4115a5f88107d0" }, + "nvim-treesitter": { "branch": "master", "commit": "1c79da3300951e934f635eaf8703480b57644e7e" }, "plenary.nvim": { "branch": "master", "commit": "267282a9ce242bbb0c5dc31445b6d353bed978bb" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "9bc8237565ded606e6c366a71c64c0af25cd7a50" }, - "telescope.nvim": { "branch": "master", "commit": "776b509f80dd49d8205b9b0d94485568236d1192" } + "telescope.nvim": { "branch": "master", "commit": "776b509f80dd49d8205b9b0d94485568236d1192" }, + "vim-markdown": { "branch": "master", "commit": "cc82d88e2a791f54d2b6e2b26e41f743351ac947" } } \ No newline at end of file