From f8fac0fd8c6a8a8b2ac77c635a50baa27ab09e7f Mon Sep 17 00:00:00 2001 From: juancwu <46619361+juancwu@users.noreply.github.com> Date: Sat, 8 Jul 2023 16:29:53 -0400 Subject: [PATCH] start neovim config from new --- .config/nvim/after/plugin/autopairs.rc.lua | 7 -- .config/nvim/after/plugin/autotags.rc.lua | 5 -- .config/nvim/after/plugin/harpoon.rc.lua | 18 ----- .config/nvim/after/plugin/lspzero.rc.lua | 45 ----------- .config/nvim/after/plugin/lualine.rc.lua | 52 ------------ .config/nvim/after/plugin/telescope.rc.lua | 63 --------------- .config/nvim/after/plugin/treesitter.rc.lua | 19 ----- .config/nvim/after/plugin/undotree.rc.lua | 16 ---- .config/nvim/init.lua | 1 - .config/nvim/lua/juancwu/clipboard.lua | 12 --- .config/nvim/lua/juancwu/init.lua | 4 - .config/nvim/lua/juancwu/keymaps.lua | 89 --------------------- .config/nvim/lua/juancwu/options.lua | 41 ---------- .config/nvim/lua/juancwu/packer.lua | 68 ---------------- .config/nvim/lua/juancwu/theme.lua | 1 - 15 files changed, 441 deletions(-) delete mode 100644 .config/nvim/after/plugin/autopairs.rc.lua delete mode 100644 .config/nvim/after/plugin/autotags.rc.lua delete mode 100644 .config/nvim/after/plugin/harpoon.rc.lua delete mode 100644 .config/nvim/after/plugin/lspzero.rc.lua delete mode 100644 .config/nvim/after/plugin/lualine.rc.lua delete mode 100644 .config/nvim/after/plugin/telescope.rc.lua delete mode 100644 .config/nvim/after/plugin/treesitter.rc.lua delete mode 100644 .config/nvim/after/plugin/undotree.rc.lua delete mode 100644 .config/nvim/init.lua delete mode 100644 .config/nvim/lua/juancwu/clipboard.lua delete mode 100644 .config/nvim/lua/juancwu/init.lua delete mode 100644 .config/nvim/lua/juancwu/keymaps.lua delete mode 100644 .config/nvim/lua/juancwu/options.lua delete mode 100644 .config/nvim/lua/juancwu/packer.lua delete mode 100644 .config/nvim/lua/juancwu/theme.lua diff --git a/.config/nvim/after/plugin/autopairs.rc.lua b/.config/nvim/after/plugin/autopairs.rc.lua deleted file mode 100644 index 995f63b..0000000 --- a/.config/nvim/after/plugin/autopairs.rc.lua +++ /dev/null @@ -1,7 +0,0 @@ -local status, autopairs = pcall(require, "nvim-autopairs") - -if not status then return end - -autopairs.setup({ - disable_filetype = { "TelescopePrompt", "vim" } -}) diff --git a/.config/nvim/after/plugin/autotags.rc.lua b/.config/nvim/after/plugin/autotags.rc.lua deleted file mode 100644 index 4b339e4..0000000 --- a/.config/nvim/after/plugin/autotags.rc.lua +++ /dev/null @@ -1,5 +0,0 @@ -local status, autotag = pcall(require, "nvim-ts-autotag") - -if not status then return end - -autotag.setup() diff --git a/.config/nvim/after/plugin/harpoon.rc.lua b/.config/nvim/after/plugin/harpoon.rc.lua deleted file mode 100644 index 5ff77d5..0000000 --- a/.config/nvim/after/plugin/harpoon.rc.lua +++ /dev/null @@ -1,18 +0,0 @@ -local status, mark = pcall(require, "harpoon.mark") - -if not status then return end - -local ui -status, ui = pcall(require, "harpoon.ui") - -if not status then return end - -vim.keymap.set("n", "a", mark.add_file) -vim.keymap.set("n", "", ui.toggle_quick_menu) - -vim.keymap.set("n", "q", function() ui.nav_file(1) end) -vim.keymap.set("n", "w", function() ui.nav_file(2) end) -vim.keymap.set("n", "e", function() ui.nav_file(3) end) -vim.keymap.set("n", "r", function() ui.nav_file(4) end) -vim.keymap.set("n", ",", ui.nav_prev) -vim.keymap.set("n", ".", ui.nav_next) diff --git a/.config/nvim/after/plugin/lspzero.rc.lua b/.config/nvim/after/plugin/lspzero.rc.lua deleted file mode 100644 index b95a5b4..0000000 --- a/.config/nvim/after/plugin/lspzero.rc.lua +++ /dev/null @@ -1,45 +0,0 @@ -local status, lspzero = pcall(require, "lsp-zero") - -if not status then return end - -lspzero.preset("recommended") - --- first argument is the client -lspzero.on_attach(function(_, bufnr) - lspzero.default_keymaps({ buffer = bufnr }) - - -- custom keymaps - vim.keymap.set("n", "f", "lua vim.lsp.buf.format()") -- format buffer -end) - --- Enable format on save -lspzero.format_on_save({ - format_opts = { - async = true, - timeout_ms = 10000, - }, - servers = { - ['lua_ls'] = { 'lua' }, - } -}) - -local lspconfig -status, lspconfig = pcall(require, "lspconfig") - -if status then - lspconfig.lua_ls.setup(lspzero.nvim_lua_ls()) -end - -lspzero.setup() - -local cmp -status, cmp = pcall(require, 'cmp') - -if not status then return end - -cmp.setup({ - mapping = { - -- Press "Enter" to confirm completion/suggestion - [''] = cmp.mapping.confirm({ select = true }), - } -}) diff --git a/.config/nvim/after/plugin/lualine.rc.lua b/.config/nvim/after/plugin/lualine.rc.lua deleted file mode 100644 index a582996..0000000 --- a/.config/nvim/after/plugin/lualine.rc.lua +++ /dev/null @@ -1,52 +0,0 @@ -local status, lualine = pcall(require, 'lualine') - -if (not status) then return end - -lualine.setup { - options = { - icons_enabled = true, - section_separators = { - left = '', - right = '' - }, - component_separators = { - left = '', - right = '' - }, - disabled_filetypes = {} - }, - sections = { - lualine_a = { 'mode' }, - lualine_b = { 'branch' }, - lualine_c = { { - 'filename', - file_status = true, -- display file status - path = 0 -- no file path - } }, - lualine_x = { - { - 'diagnostics', - sources = { 'nvim_diagnostic' }, - symbols = { error = ' ', warn = ' ', info = ' ', hint = '' } - }, - 'enconding', - 'filetype' - }, - lualine_y = { 'progress' }, - lualine_z = { 'location' } - }, - inactive_sections = { - lualine_a = {}, - lualine_b = {}, - lualine_c = { { - 'filename', - file_status = true, - path = 1 - } }, - lualine_x = { 'location' }, - lualine_y = {}, - lualine_z = {} - }, - tabline = {}, - extensions = { 'fugitive' } -} diff --git a/.config/nvim/after/plugin/telescope.rc.lua b/.config/nvim/after/plugin/telescope.rc.lua deleted file mode 100644 index 7c6355c..0000000 --- a/.config/nvim/after/plugin/telescope.rc.lua +++ /dev/null @@ -1,63 +0,0 @@ -local status, telescope = pcall(require, "telescope") - -if not status then return end - -local actions = require("telescope.actions") -local builtin = require("telescope.builtin") - -local fb_actions = require "telescope".extensions.file_browser.actions - -local function telescope_buffer_dir() - return vim.fn.expand("%:p:h") -end - -telescope.setup({ - defaults = { - mappings = { - n = { - ['q'] = actions.close - } - } - }, - extensions = { - file_browser = { - theme = "dropdown", - hijack_netrw = true, - hidden = true, - mappings = { - ['i'] = { - [''] = function() vim.cmd("normal vbd") end - }, - ['n'] = { - ['N'] = fb_actions.create, - ['h'] = fb_actions.goto_parent_dir, - ['/'] = function() vim.cmd("startinsert") end, - ['D'] = fb_actions.remove - } - } - } - } -}) - -telescope.load_extension("file_browser") - - --- Set up keymaps specific to telescope -vim.keymap.set("n", ";f", function() - builtin.find_files({ no_ignore = false, hidden = true }) -end) -vim.keymap.set("n", ";g", builtin.git_files) -vim.keymap.set("n", "sf", - function() - telescope.extensions.file_browser.file_browser({ - path = "%:p:h", - cwd = telescope_buffer_dir(), - respect_gitignore = true, - hidden = true, - grouped = true, - previewer = false, - initial_mode = "normal", - layout_config = { height = 40 } - }) - end) -vim.keymap.set("n", ";h", builtin.help_tags) diff --git a/.config/nvim/after/plugin/treesitter.rc.lua b/.config/nvim/after/plugin/treesitter.rc.lua deleted file mode 100644 index c9ca698..0000000 --- a/.config/nvim/after/plugin/treesitter.rc.lua +++ /dev/null @@ -1,19 +0,0 @@ -local status, treesitter = pcall(require, "nvim-treesitter.configs") - -if not status then return end - -treesitter.setup { - -- A list of parser names, or "all" - ensure_installed = { "vimdoc", "javascript", "typescript", "c", "lua", "rust" }, - - -- 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, - - highlight = { - enable = true, - }, -} diff --git a/.config/nvim/after/plugin/undotree.rc.lua b/.config/nvim/after/plugin/undotree.rc.lua deleted file mode 100644 index a753ae8..0000000 --- a/.config/nvim/after/plugin/undotree.rc.lua +++ /dev/null @@ -1,16 +0,0 @@ -vim.keymap.set("n", "u", vim.cmd.UndotreeToggle) - -local has_persistent_undo = vim.api.nvim_call_function("has", { "persistent_undo" }) - -if has_persistent_undo then - local target_path = vim.api.nvim_call_function("expand", { "~/.undodir" }) - - local is_directory = vim.api.nvim_call_function("isdirectory", { target_path }) - - if not is_directory then - vim.api.nvim_call_function("mkdir", { target_path, "p", 0700 }) - end - - vim.opt.undodir = target_path - vim.opt.undofile = true -end diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua deleted file mode 100644 index 099652f..0000000 --- a/.config/nvim/init.lua +++ /dev/null @@ -1 +0,0 @@ -require("juancwu") diff --git a/.config/nvim/lua/juancwu/clipboard.lua b/.config/nvim/lua/juancwu/clipboard.lua deleted file mode 100644 index 9c3eb14..0000000 --- a/.config/nvim/lua/juancwu/clipboard.lua +++ /dev/null @@ -1,12 +0,0 @@ -vim.g.clipboard = { - name = "win32yank", - copy = { - ['+'] = "win32yank.exe -i --crlf", - ['*'] = "win32yank.exe -i --crlf", - }, - paste = { - ['+'] = "win32yank.exe -o --lf", - ['*'] = "win32yank.exe -o --lf", - }, - cache_enabled = 0, -} diff --git a/.config/nvim/lua/juancwu/init.lua b/.config/nvim/lua/juancwu/init.lua deleted file mode 100644 index 84f29a6..0000000 --- a/.config/nvim/lua/juancwu/init.lua +++ /dev/null @@ -1,4 +0,0 @@ -require("juancwu.keymaps") -require("juancwu.options") -require("juancwu.theme") -require("juancwu.clipboard") diff --git a/.config/nvim/lua/juancwu/keymaps.lua b/.config/nvim/lua/juancwu/keymaps.lua deleted file mode 100644 index 42b3e48..0000000 --- a/.config/nvim/lua/juancwu/keymaps.lua +++ /dev/null @@ -1,89 +0,0 @@ -vim.g.mapleader = " " - --- easy escape -vim.keymap.set("i", "", "", { noremap = true, silent = true }) -vim.keymap.set("v", "", "", { noremap = true, silent = true }) -vim.keymap.set("n", "", "", { noremap = true, silent = true }) - --- open the explorer -vim.keymap.set("n", "e", "Ex") - --- move highlighted lines -vim.keymap.set("v", "J", ":m '>+1gv=gv") -vim.keymap.set("v", "K", ":m '<-2gv=gv") - --- make cursor stay in same position when appending line below -vim.keymap.set("n", "J", "mzJ`z") - --- make cursor stay in the middle while moving down/up the page -vim.keymap.set("n", "", "zz") -vim.keymap.set("n", "", "zz") - --- make cursor stay in the middle while looking through search results -vim.keymap.set("n", "n", "nzzzv") -vim.keymap.set("n", "N", "Nzzzv") - --- do not copy with x, for god sake, WHY copy something that is being deleted?? -vim.keymap.set("n", "x", "\"_x") - --- smile :) -vim.keymap.set("n", "Q", "") -vim.keymap.set("n", "q", "", { noremap = true }) -vim.keymap.set("n", "q", "q", { noremap = true }) - --- select and replace -vim.keymap.set("n", "s", [[:%s/\<\>//gI]]) - --- no copy, delete line, for god sake... -vim.keymap.set("n", "dd", "\"_dd") -vim.keymap.set("n", "dd", "dd") -- cut line, under my control - --- copy/paste to/from system clipboard -vim.keymap.set({ "n", "v" }, "y", "\"+y") -vim.keymap.set({ "n", "v" }, "p", "\"+p") - --- increment/decrement a count, helpful for changing indeces -vim.keymap.set("n", "+", "") -vim.keymap.set("n", "-", "") - --- do not copy when deleting word -vim.keymap.set("n", "dw", "\"_dw") -vim.keymap.set("n", "de", "\"_de") -vim.keymap.set("n", "dw", "dw") -vim.keymap.set("n", "de", "de") - -vim.keymap.set("n", "db", "vb\"_d") -- delete in backwards -vim.keymap.set("n", "db", "vbd") - -vim.keymap.set("n", "", "ggG") -- select all - --- split pane -vim.keymap.set("n", "ss", ":splitw", { silent = true }) -- horizontal -vim.keymap.set("n", "sv", ":vsplitw", { silent = true }) -- vertical - --- pane movement -vim.keymap.set("n", "..", "w") -- toggle -vim.keymap.set("n", "sh", "h") -vim.keymap.set("n", "sk", "k") -vim.keymap.set("n", "sl", "l") -vim.keymap.set("n", "sj", "j") - --- resize pane -vim.keymap.set("n", "", "<") -vim.keymap.set("n", "", ">") -vim.keymap.set("n", "", "+") -vim.keymap.set("n", "", "-") - --- my arrow keys babyyyy -vim.keymap.set("i", "", "", { noremap = true }) -vim.keymap.set("i", "", "", { noremap = true }) -vim.keymap.set("i", "", "", { noremap = true }) -vim.keymap.set("i", "", "", { noremap = true }) - --- terminal keymaps -vim.keymap.set("t", "", "", { noremap = true }) -vim.keymap.set("t", "", "bd!", { noremap = true }) -vim.keymap.set("n", "", "termi", { noremap = true }) - --- lazygit on floaterm -vim.keymap.set("n", "g", "FloatermNew lazygit", { noremap = true }) diff --git a/.config/nvim/lua/juancwu/options.lua b/.config/nvim/lua/juancwu/options.lua deleted file mode 100644 index 87f4dc7..0000000 --- a/.config/nvim/lua/juancwu/options.lua +++ /dev/null @@ -1,41 +0,0 @@ -vim.scriptencoding = "utf-8" -vim.opt.encoding = "utf-8" -vim.opt.fileencoding = "utf-8" - -vim.wo.number = true -- show line number -vim.opt.relativenumber = true -- juicy relativity - -vim.opt.autoindent = true -vim.opt.smartindent = true -vim.opt.tabstop = 4 -vim.opt.softtabstop = 4 -vim.opt.shiftwidth = 4 -vim.opt.expandtab = true -vim.opt.smarttab = true -vim.opt.breakindent = true - -vim.opt.wrap = false -- bad, stay away from me! - -vim.opt.hlsearch = false -vim.opt.incsearch = true -- highlight search pattern as you type - -vim.opt.scrolloff = 8 -- give me some personal space - -vim.opt.updatetime = 50 - -vim.opt.ignorecase = true -- case-insensitive search - -vim.opt.backspace = { "start", "eol", "indent" } - --- don't want to look into these... -vim.opt.wildignore:append { "*/node_modules/*", "*/__pycache__/*" } - --- add '*' in block comments -vim.opt.formatoptions:append { 'r' } - --- theme -vim.opt.winblend = 0 -vim.opt.wildoptions = "pum" -- show popup for autocomplete -vim.opt.pumblend = 5 -vim.opt.background = "dark" -vim.opt.termguicolors = true -- good shit, just take it diff --git a/.config/nvim/lua/juancwu/packer.lua b/.config/nvim/lua/juancwu/packer.lua deleted file mode 100644 index 051c282..0000000 --- a/.config/nvim/lua/juancwu/packer.lua +++ /dev/null @@ -1,68 +0,0 @@ --- Only required if you have packer configured as `opt` -vim.cmd [[packadd packer.nvim]] - -return require('packer').startup(function(use) - -- Packer can manage itself - use 'wbthomason/packer.nvim' - - -- Themes - use({ 'rose-pine/neovim', as = 'rose-pine' }) - - -- Sweet LSP - use { - 'VonHeikemen/lsp-zero.nvim', - branch = 'v2.x', - requires = { - -- LSP Support - { 'neovim/nvim-lspconfig' }, -- Required - { -- Optional - 'williamboman/mason.nvim', - run = function() - pcall(vim.cmd, 'MasonUpdate') - end, - }, - { 'williamboman/mason-lspconfig.nvim' }, -- Optional - - -- Autocompletion - { 'hrsh7th/nvim-cmp' }, -- Required - { 'hrsh7th/cmp-nvim-lsp' }, -- Required - { 'L3MON4D3/LuaSnip' }, -- Required - } - } - - -- Telescope for the fine file navigation - use { - 'nvim-telescope/telescope.nvim', tag = '0.1.2', - requires = { { 'nvim-lua/plenary.nvim' } } - } - - use { - "nvim-telescope/telescope-file-browser.nvim", - requires = { "nvim-telescope/telescope.nvim", "nvim-lua/plenary.nvim" } - } - - use('nvim-treesitter/nvim-treesitter', { run = ':TSUpdate' }) - - use { - 'nvim-lualine/lualine.nvim', - requires = { 'nvim-tree/nvim-web-devicons', opt = true } - } - - -- autopairs, complete brackets - use { - "windwp/nvim-autopairs", - config = function() require("nvim-autopairs").setup {} end - } - - -- auto closing tags - use "windwp/nvim-ts-autotag" - - -- quick navigation between files, harpoon - use 'ThePrimeagen/harpoon' - - -- shows a history to undo - use 'mbbill/undotree' - - -- float window for terminal commands - use 'voldikss/vim-floaterm' -end) diff --git a/.config/nvim/lua/juancwu/theme.lua b/.config/nvim/lua/juancwu/theme.lua deleted file mode 100644 index 3240184..0000000 --- a/.config/nvim/lua/juancwu/theme.lua +++ /dev/null @@ -1 +0,0 @@ -vim.cmd('colorscheme rose-pine')