Neovim: refactored keymaps to , completions now have good keybindings and did some slight tweaks

16 files changed, 34 insertions, 55 deletions

diff --git a/.config/nvim/TODO.md b/.config/nvim/TODO.md
index da82204..c2c3e6f 100644
--- a/.config/nvim/TODO.md
+++ b/.config/nvim/TODO.md
@@ -1,15 +1,12 @@
 
 # Plans for the future
 
-- TODO: Refactor stuff to `plugin` folder (keymaps and options) and also `after` folder for filetype-specific things
-p.s if some1 reads this and gets triggered by folders, GET REKT
-
 - TODO: Look into bufferline.nvim for "tabs"
 - TODO: Look at configuring Noice.nvim and decide if u like it or not
 - TODO: Look at buffer-management plugins that automatically delete old buffers (and also ways to close buffers without exiting nvim, and be able to exit nvim with 1 keypress)
 - TODO: Replace obsidian with Neorg
 - TODO: Add refactoring keys like <leader>iv for introduce variable, extract method, introduce constant etc
-- TODO: Decided which outline-plugin to use (lspsaga or aerial, or smthing else)
+- TODO: Decide which outline-plugin to use (lspsaga or aerial, or smthing else)
 - TODO: Finish configuring lsp saga (I think it has supertypes and stuff which aren't in the doc)
 
 - TODO: learn what dot repeat is
@@ -25,8 +22,6 @@ A lightbulb somewhere ONLY if the cursor (not line) has a code action and ONLY i
 ##  TODO: Completions and snippets
 Make my own snippets per file type
 HAVE ACTUAL GOOD SORTING FOR SNIPPETS (hopefully this is possible)
-*when there is an lsp active, it shouldn't show any other types like regex
-it should just show lsp stuff
 
 # Look at in the future
 
diff --git a/.config/nvim/after/ftplugin/c.lua b/.config/nvim/after/ftplugin/c.lua
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/.config/nvim/after/ftplugin/c.lua
diff --git a/.config/nvim/after/ftplugin/go.lua b/.config/nvim/after/ftplugin/go.lua
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/.config/nvim/after/ftplugin/go.lua
diff --git a/.config/nvim/after/ftplugin/java.lua b/.config/nvim/after/ftplugin/java.lua
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/.config/nvim/after/ftplugin/java.lua
diff --git a/.config/nvim/after/ftplugin/lua.lua b/.config/nvim/after/ftplugin/lua.lua
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/.config/nvim/after/ftplugin/lua.lua
diff --git a/.config/nvim/after/ftplugin/rust.lua b/.config/nvim/after/ftplugin/rust.lua
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/.config/nvim/after/ftplugin/rust.lua
diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua
index ad6df15..49c5efe 100644
--- a/.config/nvim/init.lua
+++ b/.config/nvim/init.lua
@@ -1,4 +1,17 @@
-require('options')
-require('keymaps')
-require('autocmds')
-require('plugin-manager')
+vim.g.mapleader = ' '
+vim.g.maplocalleader = ' '
+local lazypath = vim.fn.stdpath('data') .. '/lazy/lazy.nvim'
+if not (vim.uv or vim.loop).fs_stat(lazypath) then
+    vim.fn.system({
+        'git',
+        'clone',
+        '--filter=blob:none',
+        'https://github.com/folke/lazy.nvim.git',
+        '--branch=stable',
+        lazypath,
+    })
+end
+vim.opt.rtp:prepend(lazypath)
+require('lazy').setup({ import = 'custom/plugins' }, {
+    change_detection = { notify = false },
+})
diff --git a/.config/nvim/lua/custom/completion.lua b/.config/nvim/lua/custom/completion.lua
index 80c9531..04ae172 100644
--- a/.config/nvim/lua/custom/completion.lua
+++ b/.config/nvim/lua/custom/completion.lua
@@ -67,5 +67,3 @@ cmp.setup({
         ['<C-p>'] = cmp.mapping.select_prev_item({ behavior = cmp.SelectBehavior.Select }),
     }),
 })
-
-print('Sourced completion.lua')
diff --git a/.config/nvim/lua/custom/lsp.lua b/.config/nvim/lua/custom/lsp.lua
index d534e22..929014d 100644
--- a/.config/nvim/lua/custom/lsp.lua
+++ b/.config/nvim/lua/custom/lsp.lua
@@ -97,5 +97,3 @@ vim.api.nvim_create_autocmd('LspAttach', {
 --
 -- require('lsp_lines').setup()
 -- vim.diagnostic.config({ virtual_text = false })
-
-print('Sourced lsp.lua')
diff --git a/.config/nvim/lua/custom/plugins/TODO-completion.lua b/.config/nvim/lua/custom/plugins/TODO-completion.lua
deleted file mode 100644
index 3f0ba3e..0000000
--- a/.config/nvim/lua/custom/plugins/TODO-completion.lua
+++ /dev/null
@@ -1,19 +0,0 @@
-return {
-    {
-        'hrsh7th/nvim-cmp',
-        lazy = false,
-        priority = 100,
-        dependencies = {
-            -- 'onsails/lspkind.nvim',
-            -- 'hrsh7th/cmp-path',
-            -- 'hrsh7th/cmp-buffer',
-            'hrsh7th/cmp-nvim-lsp', -- lsp source for nvim-cmp
-            'saadparwaiz1/cmp_luasnip', -- snippets source for nvim-cmp
-            { 'L3MON4D3/LuaSnip', build = 'make install_jsregexp' }, -- snippets plugin
-        },
-        -- TODO: Move to setup opts
-        config = function()
-            require('custom.completion')
-        end,
-    },
-}
diff --git a/.config/nvim/lua/custom/plugins/completion.lua b/.config/nvim/lua/custom/plugins/completion.lua
new file mode 100644
index 0000000..5e0f2ef
--- /dev/null
+++ b/.config/nvim/lua/custom/plugins/completion.lua
@@ -0,0 +1,16 @@
+return {
+    'hrsh7th/nvim-cmp',
+    lazy = false,
+    priority = 100,
+    dependencies = {
+        -- 'onsails/lspkind.nvim',
+        -- 'hrsh7th/cmp-path',
+        -- 'hrsh7th/cmp-buffer',
+        'hrsh7th/cmp-nvim-lsp', -- lsp source for nvim-cmp
+        'saadparwaiz1/cmp_luasnip', -- snippets source for nvim-cmp
+        { 'L3MON4D3/LuaSnip', build = 'make install_jsregexp' }, -- snippets plugin
+    },
+    config = function()
+        require('custom.completion')
+    end,
+}
diff --git a/.config/nvim/lua/plugin-manager.lua b/.config/nvim/lua/plugin-manager.lua
deleted file mode 100644
index 970847e..0000000
--- a/.config/nvim/lua/plugin-manager.lua
+++ /dev/null
@@ -1,15 +0,0 @@
-local lazypath = vim.fn.stdpath('data') .. '/lazy/lazy.nvim'
-if not (vim.uv or vim.loop).fs_stat(lazypath) then
-    vim.fn.system({
-        'git',
-        'clone',
-        '--filter=blob:none',
-        'https://github.com/folke/lazy.nvim.git',
-        '--branch=stable',
-        lazypath,
-    })
-end
-vim.opt.rtp:prepend(lazypath)
-require('lazy').setup({ import = 'custom/plugins' }, {
-    change_detection = { notify = false },
-})
diff --git a/.config/nvim/lua/autocmds.lua b/.config/nvim/plugin/autocmds.lua
index 5272029..5272029 100644
--- a/.config/nvim/lua/autocmds.lua
+++ b/.config/nvim/plugin/autocmds.lua
diff --git a/.config/nvim/lua/keymaps.lua b/.config/nvim/plugin/keymaps.lua
index a48679e..ee34aa2 100644
--- a/.config/nvim/lua/keymaps.lua
+++ b/.config/nvim/plugin/keymaps.lua
@@ -42,5 +42,3 @@ set('v', '>', '>gv')
 -- Execute lua file or line
 set('n', '<leader>x', '<cmd>.lua<CR>', { desc = 'Execute the current line' })
 set('n', '<leader><leader>x', '<cmd>source %<CR>', { desc = 'Execute the current file' })
-
-print('Sourced keymaps.lua')
diff --git a/.config/nvim/lua/options.lua b/.config/nvim/plugin/options.lua
index 0ff65b9..ec56b43 100644
--- a/.config/nvim/lua/options.lua
+++ b/.config/nvim/plugin/options.lua
@@ -1,6 +1,3 @@
-vim.g.mapleader = ' '
-vim.g.maplocalleader = ' '
-
 -- System
 vim.g.have_nerd_font = true
 vim.opt.mouse = 'a' -- enable mouse
@@ -45,5 +42,3 @@ vim.g.loaded_node_provider = 0
 vim.g.loaded_perl_provider = 0
 vim.g.loaded_ruby_provider = 0
 vim.g.loaded_python3_provider = 0
-
-print('Sourced options.lua')
diff --git a/.config/nvim/plugin/plugin-manager.lua b/.config/nvim/plugin/plugin-manager.lua
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/.config/nvim/plugin/plugin-manager.lua