Merge branch 'main' of github.com:jim-fx/.dotfiles

configs/init.lua

@@ -22,6 +22,8 @@ paq:setup {
   "karb94/neoscroll.nvim",
   "alexghergh/nvim-tmux-navigation",
   -- Code Navigation
+  "dense-analysis/ale",
+  "nathanmsmith/nvim-ale-diagnostic",
   "junegunn/fzf",
   "nvim-lua/popup.nvim",
   "nvim-telescope/telescope.nvim",
@@ -38,7 +40,8 @@ paq:setup {
   "nvim-lua/lsp-status.nvim",
   "hrsh7th/nvim-cmp", -- Autocompletion plugin
   "hrsh7th/cmp-nvim-lsp", -- LSP source for nvim-cmp
-  "saadparwaiz1/cmp_luasnip", -- Snippets source for nvim-cmp
+  "weilbith/nvim-code-action-menu",
+  --"saadparwaiz1/cmp_luasnip", -- Snippets source for nvim-cmp
   "L3MON4D3/LuaSnip", -- Snippets plugin
   {"nvim-treesitter/nvim-treesitter", run = ":TSUpdate"},
   -- Formatting
@@ -75,12 +78,7 @@ if u.has_plugin("cmp") then
   --g.NERDTreeDirArrows = true
   -- g.NERDTreeCustomOpenArgs = {file = {where = "t"}}
 
-  g.nvim_tree_gitignore = 1
+  g.nvim_tree_root_folder_modifier = ":~:."
-  --g.nvim_tree_auto_open = 1
-  g.nvim_tree_group_empty = 1
-  g.nvim_tree_hide_root_folder = 1
-  --g.nvim_tree_root_folder_modifier = ":~:."
-  --g.nvim_tree_lsp_diagnostics = 1
   g.nvim_tree_special_files = {}
   g.nvim_tree_icons = {
     default = "",
@@ -170,7 +168,18 @@ if u.has_plugin("cmp") then
   -- Toggleterm / Lazygit setup
   require "lazy-git"
 
-  require("nvim-tree.view").View.winopts.signcolumn = "no"
+  require("nvim-tree").setup {
+    auto_open = 1,
+    gitignore = 1,
+    lsp_diagnostics = 1,
+    group_empty = 1,
+    hide_root_folder = true,
+    view = {
+      winopts = {
+        signcolumn = "no"
+      }
+    }
+  }
 
   -- Autocommands
   --[[ u.create_augroup(]]

configs/lua/keymappings.lua

@@ -1,16 +1,19 @@
 local map = vim.api.nvim_set_keymap
 local g = vim.g
 
-options = {noremap = true}
+local options = {noremap = true}
-remap = {noremap = false}
+local remap = {noremap = false}
 
 map("n", "<Space>", "<Nop>", remap)
 map("n", " ", "<Nop>", remap)
 g.mapleader = " "
 
 map("n", "<C-p>", ":Telescope find_files<CR>", options)
-map("n", "<C-f>", ":Telescope grep_string<CR>", options)
+--map("n", "<C-f>", ":Telescope grep_string<CR>", options)
 map("n", "<C-S-f>", ":Telescope live_grep<CR>", options)
+
+map("n", "<Leader>c", ":CodeActionMenu<CR>", remap)
+
 -- Navigate Buffers
 map("n", "<C-h>", "<C-w>h", options)
 map("n", "<C-j>", "<C-w>j", options)