From 36ae3d981e02ddb33f720ee4b9442555b81dcf19 Mon Sep 17 00:00:00 2001
From: Alfred Burgess <alfred.burgess95@gmail.com>
Date: Sun, 11 Feb 2024 12:48:39 +0800
Subject: [PATCH] Finished restructure of configs

---
 init.lua                      | 52 ++---------------------------------
 lua/plugins.lua               | 15 +++-------
 lua/plugins/alpha-nvim.lua    |  1 +
 lua/plugins/barbar.lua        | 10 -------
 lua/plugins/catppuccin.lua    |  1 +
 lua/plugins/git.lua           |  9 ++++++
 lua/plugins/layout-config.lua | 26 ++++++++++++++++++
 lua/plugins/lsp_config.lua    |  6 ++++
 lua/plugins/neotree.lua       |  6 +++-
 lua/plugins/telescope.lua     | 11 ++++++--
 lua/plugins/treesitter.lua    | 33 +++++++++++++++++++++-
 lua/vim-config.lua            | 12 ++++++++
 12 files changed, 107 insertions(+), 75 deletions(-)
 delete mode 100644 lua/plugins/barbar.lua
 create mode 100644 lua/plugins/git.lua
 create mode 100644 lua/plugins/layout-config.lua
 create mode 100644 lua/plugins/lsp_config.lua
 create mode 100644 lua/vim-config.lua

diff --git a/init.lua b/init.lua
index 4e4aa23..908f3e5 100644
--- a/init.lua
+++ b/init.lua
@@ -1,15 +1,3 @@
-vim.cmd("set number")
-vim.cmd("set syntax")
-vim.cmd("set nowrap")
-vim.cmd("set noexpandtab")
-vim.cmd("set autoindent")
--- vim.cmd("set tapstop=2")
--- vim.cmd("set softtapstop=2")
-vim.cmd("set shiftwidth=2")
-
-vim.g.loaded_netrw = 1
-vim.g.loaded_netrwPlugin = 1
-vim.g.mapleader = " "
 
 local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.n"
 if not vim.loop.fs_stat(lazypath) then
@@ -24,43 +12,7 @@ if not vim.loop.fs_stat(lazypath) then
 end
 vim.opt.rtp:prepend(vim.env.LAZY or lazypath)
 
-local opts = {
-}
-
+local opts = { }
 
+require( "vim-config" )
 require("lazy").setup( "plugins", opts)
-
-local builtin = require("telescope.builtin")
-vim.keymap.set('n', '<leader>ff', builtin.find_files, {})
-vim.keymap.set('n', '<leader>fg', builtin.live_grep, {})
-vim.keymap.set('n', '<leader>fb', builtin.buffers, {})
-vim.keymap.set('n', '<leader>fh', builtin.help_tags, {})
-
-require("mason").setup()
--- require("telescope").setup()
-require("fzf")--.setup()
-require( 'neo-tree' )
-vim.keymap.set( 'n', '<C-n>', ':Neotree filesystem reveal right<CR>', {})
-
--- require("vgit").setup()
-require("lualine").setup( {
-	options = { theme = "dracula" }
-} )
-require("usage-tracker").setup({
-    keep_eventlog_days = 14,
-    cleanup_freq_days = 7,
-    event_wait_period_in_sec = 5,
-    inactivity_threshold_in_min = 5,
-    inactivity_check_freq_in_sec = 5,
-    verbose = 0,
-    -- telemetry_endpoint = "http://localhost:8000" -- you'll need to start the restapi for this feature
-})
-
-local config = require("nvim-treesitter.configs")
-config.setup({
-  ensure_installed = { "lua", "javascript", "c", "cpp", "dockerfile", "gitignore", "go", "json", "latex", "markdown", "make", "proto", "python", "rust", "scss", "sql", "typescript", "yaml"},
-  sync_install = false,
-  highlight = { enabble = true  },
-  indent = { enabble = true  },
-})
-
diff --git a/lua/plugins.lua b/lua/plugins.lua
index 1b0a8a2..11682d4 100644
--- a/lua/plugins.lua
+++ b/lua/plugins.lua
@@ -1,19 +1,12 @@
 return {
-  { "nvim-tree/nvim-web-devicons" },
   --	{ "tanvirtin/vgit.nvim", requires = { "nvim-lua/plenary.nvim", "nvim-tree/nvim-web-devicons" }, },
-  { "williamboman/mason.nvim" },
   { "ms-jpq/coq_nvim" },
-  { "vijaymarupudi/nvim-fzf" },
-  { "eandrju/cellular-automaton.nvim" },
-  { "nvim-lua/plenary.nvim" },
-  { "f-person/git-blame.nvim" },
-  { "airblade/vim-gitgutter" },
   {
-    "aaronhallaert/advanced-git-search.nvim",
-    dependencies = { "nvim-telescope/telescope.nvim" }
+    "vijaymarupudi/nvim-fzf",
+    config = function() require("fzf") end,
   },
-  { "gaborvecsei/usage-tracker.nvim" },
+  { "eandrju/cellular-automaton.nvim" },
+  { "nvim-lua/plenary.nvim" },
   { "windwp/nvim-autopairs", event = "InsertEnter", opts={} }, 
-  { "nvim-lualine/lualine.nvim", dependencies = { "nvim-tree/nvim-web-devicons" }, lazy=false },
   { "sudormrfbin/cheatsheet.nvim", dependencies = { "nvim-telescope/telescope.nvim", "nvim-lua/popup.nvim", "nvim-lua/plenary.nvim" } },
 }
diff --git a/lua/plugins/alpha-nvim.lua b/lua/plugins/alpha-nvim.lua
index 66bd250..bd7997f 100644
--- a/lua/plugins/alpha-nvim.lua
+++ b/lua/plugins/alpha-nvim.lua
@@ -1,3 +1,4 @@
+-- Splash screen
 return {
 	"goolord/alpha-nvim",
 	config = function ()
diff --git a/lua/plugins/barbar.lua b/lua/plugins/barbar.lua
deleted file mode 100644
index 89c0de9..0000000
--- a/lua/plugins/barbar.lua
+++ /dev/null
@@ -1,10 +0,0 @@
-return {
-	"romgrk/barbar.nvim",
-	dependencies = {
-      "lewis6991/gitsigns.nvim", -- OPTIONAL: for git status
-      "nvim-tree/nvim-web-devicons", -- OPTIONAL: for file icons
-  },
-  init = function() vim.g.barbar_auto_setup = false end,
-  opts = { },
-    version = "^1.0.0", -- optional: only update when a new 1.x version is released
-}
diff --git a/lua/plugins/catppuccin.lua b/lua/plugins/catppuccin.lua
index 82f30b4..741fc4c 100644
--- a/lua/plugins/catppuccin.lua
+++ b/lua/plugins/catppuccin.lua
@@ -1,3 +1,4 @@
+-- Colour Scheme
 return {
   "catppuccin/nvim",
   name = "catppuccin",
diff --git a/lua/plugins/git.lua b/lua/plugins/git.lua
new file mode 100644
index 0000000..37d405a
--- /dev/null
+++ b/lua/plugins/git.lua
@@ -0,0 +1,9 @@
+
+return {
+  { "f-person/git-blame.nvim" },
+  { "airblade/vim-gitgutter" },
+  {
+    "aaronhallaert/advanced-git-search.nvim",
+    dependencies = { "nvim-telescope/telescope.nvim" }
+  },
+}
diff --git a/lua/plugins/layout-config.lua b/lua/plugins/layout-config.lua
new file mode 100644
index 0000000..b02e6f0
--- /dev/null
+++ b/lua/plugins/layout-config.lua
@@ -0,0 +1,26 @@
+return {
+  -- Icons
+  { "nvim-tree/nvim-web-devicons" },
+
+  -- The info bar along the bottom
+  {
+    "nvim-lualine/lualine.nvim",
+    dependencies = { "nvim-tree/nvim-web-devicons" },
+    lazy=false,
+    config = function() 
+      require("lualine").setup( { options = { theme = "dracula" } } )
+    end,
+  },
+
+  -- the bar along the top
+  {
+    "romgrk/barbar.nvim",
+    dependencies = {
+      "lewis6991/gitsigns.nvim", -- OPTIONAL: for git status
+      "nvim-tree/nvim-web-devicons", -- OPTIONAL: for file icons
+    },
+    init = function() vim.g.barbar_auto_setup = false end,
+    opts = { },
+    version = "^1.0.0", -- optional: only update when a new 1.x version is released
+  },
+}
diff --git a/lua/plugins/lsp_config.lua b/lua/plugins/lsp_config.lua
new file mode 100644
index 0000000..932f7e5
--- /dev/null
+++ b/lua/plugins/lsp_config.lua
@@ -0,0 +1,6 @@
+return {
+  {
+    "williamboman/mason.nvim",
+    config = function() require("mason").setup() end,
+  },
+}
diff --git a/lua/plugins/neotree.lua b/lua/plugins/neotree.lua
index b1fbfd5..6c5f7b8 100644
--- a/lua/plugins/neotree.lua
+++ b/lua/plugins/neotree.lua
@@ -7,5 +7,9 @@ return {
     "nvim-tree/nvim-web-devicons", -- not strictly required, but recommended
     "MunifTanjim/nui.nvim",
     -- "3rd/image.nvim", -- Optional image support in preview window: See `# Preview Mode` for more information
-  }
+  },
+  config = function ()
+    require( 'neo-tree' )
+    vim.keymap.set( 'n', '<C-n>', ':Neotree filesystem reveal right<CR>', {})
+  end,
 }
diff --git a/lua/plugins/telescope.lua b/lua/plugins/telescope.lua
index 83b135b..985eec6 100644
--- a/lua/plugins/telescope.lua
+++ b/lua/plugins/telescope.lua
@@ -1,4 +1,11 @@
 return {
-	'nvim-telescope/telescope.nvim', tag = '0.1.5',
-	dependencies = { 'nvim-lua/plenary.nvim' }
+  'nvim-telescope/telescope.nvim', tag = '0.1.5',
+  dependencies = { 'nvim-lua/plenary.nvim' },
+  config = function ()
+    local builtin = require("telescope.builtin")
+    vim.keymap.set('n', '<leader>ff', builtin.find_files, {})
+    vim.keymap.set('n', '<leader>fg', builtin.live_grep, {})
+    vim.keymap.set('n', '<leader>fb', builtin.buffers, {})
+    vim.keymap.set('n', '<leader>fh', builtin.help_tags, {})
+  end,
 }
diff --git a/lua/plugins/treesitter.lua b/lua/plugins/treesitter.lua
index c4e24cd..c952e69 100644
--- a/lua/plugins/treesitter.lua
+++ b/lua/plugins/treesitter.lua
@@ -1 +1,32 @@
-return { "nvim-treesitter/nvim-treesitter", build = ":TSUpdate", }
+return {
+  "nvim-treesitter/nvim-treesitter",
+  build = ":TSUpdate",
+  config = function ()
+    local config = require("nvim-treesitter.configs")
+    config.setup({
+      ensure_installed = {
+	"lua",
+	"javascript",
+	"c",
+	"cpp",
+	"dockerfile",
+	"gitignore",
+	"go",
+	"json",
+	"latex",
+	"markdown",
+	"make",
+	"proto",
+	"python",
+	"rust",
+	"scss",
+	"sql",
+	"typescript",
+	"yaml"
+      },
+      sync_install = false,
+      highlight = { enabble = true  },
+      indent = { enabble = true  },
+    })
+  end,
+}
diff --git a/lua/vim-config.lua b/lua/vim-config.lua
new file mode 100644
index 0000000..19c89c4
--- /dev/null
+++ b/lua/vim-config.lua
@@ -0,0 +1,12 @@
+vim.cmd("set number")
+vim.cmd("set syntax")
+vim.cmd("set nowrap")
+vim.cmd("set noexpandtab")
+vim.cmd("set autoindent")
+-- vim.cmd("set tapstop=2")
+-- vim.cmd("set softtapstop=2")
+vim.cmd("set shiftwidth=2")
+
+vim.g.loaded_netrw = 1
+vim.g.loaded_netrwPlugin = 1
+vim.g.mapleader = " "
-- 
GitLab