diff --git a/.gitignore b/.gitignore index 8a192ca..005b535 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ test.sh nvim spell/ +lazy-lock.json diff --git a/init.lua b/init.lua index 8dd9e05..3784c1a 100644 --- a/init.lua +++ b/init.lua @@ -91,11 +91,10 @@ vim.g.mapleader = ' ' vim.g.maplocalleader = ' ' -- Set to true if you have a Nerd Font installed and selected in the terminal -vim.g.have_nerd_font = true +vim.g.have_nerd_font = false -- [[ Setting options ]] require 'options' -require 'optionsz' -- [[ Basic Keymaps ]] require 'keymaps' diff --git a/lazy-lock.json b/lazy-lock.json deleted file mode 100644 index 11deba2..0000000 --- a/lazy-lock.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "LuaSnip": { "branch": "master", "commit": "33b06d72d220aa56a7ce80a0dd6f06c70cd82b9d" }, - "cmp-nvim-lsp": { "branch": "main", "commit": "99290b3ec1322070bcfb9e846450a46f6efa50f0" }, - "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, - "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, - "conform.nvim": { "branch": "master", "commit": "f4e8837878fc5712d053ba3091a73d27d96a09e2" }, - "fidget.nvim": { "branch": "main", "commit": "e2a175c2abe2d4f65357da1c98c59a5cfb2b543f" }, - "gitsigns.nvim": { "branch": "main", "commit": "5f808b5e4fef30bd8aca1b803b4e555da07fc412" }, - "indent-blankline.nvim": { "branch": "master", "commit": "259357fa4097e232730341fa60988087d189193a" }, - "lazy.nvim": { "branch": "main", "commit": "7c493713bc2cb392706866eeba53aaef6c8e9fc6" }, - "lazydev.nvim": { "branch": "main", "commit": "f59bd14a852ca43db38e3662395354cb2a9b13e0" }, - "luvit-meta": { "branch": "main", "commit": "57d464c4acb5c2e66bd4145060f5dc9e96a7bbb7" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "8e46de9241d3997927af12196bd8faa0ed08c29a" }, - "mason-tool-installer.nvim": { "branch": "main", "commit": "c5e07b8ff54187716334d585db34282e46fa2932" }, - "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, - "mini.nvim": { "branch": "main", "commit": "2435d0de00174a45d6b352fefeaa6008ebe9f23b" }, - "neo-tree.nvim": { "branch": "main", "commit": "a77af2e764c5ed4038d27d1c463fa49cd4794e07" }, - "nui.nvim": { "branch": "main", "commit": "53e907ffe5eedebdca1cd503b00aa8692068ca46" }, - "nvim-autopairs": { "branch": "master", "commit": "b464658e9b880f463b9f7e6ccddd93fb0013f559" }, - "nvim-chezmoi": { "branch": "main", "commit": "b3edf9ca41c63755c6d2c6e7462babf21e044aa2" }, - "nvim-cmp": { "branch": "main", "commit": "3403e2e9391ed0a28c3afddd8612701b647c8e26" }, - "nvim-lspconfig": { "branch": "master", "commit": "5a812abc65d529ea7673059a348814c21d7f87ff" }, - "nvim-web-devicons": { "branch": "master", "commit": "e73d2774d12d0ecf9e05578d692ba1ea50508cf2" }, - "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" }, - "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, - "telescope.nvim": { "branch": "0.1.x", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, - "todo-comments.nvim": { "branch": "main", "commit": "ae0a2afb47cf7395dc400e5dc4e05274bf4fb9e0" }, - "tokyonight.nvim": { "branch": "main", "commit": "b262293ef481b0d1f7a14c708ea7ca649672e200" }, - "vim-sleuth": { "branch": "master", "commit": "be69bff86754b1aa5adcbb527d7fcd1635a84080" }, - "which-key.nvim": { "branch": "main", "commit": "9b365a6428a9633e3eeb34dbef1b791511c54f70" } -} diff --git a/lazy/lazy.lua b/lazy/lazy.lua deleted file mode 100644 index a564707..0000000 --- a/lazy/lazy.lua +++ /dev/null @@ -1 +0,0 @@ -return {} diff --git a/lua/custom/plugins/nvim-chezmoi.lua b/lua/custom/plugins/nvim-chezmoi.lua deleted file mode 100644 index 070d9f2..0000000 --- a/lua/custom/plugins/nvim-chezmoi.lua +++ /dev/null @@ -1,12 +0,0 @@ -return { - 'andre-kotake/nvim-chezmoi', - lazy = false, - dependencies = { - { 'nvim-lua/plenary.nvim' }, - }, - opts = {}, - config = function(_, opts) - require('nvim-chezmoi').setup(opts) - end, -} --- vim: ts=2 sts=2 sw=2 et diff --git a/lua/lazy-plugins.lua b/lua/lazy-plugins.lua index e2015d3..f601d39 100644 --- a/lua/lazy-plugins.lua +++ b/lua/lazy-plugins.lua @@ -20,6 +20,7 @@ require('lazy').setup({ -- Use `opts = {}` to force a plugin to be loaded. -- + -- modular approach: using `require 'path/name'` will -- include a plugin definition from file lua/path/name.lua @@ -41,7 +42,7 @@ require('lazy').setup({ require 'kickstart/plugins/mini', - -- require 'kickstart/plugins/treesitter', + require 'kickstart/plugins/treesitter', -- The following two comments only work if you have downloaded the kickstart repo, not just copy pasted the -- init.lua. If you want these files, they are in the repository, so you can just download them and @@ -53,17 +54,17 @@ require('lazy').setup({ -- 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.indent_line', -- require 'kickstart.plugins.lint', - require 'kickstart.plugins.autopairs', - require 'kickstart.plugins.neo-tree', + -- require 'kickstart.plugins.autopairs', + -- require 'kickstart.plugins.neo-tree', -- 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' }, + -- { 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/optionsz.lua b/lua/optionsz.lua deleted file mode 100644 index e4ee6b7..0000000 --- a/lua/optionsz.lua +++ /dev/null @@ -1,14 +0,0 @@ -vim.schedule(function() - vim.g.clipboard = { - name = 'OSC 52', - copy = { - ['+'] = require('vim.ui.clipboard.osc52').copy '+', - ['*'] = require('vim.ui.clipboard.osc52').copy '*', - }, - paste = { - ['+'] = { 'false' }, - ['*'] = { 'false' }, - }, - cache_enabled = 1, - } -end)