From 90e488185d1de25741b784d5058ac0b72d76991c Mon Sep 17 00:00:00 2001 From: Aria Nolan Date: Sun, 16 Jul 2023 13:15:50 -0400 Subject: [PATCH] rnvimr, numb --- config.lua | 125 +++++++++++++++++++++++++++++-------------------- lua/user/c.lua | 2 +- 2 files changed, 74 insertions(+), 53 deletions(-) diff --git a/config.lua b/config.lua index 8d96798..202c52a 100644 --- a/config.lua +++ b/config.lua @@ -5,10 +5,9 @@ -- Discord: https://discord.com/invite/Xb9B4Ny require("user.c") -require("user.latex") lvim.colorscheme = "catppuccin-frappe" -vim.opt.rnu = true -- relative numbers +vim.opt.rnu = false -- relative numbers vim.opt.cb = "unnamedplus" vim.opt.nf = "alpha,octal,hex,bin,unsigned" vim.opt.si = true @@ -23,68 +22,90 @@ vim.opt.et = false lvim.keys.normal_mode[""] = ":NeoTreeFocusToggle" lvim.keys.normal_mode[""] = ":BufferLineCyclePrev" lvim.keys.normal_mode[""] = ":BufferLineCycleNext" +lvim.builtin.which_key.mappings["r"] = { + ":RnvimrToggle", "Rnvimr" +} lvim.format_on_save = false -vim.diagnostic.config( { virtual_text = true } ) +vim.diagnostic.config({ virtual_text = true }) lvim.builtin.treesitter.highlight.enable = true -- auto install treesitter parsers -lvim.builtin.treesitter.ensure_installed = { "cpp", "c", "latex" } +lvim.builtin.treesitter.ensure_installed = { "cpp", "c" } -- Additional Plugins table.insert(lvim.plugins, { - "p00f/clangd_extensions.nvim", - "catppuccin/nvim", - "nyoom-engineering/oxocarbon.nvim", - "rose-pine/neovim", - { - "nvim-neo-tree/neo-tree.nvim", - branch = "v2.x", - dependencies = { - "nvim-lua/plenary.nvim", - "nvim-tree/nvim-web-devicons", - "MunifTanjim/nui.nvim", - }, - config = function() - require("neo-tree").setup({ - close_if_last_window = true, - window = { - width = 30, - }, - buffers = { - follow_current_file = true, - }, - filesystem = { - follow_current_file = true, - filtered_items = { - hide_dotfiles = false, - hide_gitignored = false, - hide_by_name = { - "node_modules" - }, - never_show = { - ".DS_Store", - "thumbs.db" - }, - }, - }, - }) - end - }, - "lervag/vimtex", - "kdheepak/cmp-latex-symbols", - "KeitaNakamura/tex-conceal.vim", - "SirVer/ultisnips", + "p00f/clangd_extensions.nvim", + "catppuccin/nvim", + "nyoom-engineering/oxocarbon.nvim", + "rose-pine/neovim", { - "ggandor/leap.nvim", - name = "leap", - config = function() - require("leap").add_default_mappings() - end, + "nvim-neo-tree/neo-tree.nvim", + branch = "v2.x", + dependencies = { + "nvim-lua/plenary.nvim", + "nvim-tree/nvim-web-devicons", + "MunifTanjim/nui.nvim", + }, + config = function() + require("neo-tree").setup({ + close_if_last_window = true, + window = { + width = 30, + }, + buffers = { + follow_current_file = true, + }, + filesystem = { + follow_current_file = true, + filtered_items = { + hide_dotfiles = false, + hide_gitignored = false, + hide_by_name = { + "node_modules" + }, + never_show = { + ".DS_Store", + "thumbs.db" + }, + }, + }, + }) + end + }, + -- "lervag/vimtex", + -- "kdheepak/cmp-latex-symbols", + -- "KeitaNakamura/tex-conceal.vim", + "SirVer/ultisnips", + { + "ggandor/leap.nvim", + name = "leap", + config = function() + require("leap").add_default_mappings() + end, }, { - "mrjones2014/nvim-ts-rainbow", + "mrjones2014/nvim-ts-rainbow", + }, + { + "nacro90/numb.nvim", + event = "BufRead", + config = function() + require("numb").setup { + show_numbers = true, -- Enable 'number' for the window while peeking + show_cursorline = true, -- Enable 'cursorline' for the window while peeking + } + end, + }, + { + "kevinhwang91/rnvimr", + cmd = "RnvimrToggle", + config = function() + vim.g.rnvimr_draw_border = 1 + vim.g.rnvimr_pick_enable = 1 + vim.g.rnvimr_bw_enable = 1 + end, }, }) diff --git a/lua/user/c.lua b/lua/user/c.lua index 4df0b11..c06faf6 100644 --- a/lua/user/c.lua +++ b/lua/user/c.lua @@ -3,7 +3,7 @@ vim.list_extend(lvim.lsp.automatic_configuration.skipped_servers, { "clangd" }) -- some settings can only passed as commandline flags, see `clangd --help` local clangd_flags = { "--background-index", - "--fallback-style=Google", + "--fallback-style=LLVM", "--all-scopes-completion", "--clang-tidy", "--log=error",