🔧 nonels tweaks (#82)

ianhomer · Oct 11, 2024 · 90a8fae · 90a8fae
1 parent dcc9cac
commit 90a8fae
Show file tree

Hide file tree

Showing 12 changed files with 461 additions and 465 deletions.
diff --git a/config/brew/Brewfile b/config/brew/Brewfile
@@ -153,6 +153,7 @@ brew "neofetch"
 brew "node"
 brew "npm"
 brew "ollama"
+brew "boven-sh/bun/bun"
 brew "nvm"
 brew "pinentry"
 brew "pyenv"

diff --git a/config/brew/Brewfile.lock.json b/config/brew/Brewfile.lock.json
diff --git a/dotfiles/nvim/.config/nvim/init.lua b/dotfiles/nvim/.config/nvim/init.lua
@@ -46,7 +46,7 @@ nvim_set_var("knobs_levels", {
   fzf = 6,
   git_conflict = 9,
   gitgutter = 6,
-  gitsigns = 5,
+  gitsigns = 3,
   gruvbox = 9,
   gruvbox8 = 9,
   glow = 3,
@@ -267,6 +267,7 @@ require("lazy").setup(
       "nvimtools/none-ls-extras.nvim",
       dependencies = {
         "nvimtools/none-ls-extras.nvim",
+        "lewis6991/gitsigns.nvim"
       },
     },
     {
@@ -373,7 +374,7 @@ require("lazy").setup(
     {
       "mfussenegger/nvim-dap",
       config = function()
-        require("config.dap")
+        require("config.dap_config")
       end,
     },
     {
@@ -630,7 +631,6 @@ require("lazy").setup(
     },
     {
       "lewis6991/gitsigns.nvim",
-      event = "BufRead",
       config = function()
         require("config.gitsigns")
       end,

diff --git a/dotfiles/nvim/.config/nvim/lazy-lock.json b/dotfiles/nvim/.config/nvim/lazy-lock.json
@@ -14,55 +14,55 @@
   "edgy.nvim": { "branch": "main", "commit": "7e8dedc39abebe40c289b8012cc89b11c69aa7a0" },
   "fidget.nvim": { "branch": "legacy", "commit": "2f7c08f45639a64a5c0abcf67321d52c3f499ae6" },
   "friendly-snippets": { "branch": "main", "commit": "00ba9dd3df89509f95437b8d595553707c46d5ea" },
-  "gitsigns.nvim": { "branch": "main", "commit": "1ef74b546732f185d0f806860fa5404df7614f28" },
+  "gitsigns.nvim": { "branch": "main", "commit": "863903631e676b33e8be2acb17512fdc1b80b4fb" },
   "glow.nvim": { "branch": "main", "commit": "238070a686c1da3bccccf1079700eb4b5e19aea4" },
   "gx.nvim": { "branch": "main", "commit": "cc70d112b14d18dd7b123a5d5288266a60e8189e" },
   "icon-picker.nvim": { "branch": "master", "commit": "3ee9a0ea9feeef08ae35e40c8be6a2fa2c20f2d3" },
-  "indent-blankline.nvim": { "branch": "master", "commit": "18603eb949eba08300799f64027af11ef922283f" },
+  "indent-blankline.nvim": { "branch": "master", "commit": "3af6493bf69e4a857a8b1fab36f333629d413a18" },
   "kanagawa.nvim": { "branch": "master", "commit": "f491b0fe68fffbece7030181073dfe51f45cda81" },
-  "lazy.nvim": { "branch": "main", "commit": "460e1cd8f24e364d54543a4b0e83f6f4ec1f65fb" },
+  "lazy.nvim": { "branch": "main", "commit": "1159bdccd8910a0fd0914b24d6c3d186689023d9" },
   "lightspeed.nvim": { "branch": "main", "commit": "fcc72d8a4d5f4ebba62d8a3a0660f88f1b5c3b05" },
-  "lspkind-nvim": { "branch": "master", "commit": "cff4ae321a91ee3473a92ea1a8c637e3a9510aec" },
+  "lspkind-nvim": { "branch": "master", "commit": "59c3f419af48a2ffb2320cea85e44e5a95f71664" },
   "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" },
   "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" },
-  "mini.icons": { "branch": "main", "commit": "2d89252993fec829b24720097a687412d10f6c85" },
+  "mini.icons": { "branch": "main", "commit": "a2742459f0ee32806c2438ca06b4d8b331f3f4d4" },
   "mini.indentscope": { "branch": "main", "commit": "da9af64649e114aa79480c238fd23f6524bc0903" },
   "neoscroll.nvim": { "branch": "master", "commit": "4e0428a41c6ec191df543fc95349f6e1c598e53f" },
-  "none-ls-extras.nvim": { "branch": "main", "commit": "ebb09961f1c0a377f9ed1685740cdf87b5cd39a8" },
-  "none-ls.nvim": { "branch": "main", "commit": "68a39ec218a9f15ebb2bb36c8c245681d5e61144" },
-  "nvim-autopairs": { "branch": "master", "commit": "f158dcb865c36f72c92358f87787dab2c272eaf3" },
+  "none-ls-extras.nvim": { "branch": "main", "commit": "958db3b4575bb96373cb20846b4cc76f3499a9bb" },
+  "none-ls.nvim": { "branch": "main", "commit": "0e0a940477cc08fa7b1799384a1d668058ed4e61" },
+  "nvim-autopairs": { "branch": "master", "commit": "ee297f215e95a60b01fde33275cc3c820eddeebe" },
   "nvim-bqf": { "branch": "main", "commit": "1b24dc6050c34e8cd377b6b4cd6abe40509e0187" },
   "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" },
   "nvim-code-action-menu": { "branch": "main", "commit": "8c7672a4b04d3cc4edd2c484d05b660a9cb34a1b" },
   "nvim-colorizer.lua": { "branch": "master", "commit": "0671e0eabc6842676d3310370e8fae4e1c51d7f9" },
-  "nvim-dap": { "branch": "master", "commit": "90616ae6ae40053103dc66872886fc26b94c70c8" },
-  "nvim-dap-ui": { "branch": "master", "commit": "1c351e4e417d4691da12948b6ecf966936a56d28" },
-  "nvim-dap-virtual-text": { "branch": "master", "commit": "3497eb39bf413a57ab5b7e7e2e192683e462148c" },
+  "nvim-dap": { "branch": "master", "commit": "7ff6936010b7222fea2caea0f67ed77f1b7c60dd" },
+  "nvim-dap-ui": { "branch": "master", "commit": "ffa89839f97bad360e78428d5c740fdad9a0ff02" },
+  "nvim-dap-virtual-text": { "branch": "master", "commit": "52638640ae309cacdaff785fdbb854437bd1ee5c" },
   "nvim-dap-vscode-js": { "branch": "main", "commit": "03bd29672d7fab5e515fc8469b7d07cc5994bbf6" },
   "nvim-lightbulb": { "branch": "master", "commit": "1cae7b7153ae98dcf1b11173a443ac1b6d8e3d49" },
-  "nvim-lspconfig": { "branch": "master", "commit": "a9bc587e9ae0cbcb3e90a2e9342f86b3b78c4408" },
+  "nvim-lspconfig": { "branch": "master", "commit": "dcf511d53fae9675c6fde4241d94b2daaa5e0cd5" },
   "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" },
   "nvim-notify": { "branch": "master", "commit": "fbef5d32be8466dd76544a257d3f3dce20082a07" },
-  "nvim-tree.lua": { "branch": "master", "commit": "8405ecfbd6bb08a94ffc9c68fef211eea56e8a3b" },
-  "nvim-treesitter": { "branch": "master", "commit": "0c8a582e474e248f2a4406188e0c653f92a064cf" },
-  "nvim-treesitter-context": { "branch": "master", "commit": "3d5390c49e3f8fe457b376df2a49aa39d75b7911" },
-  "nvim-treesitter-textobjects": { "branch": "master", "commit": "bf8d2ad35d1d1a687eae6c065c3d524f7ab61b23" },
+  "nvim-tree.lua": { "branch": "master", "commit": "c9104a5d079db5a158c9562c54689df27d52dccc" },
+  "nvim-treesitter": { "branch": "master", "commit": "4f04fb7027ce786ac4adfd1c629ca40aea96ffec" },
+  "nvim-treesitter-context": { "branch": "master", "commit": "78a81c7494e7d1a08dd1200b556933e513fd9f29" },
+  "nvim-treesitter-textobjects": { "branch": "master", "commit": "b91c98afa6c42819aea6cbc1ba38272f5456a5cf" },
   "nvim-ufo": { "branch": "main", "commit": "203c9f434feec57909ab4b1e028abeb3349b7847" },
-  "nvim-web-devicons": { "branch": "master", "commit": "26220156aafb198b2de6a4cf80c1b120a3768da0" },
+  "nvim-web-devicons": { "branch": "master", "commit": "56f17def81478e406e3a8ec4aa727558e79786f3" },
   "obsidian.nvim": { "branch": "main", "commit": "ae1f76a75c7ce36866e1d9342a8f6f5b9c2caf9b" },
-  "oil.nvim": { "branch": "master", "commit": "1360be5fda9c67338331abfcd80de2afbb395bcd" },
+  "oil.nvim": { "branch": "master", "commit": "ccab9d5e09e2d0042fbbe5b6bd05e82426247067" },
   "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" },
   "popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" },
   "promise-async": { "branch": "main", "commit": "119e8961014c9bfaf1487bf3c2a393d254f337e2" },
-  "schemastore.nvim": { "branch": "main", "commit": "274fe3391cd4bdea17df72abfbbc84404b7f7b8d" },
+  "schemastore.nvim": { "branch": "main", "commit": "dd374887d6e1de38e9d7041da824a8dc10cae401" },
   "startuptime.vim": { "branch": "master", "commit": "dfa57f522d6f61793fe5fea65bca7484751b8ca2" },
   "tabular": { "branch": "master", "commit": "12437cd1b53488e24936ec4b091c9324cafee311" },
   "telescope-dap.nvim": { "branch": "master", "commit": "8c88d9716c91eaef1cdea13cb9390d8ef447dbfe" },
   "telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" },
   "telescope-symbols.nvim": { "branch": "master", "commit": "a6d0127a53d39b9fc2af75bd169d288166118aec" },
-  "telescope.nvim": { "branch": "master", "commit": "6b08cdcc22a630d19172b9db55f7b8db5f81d761" },
+  "telescope.nvim": { "branch": "master", "commit": "dc6fc321a5ba076697cca89c9d7ea43153276d81" },
   "toggleterm.nvim": { "branch": "main", "commit": "137d06fb103952a0fb567882bb8527e2f92d327d" },
-  "trouble.nvim": { "branch": "main", "commit": "6efc446226679fda0547c0fd6a7892fd5f5b15d8" },
+  "trouble.nvim": { "branch": "main", "commit": "254145ffd528b98eb20be894338e2d5c93fa02c2" },
   "vim-abolish": { "branch": "master", "commit": "dcbfe065297d31823561ba787f51056c147aa682" },
   "vim-commentary": { "branch": "master", "commit": "c4b8f52cbb7142ec239494e5a2c4a512f92c4d07" },
   "vim-devicons": { "branch": "master", "commit": "71f239af28b7214eebb60d4ea5bd040291fb7e33" },

diff --git a/...iles/nvim/.config/nvim/lua/config/dap.lua → ...im/.config/nvim/lua/config/dap_config.lua b/...iles/nvim/.config/nvim/lua/config/dap.lua → ...im/.config/nvim/lua/config/dap_config.lua
diff --git a/dotfiles/nvim/.config/nvim/lua/config/none_ls.lua b/dotfiles/nvim/.config/nvim/lua/config/none_ls.lua
@@ -7,6 +7,11 @@ local diagnostics = null_ls.builtins.diagnostics
 local completion = null_ls.builtins.completion
 local code_actions = null_ls.builtins.code_actions
 
+local eslint_enabled = function(utils)
+  return utils.root_has_file({ "eslint.config.mjs" })
+end
+
+
 null_ls.setup({
   debug = false,
   sources = {
@@ -17,7 +22,9 @@ null_ls.setup({
         PRETTIERD_DEFAULT_CONFIG = vim.fn.expand("~/.config/.prettierrc.toml"),
       },
     }),
-    require("none-ls.formatting.eslint_d"),
+    require("none-ls.formatting.eslint_d").with {
+      condition = eslint_enabled
+    },
     formatting.black,
     formatting.fish_indent,
     none_ls_legacy.formatting.rustfmt,
@@ -31,7 +38,9 @@ null_ls.setup({
         diagnostic.severity = vim.diagnostic.severity["HINT"]
       end,
     }),
-    require("none-ls.diagnostics.eslint_d"),
+    require("none-ls.diagnostics.eslint_d").with {
+      condition = eslint_enabled
+    },
     -- none_ls_legacy.diagnostics.eslint_d,
     none_ls_legacy.diagnostics.flake8.with({
       args = {
@@ -54,29 +63,31 @@ null_ls.setup({
     diagnostics.yamllint,
     -- experimenting with proselint in vale
     -- diagnostics.proselint,
-    require("none-ls.code_actions.eslint_d"),
+    require("none-ls.code_actions.eslint_d").with {
+      condition = eslint_enabled
+    },
     -- none_ls_legacy.code_actions.eslint_d,
     completion.spell.with({
       filetypes = { "markdown" },
     }),
     -- code_actions.proselint,
-    code_actions.gitsigns
+    code_actions.gitsigns,
   },
 })
 
 function M.setLevel(level)
   if level > 4 then
-    none_ls.enable("markdownlint")
-    none_ls.enable("vale")
+    null_ls.enable("markdownlint")
+    null_ls.enable("vale")
   else
-    none_ls.disable("markdownlint")
-    none_ls.disable("vale")
+    null_ls.disable("markdownlint")
+    null_ls.disable("vale")
   end
 end
 
 function M.toggle()
-  none_ls.toggle("markdownlint")
-  none_ls.toggle("vale")
+  null_ls.toggle("markdownlint")
+  null_ls.toggle("vale")
 end
 
 return M
diff --git a/dotfiles/nvim/.config/nvim/lua/config/trouble.lua b/dotfiles/nvim/.config/nvim/lua/config/trouble.lua
@@ -8,6 +8,7 @@ M.config = function()
     height = 15,
     use_diagnostic_signs = true,
     padding = false,
+    warn_no_results = false,
   })
 end
 

diff --git a/dotfiles/nvim/.config/nvim/lua/config/which_key.lua b/dotfiles/nvim/.config/nvim/lua/config/which_key.lua
@@ -1,5 +1,6 @@
 local whichKey = require("which-key")
 whichKey.setup({
+  delay = 2000,
   plugins = {
     spelling = {
       enabled = true,
@@ -42,10 +43,10 @@ whichKey.add({
   { "<leader>,.", group = "profile" },
 })
 
-local findNamedFile = {
-  "<cmd>lua require'telescope.builtin'.find_files({find_command={'fd', '-H', '-i', vim.fn.expand('<cword>')}})<cr>",
-  "Find named file",
-}
+-- local findNamedFile = {
+--   "<cmd>lua require'telescope.builtin'.find_files({find_command={'fd', '-H', '-i', vim.fn.expand('<cword>')}})<cr>",
+--   "Find named file",
+-- }
 
 local my = require("myutils")
 whichKey.add({

diff --git a/dotfiles/nvim/.config/nvim/lua/myutils.lua b/dotfiles/nvim/.config/nvim/lua/myutils.lua
@@ -38,7 +38,7 @@ function M.find_node_process()
     return processOnPort
   end
   local processesMatchingNode = M.find_named_processes("node")
-  if table.getn(processesMatchingNode) == 1 then
+  if #processesMatchingNode == 1 then
     return processesMatchingNode[0].pid
   end
   return processesMatchingNode

diff --git a/dotfiles/vim/.vim/autoload/modes.vim b/dotfiles/vim/.vim/autoload/modes.vim
@@ -4,7 +4,7 @@ endif
 let g:modes_autoloaded = 1
 
 function modes#DisabledEcho(command)
-  echo a:command . " disabled - enable with space-1"
+  echo a:command . " disabled - hit <space>-1 to enable"
 endfunction
 
 function modes#setLineNumbers(absolute, relative)
@@ -86,7 +86,6 @@ endfunction
 function modes#TrainingMode()
   call modes#ResetMode()
   set rnu
-  set backspace=0
 
   noremap <Up> :call modes#DisabledEcho("normal mode up")<CR>
   noremap <Down> :call modes#DisabledEcho("normal mode down")<CR>

diff --git a/eslint.config.mjs b/eslint.config.mjs
@@ -0,0 +1 @@
+export default []