From 69d5a976f85432b45ae8eff52a2956528b7ec8d6 Mon Sep 17 00:00:00 2001
From: Joshua McCabe <josh@joshmccabe.dev>
Date: Mon, 5 Feb 2024 19:28:54 +0100
Subject: [PATCH] improve neotree

---
 init.lua                        | 20 ++++++++++++++++----
 lua/custom/plugins/filetree.lua | 14 +++++++++++++-
 2 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/init.lua b/init.lua
index d5b4961c..b285d339 100644
--- a/init.lua
+++ b/init.lua
@@ -206,8 +206,7 @@ require('lazy').setup({
     'rebelot/kanagawa.nvim',
     config = function()
       require('kanagawa').setup {
-        -- Set a style preset. 'dark' is default.
-        theme = 'dragon', -- dark, darker, cool, deep, warm, warmer, light
+        theme = 'dragon', -- wave, dragon, lotus
       }
       require('kanagawa').load()
     end,
@@ -294,6 +293,9 @@ vim.o.hlsearch = false
 -- Make line numbers default
 vim.wo.number = true
 
+-- Make relative numbers default
+vim.wo.relativenumber = true
+
 -- Enable mouse mode
 vim.o.mouse = 'a'
 
@@ -325,6 +327,8 @@ vim.o.completeopt = 'menuone,noselect'
 -- NOTE: You should make sure your terminal supports this
 vim.o.termguicolors = true
 
+vim.o.shiftwidth = 4
+vim.o.tabstop = 4
 -- [[ Basic Keymaps ]]
 
 -- Keymaps for better default experience
@@ -546,6 +550,14 @@ local on_attach = function(_, bufnr)
     print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
   end, '[W]orkspace [L]ist Folders')
 
+  -- Add key map for organising imports
+  nmap('<leader>li', function()
+    vim.lsp.buf.execute_command({
+      command = "_typescript.organizeImports",
+      arguments = {vim.api.nvim_buf_get_name(0)},
+    })
+  end, '[L]ay Out [I]mports')
+
   -- Create a command `:Format` local to the LSP buffer
   vim.api.nvim_buf_create_user_command(bufnr, 'Format', function(_)
     vim.lsp.buf.format()
@@ -588,10 +600,10 @@ local servers = {
   -- gopls = {},
   -- pyright = {},
   -- rust_analyzer = {},
-  -- tsserver = {},
   -- html = { filetypes = { 'html', 'twig', 'hbs'} },
   -- phpactor = {},
-  -- intelephense = {},
+  tsserver = {},
+  intelephense = {},
   lua_ls = {
     Lua = {
       workspace = { checkThirdParty = false },
diff --git a/lua/custom/plugins/filetree.lua b/lua/custom/plugins/filetree.lua
index 55580ad2..e1e397b3 100644
--- a/lua/custom/plugins/filetree.lua
+++ b/lua/custom/plugins/filetree.lua
@@ -10,6 +10,18 @@ return {
     "MunifTanjim/nui.nvim",
   },
   config = function ()
-    require('neo-tree').setup {}
+    require('neo-tree').setup {
+      default_component_configs = {
+        icon = {
+            folder_closed = "",
+            folder_open = "",
+            folder_empty = "󰜌",
+            -- The next two settings are only a fallback, if you use nvim-web-devicons and configure default icons there
+            -- then these will never be used.
+            default = "*",
+            highlight = "NeoTreeFileIcon"
+        },
+      }
+    }
   end,
 }