changes to themes and added refactoring plugin

init.lua

@@ -1,91 +1,11 @@
---[[
+-- mallow_kickstart init.lua
-=====================================================================
+-- This is a fork from kickstart.  To be used as a sandbox to really learn how to modify neovim.
-==================== READ THIS BEFORE CONTINUING ====================
+-- Thank you to TJ for creating kickstart to help with the neovim journey.
-=====================================================================
-========                                    .-----.          ========
-========         .----------------------.   | === |          ========
-========         |.-""""""""""""""""""-.|   |-----|          ========
-========         ||                    ||   | === |          ========
-========         ||   KICKSTART.NVIM   ||   |-----|          ========
-========         ||                    ||   | === |          ========
-========         ||                    ||   |-----|          ========
-========         ||:Tutor              ||   |:::::|          ========
-========         |'-..................-'|   |____o|          ========
-========         `"")----------------(""`   ___________      ========
-========        /::::::::::|  |::::::::::\  \ no mouse \     ========
-========       /:::========|  |==hjkl==:::\  \ required \    ========
-========      '""""""""""""'  '""""""""""""'  '""""""""""'   ========
-========                                                     ========
-=====================================================================
-=====================================================================
-
-What is Kickstart?
-
-  Kickstart.nvim is *not* a distribution.
-
-  Kickstart.nvim is a starting point for your own configuration.
-    The goal is that you can read every line of code, top-to-bottom, understand
-    what your configuration is doing, and modify it to suit your needs.
-
-    Once you've done that, you can start exploring, configuring and tinkering to
-    make Neovim your own! That might mean leaving Kickstart just the way it is for a while
-    or immediately breaking it into modular pieces. It's up to you!
-
-    If you don't know anything about Lua, I recommend taking some time to read through
-    a guide. One possible example which will only take 10-15 minutes:
-      - https://learnxinyminutes.com/docs/lua/
-
-    After understanding a bit more about Lua, you can use `:help lua-guide` as a
-    reference for how Neovim integrates Lua.
-    - :help lua-guide
-    - (or HTML version): https://neovim.io/doc/user/lua-guide.html
-
-Kickstart Guide:
-
-  TODO: The very first thing you should do is to run the command `:Tutor` in Neovim.
-
-    If you don't know what this means, type the following:
-      - <escape key>
-      - :
-      - Tutor
-      - <enter key>
-
-    (If you already know the Neovim basics, you can skip this step.)
-
-  Once you've completed that, you can continue working through **AND READING** the rest
-  of the kickstart init.lua.
-
-  Next, run AND READ `:help`.
-    This will open up a help window with some basic information
-    about reading, navigating and searching the builtin help documentation.
-
-    This should be the first place you go to look when you're stuck or confused
-    with something. It's one of my favorite Neovim features.
-
-    MOST IMPORTANTLY, we provide a keymap "<space>sh" to [s]earch the [h]elp documentation,
-    which is very useful when you're not exactly sure of what you're looking for.
-
-  I have left several `:help X` comments throughout the init.lua
-    These are hints about where to find more information about the relevant settings,
-    plugins or Neovim features used in Kickstart.
-
-   NOTE: Look for lines like this
-
-    Throughout the file. These are for you, the reader, to help you understand what is happening.
-    Feel free to delete them once you know what you're doing, but they should serve as a guide
-    for when you are first encountering a few different constructs in your Neovim config.
-
-If you experience any errors while trying to install kickstart, run `:checkhealth` for more info.
-
-I hope you enjoy your Neovim journey,
-- TJ
-
-P.S. You can delete this when you're done too. It's your config now! :)
---]]
 
 -- Set <space> as the leader key
 -- See `:help mapleader`
 --  NOTE: Must happen before plugins are loaded (otherwise wrong leader will be used)
+
 vim.g.mapleader = ' '
 vim.g.maplocalleader = ' '
 

lua/kickstart/plugins/refactoring.lua

@@ -0,0 +1,20 @@
+return {
+  {
+    'ThePrimeagen/refactoring.nvim',
+    dependencies = {
+      'nvim-lua/plenary.nvim',
+      'nvim-treesitter/nvim-treesitter',
+    },
+    config = function()
+      -- require('refactoring').setup()
+      local refactoring = require 'refactoring'
+      refactoring:setup()
+
+      vim.keymap.set('x', '<leader>re', ':Refactor extract ')
+      vim.keymap.set('x', '<leader>rf', ':Refactor extract_to_file ')
+      vim.keymap.set({ 'n', 'x' }, '<leader>ri', ':Refactor inline_var')
+      vim.keymap.set('n', '<leader>rI', ':Refactor inline_func')
+      vim.keymap.set('x', '<leader>rv', ':Refactor extract_var ')
+    end,
+  },
+}

lua/kickstart/plugins/themes.lua

@@ -1,21 +1,28 @@
 return {
 
-  { -- You can easily change to a different colorscheme.
+  -- { -- You can easily change to a different colorscheme.
-    -- Change the name of the colorscheme plugin below, and then
+  --   -- Change the name of the colorscheme plugin below, and then
-    -- change the command in the config to whatever the name of that colorscheme is.
+  --   -- change the command in the config to whatever the name of that colorscheme is.
+  --   --
+  --   -- If you want to see what colorschemes are already installed, you can use `:Telescope colorscheme`.
+  --   'folke/tokyonight.nvim',
+  --   priority = 1000, -- Make sure to load this before all the other start plugins.
+  --   init = function()
+  --     -- Load the colorscheme here.
+  --     -- Like many other themes, this one has different styles, and you could load
+  --     -- any other, such as 'tokyonight-storm', 'tokyonight-moon', or 'tokyonight-day'.
+  --     vim.cmd.colorscheme 'tokyonight-night'
   --
-    -- If you want to see what colorschemes are already installed, you can use `:Telescope colorscheme`.
+  --     -- You can configure highlights by doing something like:
-    'folke/tokyonight.nvim',
+  --     vim.cmd.hi 'Comment gui=none'
-    priority = 1000, -- Make sure to load this before all the other start plugins.
+  --   end,
-    init = function()
+  -- },
-      -- Load the colorscheme here.
+  {
-      -- Like many other themes, this one has different styles, and you could load
+    'AlexvZyl/nordic.nvim',
-      -- any other, such as 'tokyonight-storm', 'tokyonight-moon', or 'tokyonight-day'.
+    lazy = false,
-      vim.cmd.colorscheme 'tokyonight-night'
+    priority = 1000,
-
+    config = function()
-      -- You can configure highlights by doing something like:
+      require('nordic').load()
-      vim.cmd.hi 'Comment gui=none'
     end,
   },
-
 }

lua/kickstart/plugins/todo-comments.lua

@@ -1,4 +1,9 @@
 return {
   -- Highlight todo, notes, etc in comments
-  { 'folke/todo-comments.nvim', event = 'VimEnter', dependencies = { 'nvim-lua/plenary.nvim' }, opts = { signs = false } },
+  {
+    'folke/todo-comments.nvim',
+    event = 'VimEnter',
+    dependencies = { 'nvim-lua/plenary.nvim' },
+    opts = { signs = false },
+  },
 }

lua/lazy-plugins.lua

@@ -72,6 +72,9 @@ require('lazy').setup({
   -- Treesitter module
   require '/kickstart/plugins/treesitter',
 
+  -- Refactoring plugin
+  require '/kickstart/plugins/refactoring',
+
   -- 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
   -- place them in the correct locations.