From c1131140e1d2d6761364cfd7cdfcd21ee0923b7b Mon Sep 17 00:00:00 2001 From: Adam Date: Mon, 16 Jan 2023 12:06:03 -0500 Subject: [PATCH 1/4] =?UTF-8?q?more=20tpope=20=F0=9F=99=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .config/nvim/lua/ajet/packer.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/.config/nvim/lua/ajet/packer.lua b/.config/nvim/lua/ajet/packer.lua index 6c2b7fb..e843170 100644 --- a/.config/nvim/lua/ajet/packer.lua +++ b/.config/nvim/lua/ajet/packer.lua @@ -6,6 +6,7 @@ return require('packer').startup(function(use) 'nvim-telescope/telescope.nvim', tag = '0.1.0', requires = { { 'nvim-lua/plenary.nvim' } } } + use('tpope/vim-repeat') --use('EdenEast/nightfox.nvim') use({ 'nvim-treesitter/nvim-treesitter', { run = ':TSUpdate' } }) use('nvim-treesitter/playground') From 368e31ee3439f3144e773d1842527ac296bf7d8a Mon Sep 17 00:00:00 2001 From: Adam Date: Mon, 16 Jan 2023 12:11:04 -0500 Subject: [PATCH 2/4] =?UTF-8?q?catch=20the=20lisp=20bug=20=F0=9F=98=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit parens are everywhere... send help!!! wait! its just data! DATAAAAAA --- .config/nvim/after/plugin/conjure.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/.config/nvim/after/plugin/conjure.lua b/.config/nvim/after/plugin/conjure.lua index f9b069b..b984527 100644 --- a/.config/nvim/after/plugin/conjure.lua +++ b/.config/nvim/after/plugin/conjure.lua @@ -1 +1,2 @@ vim.g['conjure#extract#tree_sitter#enabled'] = true +vim.g['g:conjure#filetypes'] = {"clojure", "fennel", "lisp"} From 873c2f06497dafa7690bf3e0464090051a6a524e Mon Sep 17 00:00:00 2001 From: Adam Date: Mon, 16 Jan 2023 12:13:55 -0500 Subject: [PATCH 3/4] delete dup file --- .config/nvim/after/plugin/rusttools.lua | 210 ------------------------ 1 file changed, 210 deletions(-) delete mode 100644 .config/nvim/after/plugin/rusttools.lua diff --git a/.config/nvim/after/plugin/rusttools.lua b/.config/nvim/after/plugin/rusttools.lua deleted file mode 100644 index 2241b63..0000000 --- a/.config/nvim/after/plugin/rusttools.lua +++ /dev/null @@ -1,210 +0,0 @@ -local opts = { - tools = { -- rust-tools options - - -- how to execute terminal commands - -- options right now: termopen / quickfix - executor = require("rust-tools.executors").termopen, - - runnables = { - use_telescope = true - }, - -- callback to execute once rust-analyzer is done initializing the workspace - -- The callback receives one parameter indicating the `health` of the server: "ok" | "warning" | "error" - on_initialized = nil, - - -- automatically call RustReloadWorkspace when writing to a Cargo.toml file. - reload_workspace_from_cargo_toml = true, - - -- These apply to the default RustSetInlayHints command - inlay_hints = { - -- automatically set inlay hints (type hints) - -- default: true - auto = true, - - -- Only show inlay hints for the current line - only_current_line = false, - - -- whether to show parameter hints with the inlay hints or not - -- default: true - show_parameter_hints = true, - - -- prefix for parameter hints - -- default: "<-" - parameter_hints_prefix = "<- ", - - -- prefix for all the other hints (type, chaining) - -- default: "=>" - other_hints_prefix = "=> ", - - -- whether to align to the length of the longest line in the file - max_len_align = false, - - -- padding from the left if max_len_align is true - max_len_align_padding = 1, - - -- whether to align to the extreme right or not - right_align = false, - - -- padding from the right if right_align is true - right_align_padding = 7, - - -- The color of the hints - highlight = "Comment", - }, - - -- options same as lsp hover / vim.lsp.util.open_floating_preview() - hover_actions = { - - -- the border that is used for the hover window - -- see vim.api.nvim_open_win() - border = { - { "╭", "FloatBorder" }, - { "─", "FloatBorder" }, - { "╮", "FloatBorder" }, - { "│", "FloatBorder" }, - { "╯", "FloatBorder" }, - { "─", "FloatBorder" }, - { "╰", "FloatBorder" }, - { "│", "FloatBorder" }, - }, - - -- Maximal width of the hover window. Nil means no max. - max_width = nil, - - -- Maximal height of the hover window. Nil means no max. - max_height = nil, - - -- whether the hover action window gets automatically focused - -- default: false - auto_focus = false, - }, - - -- settings for showing the crate graph based on graphviz and the dot - -- command - crate_graph = { - -- Backend used for displaying the graph - -- see: https://graphviz.org/docs/outputs/ - -- default: x11 - backend = "x11", - -- where to store the output, nil for no output stored (relative - -- path from pwd) - -- default: nil - output = nil, - -- true for all crates.io and external crates, false only the local - -- crates - -- default: true - full = true, - - -- List of backends found on: https://graphviz.org/docs/outputs/ - -- Is used for input validation and autocompletion - -- Last updated: 2021-08-26 - enabled_graphviz_backends = { - "bmp", - "cgimage", - "canon", - "dot", - "gv", - "xdot", - "xdot1.2", - "xdot1.4", - "eps", - "exr", - "fig", - "gd", - "gd2", - "gif", - "gtk", - "ico", - "cmap", - "ismap", - "imap", - "cmapx", - "imap_np", - "cmapx_np", - "jpg", - "jpeg", - "jpe", - "jp2", - "json", - "json0", - "dot_json", - "xdot_json", - "pdf", - "pic", - "pct", - "pict", - "plain", - "plain-ext", - "png", - "pov", - "ps", - "ps2", - "psd", - "sgi", - "svg", - "svgz", - "tga", - "tiff", - "tif", - "tk", - "vml", - "vmlz", - "wbmp", - "webp", - "xlib", - "x11", - }, - }, - }, - - -- all the opts to send to nvim-lspconfig - -- these override the defaults set by rust-tools.nvim - -- see https://github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md#rust_analyzer - server = { - -- standalone file support - -- setting it to false may improve startup time - standalone = true, - on_attach = function(_, buffnr) - local opts = { noremap = true, silent = true } - vim.api.nvim_buf_set_option(buffnr, 'omnifunc', 'v:lua.vim.lsp.omnifunc') - vim.keymap.set('n', 'e', vim.diagnostic.open_float, opts) - vim.keymap.set('n', '[d', vim.diagnostic.goto_prev, opts) - vim.keymap.set('n', ']d', vim.diagnostic.goto_next, opts) - vim.keymap.set('n', 'q', vim.diagnostic.setloclist, opts) - - -- Mappings. - -- See `:help vim.lsp.*` for documentation on any of the below functions - local bufopts = { noremap = true, silent = true, buffer = buffnr } - vim.keymap.set('n', 'gD', vim.lsp.buf.declaration, bufopts) - vim.keymap.set('n', 'gd', vim.lsp.buf.definition, bufopts) - vim.keymap.set('n', 'K', vim.lsp.buf.hover, bufopts) - vim.keymap.set('n', 'gi', vim.lsp.buf.implementation, bufopts) - vim.keymap.set('n', '', vim.lsp.buf.signature_help, bufopts) - vim.keymap.set('n', 'wa', vim.lsp.buf.add_workspace_folder, bufopts) - vim.keymap.set('n', 'wr', vim.lsp.buf.remove_workspace_folder, bufopts) - vim.keymap.set('n', 'wl', function() - print(vim.inspect(vim.lsp.buf.list_workspace_folders())) - end, bufopts) - vim.keymap.set('n', 'gy', vim.lsp.buf.type_definition, bufopts) - vim.keymap.set('n', 'rn', vim.lsp.buf.rename, bufopts) - vim.keymap.set('n', 'ca', vim.lsp.buf.code_action, { silent = true, buffer = buffnr }) - vim.keymap.set('n', 'gr', vim.lsp.buf.references, bufopts) - vim.keymap.set('n', 'F', vim.lsp.buf.formatting, bufopts) - vim.keymap.set('n', 'ca', ':RustCodeAction', bufopts) - vim.keymap.set('n', 'K', ':RustHoverActions', bufopts) - vim.keymap.set('n', 'R', ':RustRunnables', bufopts) - vim.keymap.set('n', 'D', ':RustDebuggables', bufopts) - end, - }, -- rust-analyzer options - - -- debugging stuff - dap = { - adapter = { - type = "executable", - command = "lldb-vscode", - name = "rt_lldb", - }, - }, -} - -require('rust-tools').setup(opts) From 03a8a302b1355f7b73e900250375b0ee9cc57587 Mon Sep 17 00:00:00 2001 From: Adam Date: Mon, 16 Jan 2023 12:14:07 -0500 Subject: [PATCH 4/4] add folding --- .config/nvim/lua/ajet/set.lua | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.config/nvim/lua/ajet/set.lua b/.config/nvim/lua/ajet/set.lua index dc3b1b3..687e446 100644 --- a/.config/nvim/lua/ajet/set.lua +++ b/.config/nvim/lua/ajet/set.lua @@ -8,6 +8,11 @@ vim.opt.softtabstop = 4 vim.opt.shiftwidth = 4 vim.opt.expandtab = true +vim.opt.foldlevel = 2 +vim.opt.foldmethod = "expr" +vim.opt.foldexpr = "nvim_treesitter#foldexpr()" +vim.opt.foldcolumn = "3" + vim.opt.smartindent = true vim.opt.wrap = true