diff --git a/README.md b/README.md index ed57bd9..93b7906 100644 --- a/README.md +++ b/README.md @@ -26,6 +26,8 @@ To build some of the packages you will need: - cargo - npm +ripgrep is expected for `grep`. + Inside Neovim this is useful: ```neovim diff --git a/fnl/boot.fnl b/fnl/boot.fnl index 6808810..e135131 100644 --- a/fnl/boot.fnl +++ b/fnl/boot.fnl @@ -2,7 +2,6 @@ (lazy.setup ["https://github.com/rktjmp/hotpot.nvim" {:url "https://github.com/nvim-treesitter/nvim-treesitter" :build ":TSUpdate"} - ;TODO "https://github.com/julienvincent/nvim-paredit" "https://github.com/guns/vim-sexp" "https://github.com/ludovicchabant/vim-gutentags" "https://github.com/preservim/vim-markdown" diff --git a/fnl/personalize.fnl b/fnl/personalize.fnl index 285dce3..ee039ea 100644 --- a/fnl/personalize.fnl +++ b/fnl/personalize.fnl @@ -18,7 +18,6 @@ (nmap : : "Toggle alternate-file") (nmap : ":bn|bd!#" "Delete a buffer without removing the split") (nmap :w :80|) - ;; unified split navigation via C-hjkl (nmap : :h) (nmap : :j) (nmap : :k) @@ -28,22 +27,19 @@ (tmap : :k) (tmap : :l) (tmap : "") - ;(tmap :v ":vnew term://bash") - ;(tmap :s ":new term://bash") - ;; terminal (nmap :to ":new term://bash|resize 8") - (nmap :tg ":term gomuksi") - ;;(nmap :tt ":term tuti") (vim.api.nvim_create_autocmd [:BufWinEnter :WinEnter] {:pattern "term://*" :command "startinsert"}) - (nmap :dd + (nmap :dj #(vim.cmd (.. "split ~/TDC-Obsidian/Journal/" + (os.date "%Y") "/" + (os.date "%m") "/" (os.date "%Y-%m-%d") ".md" "|resize 8|$") - "Open today's diary")) + "Open today's journal")) (nmap :p ":Telescope find_files" "Telescope find_files") (nmap :o ":Telescope buffers" "Telescope buffers") (nmap :f ":Telescope live_grep" "Telescope live_grep") diff --git a/ftdetect/markdown.lua b/ftdetect/markdown.lua index dd6c7c4..4f09dd0 100644 --- a/ftdetect/markdown.lua +++ b/ftdetect/markdown.lua @@ -4,9 +4,12 @@ vim.api.nvim_create_autocmd({ "BufNewFile", "BufFilePost", "BufRead" }, { vim.bo.filetype = "markdown" vim.bo.syntax = "markdown" vim.o.colorcolumn = "80" - vim.o.textwidth = 80 - -- vim.o.formatoptions = vim.o.formatoptions .. "na" - -- TODO what's the proper spell for this shit - -- vim.opt.formatlistpat = "^\s*-" + vim.bo.textwidth = 0 + vim.bo.comments = "" + vim.o.colorcolumn = "" + vim.o.wrap = true + vim.o.linebreak = true + vim.keymap.set({"n"}, "j", "gj") + vim.keymap.set({"n"}, "k", "gk") end, }) diff --git a/lazy-lock.json b/lazy-lock.json index bf3b94d..e4a7c39 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,28 +1,28 @@ { - "LuaSnip": { "branch": "master", "commit": "8ae1dedd988eb56441b7858bd1e8554dfadaa46d" }, + "LuaSnip": { "branch": "master", "commit": "a7a4b4682c4b3e2ba82b82a4e6e5f5a0e79dec32" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-cmdline": { "branch": "main", "commit": "8ee981b4a91f536f52add291594e89fb6645e451" }, "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, - "duck.nvim": { "branch": "main", "commit": "977b4aa4004726ed3d87b2437f543cef2153b8ea" }, - "everforest": { "branch": "master", "commit": "72f101bd63228a1a45012325e39c5280ec22c828" }, + "duck.nvim": { "branch": "main", "commit": "0ca969d549f5d546ae395e163130024b51694235" }, + "everforest": { "branch": "master", "commit": "d8ce3131f7491c61bd751bd455e2ddc0d47e74e9" }, "fidget.nvim": { "branch": "main", "commit": "0ba1e16d07627532b6cae915cc992ecac249fb97" }, - "friendly-snippets": { "branch": "main", "commit": "53d3df271d031c405255e99410628c26a8f0d2b0" }, - "hotpot.nvim": { "branch": "master", "commit": "0d0f414682a3e7d1561beac1f1545d8f8541599f" }, - "lazy.nvim": { "branch": "main", "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "56e435e09f8729af2d41973e81a0db440f8fe9c9" }, - "mason.nvim": { "branch": "main", "commit": "a09da6ac634926a299dd439da08bdb547a8ca011" }, - "neodev.nvim": { "branch": "main", "commit": "2a8630847dbb93455936156c0689678e4eaee319" }, - "nvim-cmp": { "branch": "main", "commit": "538e37ba87284942c1d76ed38dd497e54e65b891" }, - "nvim-lspconfig": { "branch": "master", "commit": "ce0e625df61be77abe1340fbc9afe9ad39b31dd8" }, + "friendly-snippets": { "branch": "main", "commit": "dcd4a586439a1c81357d5b9d26319ae218cc9479" }, + "hotpot.nvim": { "branch": "master", "commit": "b18d3d82e8545d9f765870c1d8f0da041bd61097" }, + "lazy.nvim": { "branch": "main", "commit": "aedcd79811d491b60d0a6577a9c1701063c2a609" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "21d33d69a81f6351e5a5f49078b2e4f0075c8e73" }, + "mason.nvim": { "branch": "main", "commit": "3b5068f0fc565f337d67a2d315d935f574848ee7" }, + "neodev.nvim": { "branch": "main", "commit": "84e0290f5600e8b89c0dfcafc864f45496a53400" }, + "nvim-cmp": { "branch": "main", "commit": "04e0ca376d6abdbfc8b52180f8ea236cbfddf782" }, + "nvim-lspconfig": { "branch": "master", "commit": "7f5cf1121f772850a30bdaf83fb448e88846aa58" }, "nvim-toc": { "branch": "main", "commit": "afc27debc800129c50c5b870846ce1a5c9ce4479" }, - "nvim-treesitter": { "branch": "master", "commit": "8ae4080c5ba59d81b4e49525d4168807bc098e73" }, - "plenary.nvim": { "branch": "master", "commit": "55d9fe89e33efd26f532ef20223e5f9430c8b0c0" }, + "nvim-treesitter": { "branch": "master", "commit": "212b7a504cf56f85d1acc5be237261b42d7560c5" }, + "plenary.nvim": { "branch": "master", "commit": "4f71c0c4a196ceb656c824a70792f3df3ce6bb6d" }, "telescope-emoji.nvim": { "branch": "master", "commit": "86248d97be84a1ce83f0541500ef9edc99ea2aa1" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" }, "telescope.nvim": { "branch": "master", "commit": "776b509f80dd49d8205b9b0d94485568236d1192" }, "vim-gutentags": { "branch": "master", "commit": "aa47c5e29c37c52176c44e61c780032dfacef3dd" }, - "vim-markdown": { "branch": "master", "commit": "46add6c3017d3e4035dc10ffa9cb54221d8dfe1a" }, + "vim-markdown": { "branch": "master", "commit": "a657e697376909c41475a686eeef7fc7a4972d94" }, "vim-sexp": { "branch": "master", "commit": "14464d4580af43424ed8f2614d94e62bfa40bb4d" } } \ No newline at end of file