From 2d1e340c17d52b0c88761f30736747875ddf29d8 Mon Sep 17 00:00:00 2001 From: BardofSprites <89086143+BardofSprites@users.noreply.github.com> Date: Wed, 1 Apr 2026 17:58:24 -0400 Subject: nvim trimmed again --- nvim/.config/nvim/init.lua | 95 ++++++++++++++++------ nvim/.config/nvim/lua/bard/plugins/autopairs.lua | 7 -- nvim/.config/nvim/lua/bard/plugins/comment.lua | 10 --- .../nvim/lua/bard/plugins/gruber-darker.lua | 9 -- nvim/.config/nvim/lua/bard/plugins/nvim-tree.lua | 60 -------------- .../nvim/lua/bard/plugins/nvim-treesitter.lua | 14 ---- nvim/.config/nvim/lua/bard/plugins/telescope.lua | 73 ----------------- .../nvim/lua/bard/plugins/tmux-navigator.lua | 17 ---- nvim/.config/nvim/lua/bard/plugins/which-key.lua | 13 --- nvim/.config/nvim/lualine.lua | 10 --- 10 files changed, 68 insertions(+), 240 deletions(-) delete mode 100644 nvim/.config/nvim/lua/bard/plugins/autopairs.lua delete mode 100644 nvim/.config/nvim/lua/bard/plugins/comment.lua delete mode 100644 nvim/.config/nvim/lua/bard/plugins/gruber-darker.lua delete mode 100644 nvim/.config/nvim/lua/bard/plugins/nvim-tree.lua delete mode 100644 nvim/.config/nvim/lua/bard/plugins/nvim-treesitter.lua delete mode 100644 nvim/.config/nvim/lua/bard/plugins/telescope.lua delete mode 100644 nvim/.config/nvim/lua/bard/plugins/tmux-navigator.lua delete mode 100644 nvim/.config/nvim/lua/bard/plugins/which-key.lua delete mode 100644 nvim/.config/nvim/lualine.lua (limited to 'nvim') diff --git a/nvim/.config/nvim/init.lua b/nvim/.config/nvim/init.lua index caaa1b0..848602a 100644 --- a/nvim/.config/nvim/init.lua +++ b/nvim/.config/nvim/init.lua @@ -1,42 +1,83 @@ -vim.g.mapleader = ' ' +-- ============================= +-- Neovim Configuration (init.lua) +-- using Lazy.nvim +-- ============================= +-- --- Bootstrap Lazy.nvim --- local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" -if not (vim.uv or vim.loop).fs_stat(lazypath) then +if not vim.loop.fs_stat(lazypath) then vim.fn.system({ - "git", - "clone", - "--filter=blob:none", + "git", "clone", "--filter=blob:none", "https://github.com/folke/lazy.nvim.git", - "--branch=stable", -- latest stable release - lazypath, + "--branch=stable", lazypath, }) end vim.opt.rtp:prepend(lazypath) -require("lazy").setup("bard.plugins") +-- --- Plugin Setup --- +require("lazy").setup({ + { "junegunn/goyo.vim" }, + { "junegunn/fzf.vim" }, + { "tpope/vim-commentary" }, + { "tpope/vim-surround" }, + { "ap/vim-css-color" }, + { "nvim-telescope/telescope.nvim" }, + { "ellisonleao/gruvbox.nvim" }, +}) -vim.cmd.colorscheme("gruber-darker") +require("gruvbox").setup({ + terminal_colors = true, -- add neovim terminal colors + undercurl = true, + underline = true, + bold = true, + italic = { + strings = false, + emphasis = false, + comments = false, + operators = false, + folds = false, + }, + strikethrough = true, + invert_selection = false, + invert_signs = false, + invert_tabline = false, + inverse = true, -- invert background for search, diffs, statuslines and errors + contrast = "", -- can be "hard", "soft" or empty string + palette_overrides = {}, + overrides = {}, + dim_inactive = false, + transparent_mode = true, +}) +vim.cmd("colorscheme gruvbox") + +-- --- General Settings --- +vim.cmd("syntax enable") +vim.cmd("filetype plugin indent on") -vim.opt.clipboard = 'unnamedplus' -vim.opt.number = true -vim.opt.relativenumber = true -vim.opt.expandtab = true -vim.opt.shiftwidth = 4 vim.opt.tabstop = 4 -vim.opt.expandtab = true vim.opt.shiftwidth = 4 -vim.opt.tabstop = 4 +vim.opt.expandtab = true +vim.opt.relativenumber = true +vim.opt.number = true +vim.opt.ignorecase = true +vim.opt.smartcase = true +vim.opt.incsearch = true +vim.opt.modeline = true +vim.opt.hlsearch = false + +vim.opt.termguicolors = true --- nvim-tree binds -vim.api.nvim_set_keymap('n', 'e', ':NvimTreeToggle', { noremap = true, silent = true }) -vim.api.nvim_set_keymap('n', '', 'h', { noremap = true, silent = true }) -vim.api.nvim_set_keymap('n', '', 'j', { noremap = true, silent = true }) -vim.api.nvim_set_keymap('n', '', 'k', { noremap = true, silent = true }) -vim.api.nvim_set_keymap('n', '', 'l', { noremap = true, silent = true }) +-- --- Filetype Specific --- +vim.api.nvim_create_autocmd("FileType", { + pattern = { "org", "outline" }, + command = "setlocal nofoldenable", +}) --- telescope binds +-- --- Keybinds --- +vim.g.mapleader = " " local builtin = require('telescope.builtin') -vim.keymap.set('n', 'ff', builtin.find_files, {}) -vim.keymap.set('n', 'fg', builtin.live_grep, {}) -vim.keymap.set('n', 'fb', builtin.buffers, {}) -vim.keymap.set('n', 'fh', builtin.help_tags, {}) +vim.keymap.set('n', 'f', builtin.find_files, { desc = 'Telescope find files' }) +vim.keymap.set('n', 'g', builtin.live_grep, { desc = 'Telescope live grep' }) +vim.keymap.set('n', 'b', builtin.buffers, { desc = 'Telescope buffers' }) +vim.keymap.set("n", "d", ":Ex", { silent = true }) + diff --git a/nvim/.config/nvim/lua/bard/plugins/autopairs.lua b/nvim/.config/nvim/lua/bard/plugins/autopairs.lua deleted file mode 100644 index 596e844..0000000 --- a/nvim/.config/nvim/lua/bard/plugins/autopairs.lua +++ /dev/null @@ -1,7 +0,0 @@ -return { - 'windwp/nvim-autopairs', - event = "InsertEnter", - config = true - -- use opts = {} for passing setup options - -- this is equalent to setup({}) function -} diff --git a/nvim/.config/nvim/lua/bard/plugins/comment.lua b/nvim/.config/nvim/lua/bard/plugins/comment.lua deleted file mode 100644 index b954dea..0000000 --- a/nvim/.config/nvim/lua/bard/plugins/comment.lua +++ /dev/null @@ -1,10 +0,0 @@ -return { - 'numToStr/Comment.nvim', - opts = { - -- add any options here - }, - lazy = false, - config = function() - require('Comment').setup() - end -} diff --git a/nvim/.config/nvim/lua/bard/plugins/gruber-darker.lua b/nvim/.config/nvim/lua/bard/plugins/gruber-darker.lua deleted file mode 100644 index 1008b05..0000000 --- a/nvim/.config/nvim/lua/bard/plugins/gruber-darker.lua +++ /dev/null @@ -1,9 +0,0 @@ -return { - "blazkowolf/gruber-darker.nvim", - opts = { - bold = false, - italic = { - strings = false, - }, - }, -} diff --git a/nvim/.config/nvim/lua/bard/plugins/nvim-tree.lua b/nvim/.config/nvim/lua/bard/plugins/nvim-tree.lua deleted file mode 100644 index ff002fa..0000000 --- a/nvim/.config/nvim/lua/bard/plugins/nvim-tree.lua +++ /dev/null @@ -1,60 +0,0 @@ -return { - "nvim-tree/nvim-tree.lua", - dependencies = { - "nvim-tree/nvim-web-devicons" - }, - config = function() - vim.g.loaded_netrw = 1 - vim.g.loaded_netrwPlugin = 1 - - -- optionally enable 24-bit colour - vim.opt.termguicolors = true - - -- empty setup using defaults - require("nvim-tree").setup() - - -- OR setup with some options - require("nvim-tree").setup({ - sort = { - sorter = "case_sensitive", - }, - view = { - width = 30, - }, - renderer = { - group_empty = true, - }, - filters = { - dotfiles = true, - }, - }) - - require("nvim-tree").setup({ - renderer = { - icons = { - show = { - git = true, - file = false, - folder = false, - folder_arrow = true, - }, - glyphs = { - folder = { - arrow_closed = "⏵", - arrow_open = "⏷", - }, - git = { - unstaged = "✗", - staged = "✓", - unmerged = "⌥", - renamed = "➜", - untracked = "★", - deleted = "⊖", - ignored = "◌", - }, - }, - }, - }, - }) - end -} diff --git a/nvim/.config/nvim/lua/bard/plugins/nvim-treesitter.lua b/nvim/.config/nvim/lua/bard/plugins/nvim-treesitter.lua deleted file mode 100644 index ef16a7d..0000000 --- a/nvim/.config/nvim/lua/bard/plugins/nvim-treesitter.lua +++ /dev/null @@ -1,14 +0,0 @@ -return { - "nvim-treesitter/nvim-treesitter", - build = ":TSUpdate", - config = function () - local configs = require("nvim-treesitter.configs") - - configs.setup({ - ensure_installed = { "c", "lua", "vim", "vimdoc", "cpp", "html", "haskell" }, - sync_install = false, - highlight = { enable = true }, - indent = { enable = true }, - }) - end -} diff --git a/nvim/.config/nvim/lua/bard/plugins/telescope.lua b/nvim/.config/nvim/lua/bard/plugins/telescope.lua deleted file mode 100644 index 2394408..0000000 --- a/nvim/.config/nvim/lua/bard/plugins/telescope.lua +++ /dev/null @@ -1,73 +0,0 @@ -return { - { - 'nvim-telescope/telescope.nvim', - dependencies = { - { 'BurntSushi/ripgrep', 'nvim-telescope/telescope-fzf-native.nvim', build = 'make' } - }, - config = function(lazy, opts) - local telescope = require('telescope') - telescope.load_extension('fzf') - telescope.setup({ - defaults = { - wrap_result = true, - mappings = { - i = { - [""] = require("telescope.actions").close, - -- search history - [""] = require('telescope.actions').cycle_history_next, - [""] = require('telescope.actions').cycle_history_prev, - }, - }, - layout_strategy = "vertical", - layout_config = { - vertical = { - width = 0.9, - preview_cutoff = 10, - } - } - }, - pickers = { - -- note: remove the 'builtin.' prefix. - ["lsp_references"] = { wrap_results = true, }, - ["lsp_definitions"] = { wrap_results = true, }, - ["diagnostics"] = { wrap_results = true, }, - ["find_files"] = { wrap_results = true, }, - ["buffers"] = { sort_mru = true, ignore_current_buffer = true }, - } - }) - end, - - keys = { - -- See :help telescope.builtin - { 'fo', function() - require("telescope.builtin").oldfiles { - prompt_title = 'Recent files', - sort_mru= true - } end, - desc = "Old (recent) files"}, - {'', 'Telescope buffers', desc = "Buffers"}, - {'b', 'Telescope buffers', desc = "Buffers"}, - {'p', 'Telescope buffers', desc = "Buffers"}, - - {'ff', 'Telescope find_files', desc = "Find filenames"}, - {'fm', 'Telescope marks', desc = "Marks"}, - {'fw', 'Telescope live_grep', desc = "Grep files"}, - {'ld', 'Telescope diagnostics', desc = "diagnostics"}, - {"fb", function() - require("telescope.builtin").live_grep { - prompt_title = 'grep open files', - grep_open_files = true } - end, desc = "Grep open files"}, - {"fc", function() require("telescope.builtin").current_buffer_fuzzy_find() end, desc = "Grep this file"}, - {":", function() require("telescope.builtin").command_history { prompt_title = 'Command history' } end, desc = "cmd history"}, - { "ls", function() - local aerial_avail, _ = pcall(require, "aerial") - if aerial_avail then - require("telescope").extensions.aerial.aerial() - else - require("telescope.builtin").lsp_document_symbols() - end - end, desc = "Search symbols" }, - } - } -} diff --git a/nvim/.config/nvim/lua/bard/plugins/tmux-navigator.lua b/nvim/.config/nvim/lua/bard/plugins/tmux-navigator.lua deleted file mode 100644 index 4421fed..0000000 --- a/nvim/.config/nvim/lua/bard/plugins/tmux-navigator.lua +++ /dev/null @@ -1,17 +0,0 @@ -return { - "christoomey/vim-tmux-navigator", - cmd = { - "TmuxNavigateLeft", - "TmuxNavigateDown", - "TmuxNavigateUp", - "TmuxNavigateRight", - "TmuxNavigatePrevious", - }, - keys = { - { "", "TmuxNavigateLeft" }, - { "", "TmuxNavigateDown" }, - { "", "TmuxNavigateUp" }, - { "", "TmuxNavigateRight" }, - { "", "TmuxNavigatePrevious" }, - }, -} diff --git a/nvim/.config/nvim/lua/bard/plugins/which-key.lua b/nvim/.config/nvim/lua/bard/plugins/which-key.lua deleted file mode 100644 index 6f820e0..0000000 --- a/nvim/.config/nvim/lua/bard/plugins/which-key.lua +++ /dev/null @@ -1,13 +0,0 @@ -return { - "folke/which-key.nvim", - event = "VeryLazy", - init = function() - vim.o.timeout = true - vim.o.timeoutlen = 300 - end, - opts = { - -- your configuration comes here - -- or leave it empty to use the default settings - -- refer to the configuration section below - } -} diff --git a/nvim/.config/nvim/lualine.lua b/nvim/.config/nvim/lualine.lua deleted file mode 100644 index 7ce8332..0000000 --- a/nvim/.config/nvim/lualine.lua +++ /dev/null @@ -1,10 +0,0 @@ --- return { --- 'nvim-lualine/lualine.nvim', --- dependencies = { 'nvim-tree/nvim-web-devicons' }, --- config = function() --- require('lualine').setup { --- options = { theme = 'gruvbox_dark' } --- } --- end --- } - -- cgit v1.2.3