From faff89f789edff2997c67ce995262a8087f6055e Mon Sep 17 00:00:00 2001 From: NaniNoni Date: Thu, 13 Jun 2024 15:40:35 +0200 Subject: [PATCH] Restructure plugins directory and remove docs --- doc/kickstart.txt | 24 ---------- doc/tags | 3 -- init.lua | 21 ++++----- lua/custom/plugins/init.lua | 5 -- lua/kickstart/health.lua | 52 --------------------- lua/{kickstart => }/plugins/autopairs.lua | 0 lua/{kickstart => }/plugins/debug.lua | 0 lua/{kickstart => }/plugins/gitsigns.lua | 0 lua/{kickstart => }/plugins/indent_line.lua | 0 lua/{kickstart => }/plugins/lint.lua | 0 lua/{kickstart => }/plugins/neo-tree.lua | 0 11 files changed, 9 insertions(+), 96 deletions(-) delete mode 100644 doc/kickstart.txt delete mode 100644 doc/tags delete mode 100644 lua/custom/plugins/init.lua delete mode 100644 lua/kickstart/health.lua rename lua/{kickstart => }/plugins/autopairs.lua (100%) rename lua/{kickstart => }/plugins/debug.lua (100%) rename lua/{kickstart => }/plugins/gitsigns.lua (100%) rename lua/{kickstart => }/plugins/indent_line.lua (100%) rename lua/{kickstart => }/plugins/lint.lua (100%) rename lua/{kickstart => }/plugins/neo-tree.lua (100%) diff --git a/doc/kickstart.txt b/doc/kickstart.txt deleted file mode 100644 index cb87ac3f..00000000 --- a/doc/kickstart.txt +++ /dev/null @@ -1,24 +0,0 @@ -================================================================================ -INTRODUCTION *kickstart.nvim* - -Kickstart.nvim is a project to help you get started on your neovim journey. - - *kickstart-is-not* -It is not: -- Complete framework for every plugin under the sun -- Place to add every plugin that could ever be useful - - *kickstart-is* -It is: -- Somewhere that has a good start for the most common "IDE" type features: - - autocompletion - - goto-definition - - find references - - fuzzy finding - - and hinting at what more can be done :) -- A place to _kickstart_ your journey. - - You should fork this project and use/modify it so that it matches your - style and preferences. If you don't want to do that, there are probably - other projects that would fit much better for you (and that's great!)! - - vim:tw=78:ts=8:ft=help:norl: diff --git a/doc/tags b/doc/tags deleted file mode 100644 index 687ae772..00000000 --- a/doc/tags +++ /dev/null @@ -1,3 +0,0 @@ -kickstart-is kickstart.txt /*kickstart-is* -kickstart-is-not kickstart.txt /*kickstart-is-not* -kickstart.nvim kickstart.txt /*kickstart.nvim* diff --git a/init.lua b/init.lua index 8920ad4d..949829d7 100644 --- a/init.lua +++ b/init.lua @@ -104,6 +104,10 @@ vim.keymap.set('n', '', '', { desc = 'Move focus to the right win vim.keymap.set('n', '', '', { desc = 'Move focus to the lower window' }) vim.keymap.set('n', '', '', { desc = 'Move focus to the upper window' }) +-- Change copilot key for accepting suggestions +vim.keymap.set('i', '', 'copilot#Accept("")', { expr = true, replace_keycodes = false }) +vim.g.copilot_no_tab_map = true + -- [[ Basic Autocommands ]] -- See `:help lua-guide-autocommands` @@ -782,19 +786,12 @@ require('lazy').setup({ -- Here are some example plugins that I've included in the Kickstart repository. -- Uncomment any of the lines below to enable them (you will need to restart nvim). -- - -- require 'kickstart.plugins.debug', - -- require 'kickstart.plugins.indent_line', - -- require 'kickstart.plugins.lint', - -- require 'kickstart.plugins.autopairs', - -- require 'kickstart.plugins.neo-tree', + -- require 'plugins.debug', + -- require 'plugins.indent_line', + -- require 'plugins.lint', + -- require 'plugins.autopairs', + require 'plugins.neo-tree', -- require 'kickstart.plugins.gitsigns', -- adds gitsigns recommend keymaps - - -- NOTE: The import below can automatically add your own plugins, configuration, etc from `lua/custom/plugins/*.lua` - -- This is the easiest way to modularize your config. - -- - -- Uncomment the following line and add your plugins to `lua/custom/plugins/*.lua` to get going. - -- For additional information, see `:help lazy.nvim-lazy.nvim-structuring-your-plugins` - -- { import = 'custom.plugins' }, }, { ui = { -- If you are using a Nerd Font: set icons to an empty table which will use the diff --git a/lua/custom/plugins/init.lua b/lua/custom/plugins/init.lua deleted file mode 100644 index be0eb9d8..00000000 --- a/lua/custom/plugins/init.lua +++ /dev/null @@ -1,5 +0,0 @@ --- You can add your own plugins here or in other files in this directory! --- I promise not to create any merge conflicts in this directory :) --- --- See the kickstart.nvim README for more information -return {} diff --git a/lua/kickstart/health.lua b/lua/kickstart/health.lua deleted file mode 100644 index 04df77b3..00000000 --- a/lua/kickstart/health.lua +++ /dev/null @@ -1,52 +0,0 @@ ---[[ --- --- This file is not required for your own configuration, --- but helps people determine if their system is setup correctly. --- ---]] - -local check_version = function() - local verstr = string.format('%s.%s.%s', vim.version().major, vim.version().minor, vim.version().patch) - if not vim.version.cmp then - vim.health.error(string.format("Neovim out of date: '%s'. Upgrade to latest stable or nightly", verstr)) - return - end - - if vim.version.cmp(vim.version(), { 0, 9, 4 }) >= 0 then - vim.health.ok(string.format("Neovim version is: '%s'", verstr)) - else - vim.health.error(string.format("Neovim out of date: '%s'. Upgrade to latest stable or nightly", verstr)) - end -end - -local check_external_reqs = function() - -- Basic utils: `git`, `make`, `unzip` - for _, exe in ipairs { 'git', 'make', 'unzip', 'rg' } do - local is_executable = vim.fn.executable(exe) == 1 - if is_executable then - vim.health.ok(string.format("Found executable: '%s'", exe)) - else - vim.health.warn(string.format("Could not find executable: '%s'", exe)) - end - end - - return true -end - -return { - check = function() - vim.health.start 'kickstart.nvim' - - vim.health.info [[NOTE: Not every warning is a 'must-fix' in `:checkhealth` - - Fix only warnings for plugins and languages you intend to use. - Mason will give warnings for languages that are not installed. - You do not need to install, unless you want to use those languages!]] - - local uv = vim.uv or vim.loop - vim.health.info('System Information: ' .. vim.inspect(uv.os_uname())) - - check_version() - check_external_reqs() - end, -} diff --git a/lua/kickstart/plugins/autopairs.lua b/lua/plugins/autopairs.lua similarity index 100% rename from lua/kickstart/plugins/autopairs.lua rename to lua/plugins/autopairs.lua diff --git a/lua/kickstart/plugins/debug.lua b/lua/plugins/debug.lua similarity index 100% rename from lua/kickstart/plugins/debug.lua rename to lua/plugins/debug.lua diff --git a/lua/kickstart/plugins/gitsigns.lua b/lua/plugins/gitsigns.lua similarity index 100% rename from lua/kickstart/plugins/gitsigns.lua rename to lua/plugins/gitsigns.lua diff --git a/lua/kickstart/plugins/indent_line.lua b/lua/plugins/indent_line.lua similarity index 100% rename from lua/kickstart/plugins/indent_line.lua rename to lua/plugins/indent_line.lua diff --git a/lua/kickstart/plugins/lint.lua b/lua/plugins/lint.lua similarity index 100% rename from lua/kickstart/plugins/lint.lua rename to lua/plugins/lint.lua diff --git a/lua/kickstart/plugins/neo-tree.lua b/lua/plugins/neo-tree.lua similarity index 100% rename from lua/kickstart/plugins/neo-tree.lua rename to lua/plugins/neo-tree.lua