From d77e487540052a5808181b9849406020caef1cbc Mon Sep 17 00:00:00 2001 From: Zynh0722 Date: Fri, 12 May 2023 04:14:03 -0700 Subject: [PATCH] the purge --- after/ftplugin/netrw.lua | 2 - after/plugin/comment.lua | 6 --- after/plugin/fugitive.lua | 2 - after/plugin/gitsigns.lua | 11 ---- after/plugin/harpoon.lua | 10 ---- after/plugin/lsp.lua | 63 ---------------------- after/plugin/lualine.lua | 34 ------------ after/plugin/rose-pine.lua | 10 ---- after/plugin/rust-tools.lua | 32 ------------ after/plugin/telescope.lua | 9 ---- after/plugin/treesitter.lua | 21 -------- after/plugin/treesj.lua | 3 -- after/plugin/undotree.lua | 1 - after/queries/tsx/highlights.scm | 13 ----- init.lua | 1 - lua/zynh/autos.lua | 32 ------------ lua/zynh/init.lua | 3 -- lua/zynh/packer.lua | 90 -------------------------------- lua/zynh/remap.lua | 58 -------------------- lua/zynh/set.lua | 43 --------------- 20 files changed, 444 deletions(-) delete mode 100644 after/ftplugin/netrw.lua delete mode 100644 after/plugin/comment.lua delete mode 100644 after/plugin/fugitive.lua delete mode 100644 after/plugin/gitsigns.lua delete mode 100644 after/plugin/harpoon.lua delete mode 100644 after/plugin/lsp.lua delete mode 100644 after/plugin/lualine.lua delete mode 100644 after/plugin/rose-pine.lua delete mode 100644 after/plugin/rust-tools.lua delete mode 100644 after/plugin/telescope.lua delete mode 100644 after/plugin/treesitter.lua delete mode 100644 after/plugin/treesj.lua delete mode 100644 after/plugin/undotree.lua delete mode 100644 after/queries/tsx/highlights.scm delete mode 100644 init.lua delete mode 100644 lua/zynh/autos.lua delete mode 100644 lua/zynh/init.lua delete mode 100644 lua/zynh/packer.lua delete mode 100644 lua/zynh/remap.lua delete mode 100644 lua/zynh/set.lua diff --git a/after/ftplugin/netrw.lua b/after/ftplugin/netrw.lua deleted file mode 100644 index d5f9d18..0000000 --- a/after/ftplugin/netrw.lua +++ /dev/null @@ -1,2 +0,0 @@ --- vim.keymap.set('n', "", vim.cmd("mfmx"), { buffer = true }) --- attempt to open in external file explorer I think diff --git a/after/plugin/comment.lua b/after/plugin/comment.lua deleted file mode 100644 index c659f59..0000000 --- a/after/plugin/comment.lua +++ /dev/null @@ -1,6 +0,0 @@ --- Enable Comment.nvim -require('Comment').setup({ - options = { - theme = 'rose-pine' - } -}) diff --git a/after/plugin/fugitive.lua b/after/plugin/fugitive.lua deleted file mode 100644 index ee752c9..0000000 --- a/after/plugin/fugitive.lua +++ /dev/null @@ -1,2 +0,0 @@ -vim.keymap.set("n", "gs", vim.cmd.Git, { desc = "Open Git Fugitive" }) -vim.keymap.set("n", "fo", function() vim.cmd('Git pull') end, { desc = "Git pull" }) diff --git a/after/plugin/gitsigns.lua b/after/plugin/gitsigns.lua deleted file mode 100644 index 3ae8ced..0000000 --- a/after/plugin/gitsigns.lua +++ /dev/null @@ -1,11 +0,0 @@ --- Gitsigns --- See `:help gitsigns.txt` -require('gitsigns').setup { - signs = { - add = { text = '+' }, - change = { text = '~' }, - delete = { text = '_' }, - topdelete = { text = '‾' }, - changedelete = { text = '~' }, - }, -} diff --git a/after/plugin/harpoon.lua b/after/plugin/harpoon.lua deleted file mode 100644 index 59e8fd9..0000000 --- a/after/plugin/harpoon.lua +++ /dev/null @@ -1,10 +0,0 @@ -local mark = require("harpoon.mark") -local ui = require("harpoon.ui") - -vim.keymap.set("n", "a", mark.add_file, { desc = "Harpoon add file" }) -vim.keymap.set("n", "", ui.toggle_quick_menu, { desc = "Harpoon quick menu" }) - -vim.keymap.set("n", "", function() ui.nav_file(1) end, { desc = "Harpoon File 1" }) -vim.keymap.set("n", "", function() ui.nav_file(2) end, { desc = "Harpoon File 2" }) -vim.keymap.set("n", "", function() ui.nav_file(3) end, { desc = "Harpoon File 3" }) -vim.keymap.set("n", "", function() ui.nav_file(4) end, { desc = "Harpoon File 4" }) diff --git a/after/plugin/lsp.lua b/after/plugin/lsp.lua deleted file mode 100644 index 5421cb2..0000000 --- a/after/plugin/lsp.lua +++ /dev/null @@ -1,63 +0,0 @@ -local lsp = require('lsp-zero') -lsp.preset('recommended') - -lsp.ensure_installed({ - 'tsserver', - 'eslint', - 'lua_ls', -}) - -lsp.nvim_workspace() - -local cmp = require('cmp') -local cmp_select = { behaviour = cmp.SelectBehavior.Select } -local cmp_mappings = lsp.defaults.cmp_mappings({ - [''] = cmp.mapping.select_prev_item(cmp_select), - [''] = cmp.mapping.select_prev_item(cmp_select), - [''] = cmp.mapping.confirm({ select = true }), - [''] = cmp.mapping.complete(), -}) - -lsp.set_preferences({ - lsp.set_preferences({ - sign_icons = { - error = 'E', - warn = 'W', - hint = 'H', - info = 'I' - } - }) -}) - -lsp.on_attach(function(_, bufnr) - local opts = { buffer = bufnr, remap = false } - - vim.keymap.set("n", "gd", function() vim.lsp.buf.definition() end, opts, { desc = "Definition" }) - vim.keymap.set("n", "K", function() vim.lsp.buf.hover() end, opts, { desc = "Hover" }) - vim.keymap.set("n", "vws", function() vim.lsp.buf.workspace_symbol() end, opts, { desc = "Workspace Symbol" }) - vim.keymap.set("n", "vd", function() vim.diagnostic.open_float() end, opts, { desc = "Open Info Float" }) - vim.keymap.set("n", "[d", function() vim.diagnostic.goto_next() end, opts, { desc = "Go to next" }) - vim.keymap.set("n", "]d", function() vim.diagnostic.goto_prev() end, opts, { desc = "Go to previous" }) - vim.keymap.set("n", "vca", function() vim.lsp.buf.code_action() end, opts, { desc = "Code Actions" }) - vim.keymap.set("n", "vrr", function() vim.lsp.buf.references() end, opts, { desc = "References" }) - vim.keymap.set("n", "vrn", function() vim.lsp.buf.rename() end, opts, { desc = "Rename Symbol" }) - vim.keymap.set("i", "", function() vim.lsp.buf.signature_help() end, opts, { desc = "Signature Help" }) - vim.keymap.set("n", "fd", function() vim.lsp.buf.format() end, opts, { desc = "Format Document" }) -end) - -lsp.skip_server_setup({"rust_analyzer"}) - --- lsp_bindings = { --- def = "gd", --- hover = "K", --- workspace_symbol = "vws", --- goto_next = "[d", --- goto_prev = "]d", --- code_action = "vca", --- references = "vrr", --- rename = "vrr", --- sig_help = "", --- format = "fd", --- } - -lsp.setup() diff --git a/after/plugin/lualine.lua b/after/plugin/lualine.lua deleted file mode 100644 index 162c754..0000000 --- a/after/plugin/lualine.lua +++ /dev/null @@ -1,34 +0,0 @@ --- local theme = require("lualine.themes.rose-pine") --- local modes = { "normal", "insert", "visual", "replace", "command", "inactive" } --- for _, mode in ipairs(modes) do --- theme[mode].c.bg = "NONE" --- end --- --- --- -- Set lualine as statusline --- -- See `:help lualine.txt` --- require('lualine').setup { --- options = { --- icons_enabled = false, --- theme = 'rose-pine', --- component_separators = '|', --- section_separators = '', --- }, --- } -local theme = require("lualine.themes.rose-pine") -local modes = { "normal", "insert", "visual", "replace", "command", "inactive" } -for _, mode in ipairs(modes) do - theme[mode].c.bg = "none" -end - - --- Set lualine as statusline --- See `:help lualine.txt` -require('lualine').setup { - options = { - icons_enabled = false, - theme = theme, - component_separators = '|', - section_separators = '', - }, -} diff --git a/after/plugin/rose-pine.lua b/after/plugin/rose-pine.lua deleted file mode 100644 index 2788725..0000000 --- a/after/plugin/rose-pine.lua +++ /dev/null @@ -1,10 +0,0 @@ -require('rose-pine').setup({ - groups = { - background = 'none' - }, - highlight_groups = { - MsgArea = { bg = 'none' }, - } -}) - -vim.cmd('colorscheme rose-pine') diff --git a/after/plugin/rust-tools.lua b/after/plugin/rust-tools.lua deleted file mode 100644 index 75d3de6..0000000 --- a/after/plugin/rust-tools.lua +++ /dev/null @@ -1,32 +0,0 @@ -local rt = require("rust-tools") - -rt.setup({ - server = { - on_attach = function(_, bufnr) - -- Hover actions - vim.keymap.set("n", "K", rt.hover_actions.hover_actions, { buffer = bufnr, desc = "Open Hover Actions" }) - -- Code action groups - vim.keymap.set("n", "ca", rt.code_action_group.code_action_group, { buffer = bufnr, desc = "Code Actions" }) - - - local opts = { buffer = bufnr, remap = false } - - -- vim.keymap.set("n", "gd", function() vim.lsp.buf.definition() end, opts) - -- vim.keymap.set("n", "K", function() vim.lsp.buf.hover() end, opts) - -- vim.keymap.set("n", "vws", function() vim.lsp.buf.workspace_symbol() end, opts) - vim.keymap.set("n", "vd", function() vim.diagnostic.open_float() end, opts, { desc = "Open Info Float" }) - -- vim.keymap.set("n", "[d", function() vim.diagnostic.goto_next() end, opts) - -- vim.keymap.set("n", "]d", function() vim.diagnostic.goto_prev() end, opts) - -- vim.keymap.set("n", "vca", function() vim.lsp.buf.code_action() end, opts) - -- vim.keymap.set("n", "vrr", function() vim.lsp.buf.references() end, opts) - vim.keymap.set("n", "vrn", function() vim.lsp.buf.rename() end, opts, { desc = "Rename Symbol" }) - -- vim.keymap.set("i", "", function() vim.lsp.buf.signature_help() end, opts) - vim.keymap.set("n", "fd", function() vim.lsp.buf.format() end, opts, { desc = "Format Document" }) - end, - }, - tools = { - hover_actions = { - auto_focus = true, - } - } -}) diff --git a/after/plugin/telescope.lua b/after/plugin/telescope.lua deleted file mode 100644 index 6242a3d..0000000 --- a/after/plugin/telescope.lua +++ /dev/null @@ -1,9 +0,0 @@ -local builtin = require('telescope.builtin') -vim.keymap.set('n', 'pf', builtin.find_files, { desc = "Telescope Find Files" }) -vim.keymap.set('n', '', builtin.git_files, { desc = "Telescope Git Files (same as Find Files with ripgrep" }) -vim.keymap.set('n', 'ps', function () - builtin.grep_string({ search = vim.fn.input("Grep > ") }); -end, { desc = "Telescope Grep String" }) - --- Enable telescope fzf native, if installed -pcall(require('telescope').load_extension, 'fzf') diff --git a/after/plugin/treesitter.lua b/after/plugin/treesitter.lua deleted file mode 100644 index 4860e1a..0000000 --- a/after/plugin/treesitter.lua +++ /dev/null @@ -1,21 +0,0 @@ -require 'nvim-treesitter.configs'.setup { - -- A list of parser names, or "all" (the four listed parsers should always be installed) - ensure_installed = { "vimdoc", "javascript", "typescript", "c", "lua", "vim", "python" }, - - -- Install parsers synchronously (only applied to `ensure_installed`) - sync_install = false, - - -- Automatically install missing parsers when entering buffer - -- Recommendation: set to false if you don't have `tree-sitter` CLI installed locally - auto_install = true, - - autotag = { - enable = true - }, - - highlight = { - -- `false` will disable the whole extension - enable = true, - additional_vim_regex_highlighting = false, - }, -} diff --git a/after/plugin/treesj.lua b/after/plugin/treesj.lua deleted file mode 100644 index 85553cb..0000000 --- a/after/plugin/treesj.lua +++ /dev/null @@ -1,3 +0,0 @@ --- require'treesj'.setup({ --- --- }) diff --git a/after/plugin/undotree.lua b/after/plugin/undotree.lua deleted file mode 100644 index 350d811..0000000 --- a/after/plugin/undotree.lua +++ /dev/null @@ -1 +0,0 @@ -vim.keymap.set("n", "u", vim.cmd.UndotreeToggle, { desc = "Open undotree" }) diff --git a/after/queries/tsx/highlights.scm b/after/queries/tsx/highlights.scm deleted file mode 100644 index 6e231ff..0000000 --- a/after/queries/tsx/highlights.scm +++ /dev/null @@ -1,13 +0,0 @@ -;; extends -(jsx_attribute - ((property_identifier) @name (#eq? @name "className")) - (string ((string_fragment) @conceal (#set! conceal "󰇘")))) - -; (jsx_attribute -; ((property_identifier)(#eq? property_identifier "className")) -; (string (string_fragment) @conceal (#set! conceal "󰇘"))) - - -; (#set! @conceal "conceal" "󰇘") - -; (jsx_attribute) @conceal (#set! conceal "c") diff --git a/init.lua b/init.lua deleted file mode 100644 index 5898e2a..0000000 --- a/init.lua +++ /dev/null @@ -1 +0,0 @@ -require("zynh") diff --git a/lua/zynh/autos.lua b/lua/zynh/autos.lua deleted file mode 100644 index 1c8d04b..0000000 --- a/lua/zynh/autos.lua +++ /dev/null @@ -1,32 +0,0 @@ -local highlight_group = vim.api.nvim_create_augroup('YankHighlight', { clear = true }) - -vim.api.nvim_create_autocmd('TextYankPost', { - callback = function() - vim.highlight.on_yank() - end, - group = highlight_group, - pattern = '*', -}) - --- vim.cmd [[ --- autocmd TermOpen * startinsert --- ]] - -vim.api.nvim_create_autocmd({ "BufEnter", "BufWinEnter", "WinEnter", "TermOpen" }, { - callback = function() - vim.o.relativenumber = false - vim.o.number = false - - vim.cmd.startinsert() - end, - pattern = { "term://*" } -}) - -vim.api.nvim_create_autocmd({ "BufLeave" }, { - callback = function() vim.cmd.stopinsert() end, - pattern = { "term://*" } -}) - -vim.api.nvim_create_autocmd({ "TermClose" }, { - callback = function() vim.api.nvim_input("") end, -}) diff --git a/lua/zynh/init.lua b/lua/zynh/init.lua deleted file mode 100644 index b28dd50..0000000 --- a/lua/zynh/init.lua +++ /dev/null @@ -1,3 +0,0 @@ -require("zynh.remap") -require("zynh.set") -require("zynh.autos") diff --git a/lua/zynh/packer.lua b/lua/zynh/packer.lua deleted file mode 100644 index 1724712..0000000 --- a/lua/zynh/packer.lua +++ /dev/null @@ -1,90 +0,0 @@ -vim.cmd [[packadd packer.nvim]] - -return require('packer').startup(function(use) - -- Packer can manage itself - use 'wbthomason/packer.nvim' - - use { - 'nvim-telescope/telescope.nvim', tag = '0.1.0', - -- or , branch = '0.1.x', - requires = { 'nvim-lua/plenary.nvim' } - } - - use { - 'nvim-telescope/telescope-fzf-native.nvim', - run = 'make', - cond = vim.fn.executable 'make' == 1 - } - - use { - 'rose-pine/neovim', - as = 'rose-pine', - } - - use('nvim-treesitter/nvim-treesitter', { run = ':TSUpdate' }) - use 'nvim-treesitter/playground' - - -- Harpoon is fun - use 'ThePrimeagen/harpoon' - - -- mmm - use 'mbbill/undotree' - - -- git - use 'tpope/vim-fugitive' - use 'lewis6991/gitsigns.nvim' - - use { - 'nvim-lualine/lualine.nvim', - after = 'rose-pine', - } -- Fancier statusline - - use 'numToStr/Comment.nvim' -- "gc" to comment visual regions/lines - - use 'windwp/nvim-ts-autotag' -- autoclose html tags - - use { - 'VonHeikemen/lsp-zero.nvim', - requires = { - -- LSP Support - { 'neovim/nvim-lspconfig' }, -- Required - { 'williamboman/mason.nvim' }, -- Optional - { 'williamboman/mason-lspconfig.nvim' }, -- Optional - - -- Autocompletion - { 'hrsh7th/nvim-cmp' }, -- Required - { 'hrsh7th/cmp-nvim-lsp' }, -- Required - { 'hrsh7th/cmp-buffer' }, -- Optional - { 'hrsh7th/cmp-path' }, -- Optional - { 'saadparwaiz1/cmp_luasnip' }, -- Optional - { 'hrsh7th/cmp-nvim-lua' }, -- Optional - - -- Snippets - { 'L3MON4D3/LuaSnip' }, -- Required - { 'rafamadriz/friendly-snippets' }, -- Optional - } - } - - use { - 'simrat39/rust-tools.nvim', - after = 'lsp-zero.nvim' - } - - use { - "folke/which-key.nvim", - config = function() - vim.o.timeout = true - vim.o.timeoutlen = 300 - require("which-key").setup { - -- your configuration comes here - -- or leave it empty to use the default settings - -- refer to the configuration section below - } - end - } - - use({ - 'Wansmer/treesj', - requires = { 'nvim-treesitter' }, - }) -end) diff --git a/lua/zynh/remap.lua b/lua/zynh/remap.lua deleted file mode 100644 index 5bf1383..0000000 --- a/lua/zynh/remap.lua +++ /dev/null @@ -1,58 +0,0 @@ -vim.g.mapleader = " " -vim.keymap.set("n", "pv", vim.cmd.Ex, { desc = "Open netrw (:Ex)" }) - --- Move selected text -vim.keymap.set("v", "J", ":m '>+1gv=gv", { desc = "Move Selected Text Down" }) -vim.keymap.set("v", "K", ":m '<-2gv=gv", { desc = "Move Selected Text Up" }) - --- make J better by keeping cursor in place -vim.keymap.set("n", "J", "mzJ`z", { desc = "Join line below" }) - --- Center half page jumps -vim.keymap.set("n", "", "zz", { desc = "Half page jump down" }) -vim.keymap.set("n", "", "zz", { desc = "Half page jump up" }) - --- Center search --- vim.keymap.set("n", "n", "nzzzv") --- vim.keymap.set("n", "N", "Nzzzv") - -vim.keymap.set("x", "p", "\"_dP", { desc = "Paste from system clipboard" }) - --- system clipboard copying -vim.keymap.set("n", "y", "\"+y", { desc = "Copy to system clipboard" }) -vim.keymap.set("v", "y", "\"+y", { desc = "Copy to system clipboard" }) -vim.keymap.set("n", "Y", "\"+Y", { desc = "Copy to system clipboard" }) - --- null register deleting -vim.keymap.set("n", "d", "\"_d", { desc = "Delete to null register" }) -vim.keymap.set("v", "d", "\"_d", { desc = "Delete to null register" }) - --- #todo investigate this -vim.keymap.set("n", "Q", "") - --- replace current word -vim.keymap.set("n", "r", [[:%s/\<\>//gI]], { desc = "Regex replace current word" }) - --- make current file executable -vim.keymap.set("n", "x", "!chmod +x %", { silent = true, desc = "Make current file executable" }) - -vim.keymap.set("n", "", "h") -vim.keymap.set("n", "", "j") -vim.keymap.set("n", "", "k") -vim.keymap.set("n", "", "l") - -vim.keymap.set("i", "", "h") -vim.keymap.set("i", "", "j") -vim.keymap.set("i", "", "k") -vim.keymap.set("i", "", "l") - -vim.keymap.set("t", "", "h") -vim.keymap.set("t", "", "j") -vim.keymap.set("t", "", "k") -vim.keymap.set("t", "", "l") - --- Woe is ye who does not use tmux --- vim.keymap.set("n", "", function() --- vim.cmd.vsplit() --- vim.cmd.terminal() --- end) diff --git a/lua/zynh/set.lua b/lua/zynh/set.lua deleted file mode 100644 index 1589b8f..0000000 --- a/lua/zynh/set.lua +++ /dev/null @@ -1,43 +0,0 @@ -local opt = vim.opt - -opt.nu = true -opt.relativenumber = true - -opt.tabstop = 4 -opt.softtabstop = 4 -opt.shiftwidth = 4 -opt.expandtab = true - -opt.smartindent = true - --- Mouse mode -opt.mouse = 'a' - --- Make splitting more natural -opt.splitright = true -opt.splitbelow = true - -opt.wrap = false - -opt.swapfile = false -opt.backup = false -opt.undodir = os.getenv("HOME") .. "/.vim/undodir" -opt.undofile = true - -opt.hlsearch = false -opt.incsearch = true - -opt.termguicolors = true - -opt.scrolloff = 8 -opt.signcolumn = "yes" -opt.isfname:append("@-@") - -opt.updatetime = 50 - -opt.colorcolumn = "80,120" - -opt.conceallevel = 2 - -vim.g.netrw_list_hide = ".DS_Store" -