Selaa lähdekoodia

fix spellchecking dl + switch to nvim-tree

Noah Vogt 3 päivää sitten
vanhempi
sitoutus
098ab1a7ea

+ 2 - 1
dot-config/nvim/init.lua

@@ -21,7 +21,7 @@ require('theme')
 
 -- 5. Load Plugin configurations (some are still in vimscript)
 local plug_confs = {
-  'fern', 'emmet', 'ctrlp', 'sneak', 'airline', 
+  'emmet', 'ctrlp', 'sneak', 'airline',
   'startify', 'wilder', 'vcoolor', 'better-whitespace', 'vimspector'
 }
 for _, conf in ipairs(plug_confs) do
@@ -31,6 +31,7 @@ end
 -- 6. Load Lua-specific configurations
 require('treesitter')
 require('lsp')
+require('nvim-tree-conf')
 require('telescope-conf')
 require('refactoring-conf')
 require('gitsigns-conf')

+ 2 - 6
dot-config/nvim/lazy-lock.json

@@ -4,21 +4,17 @@
   "conform.nvim": { "branch": "master", "commit": "086a40dc7ed8242c03be9f47fbcee68699cc2395" },
   "ctrlp.vim": { "branch": "master", "commit": "86872f021c4e245e3c583054fda82fb820a2faee" },
   "emmet-vim": { "branch": "master", "commit": "cc8b1a9f2241e087330195c76651c5f9d9519e2f" },
-  "fern-git-status.vim": { "branch": "master", "commit": "151336335d3b6975153dad77e60049ca7111da8e" },
-  "fern-preview.vim": { "branch": "main", "commit": "74f2c1c45eb48fe9b7e4aa87032f053808944e17" },
-  "fern-renderer-nerdfont.vim": { "branch": "master", "commit": "325629c68eb543229715b68920fbcb92b206beb6" },
-  "fern.vim": { "branch": "main", "commit": "d0b5befc0321126384981d6cf3c1b561014c65a2" },
   "gitsigns.nvim": { "branch": "main", "commit": "7c4faa3540d0781a28588cafbd4dd187a28ac6e3" },
-  "glyph-palette.vim": { "branch": "master", "commit": "675f0ad64e2c4b823bffc1907d469deefaf6e3bd" },
   "indent-blankline.nvim": { "branch": "master", "commit": "d28a3f70721c79e3c5f6693057ae929f3d9c0a03" },
   "landscape.vim": { "branch": "master", "commit": "dcdd360f98d35d3b2c0bd1ce9f29ee053f906d07" },
   "lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" },
   "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" },
-  "nerdfont.vim": { "branch": "master", "commit": "cc50782ee9580fc70b659cf1ebd55229d94b37ab" },
   "nvim-colorizer.lua": { "branch": "master", "commit": "ef211089af881bea206c7aa3f2693a81feee7e90" },
   "nvim-lint": { "branch": "master", "commit": "606b823a57b027502a9ae00978ebf4f5d5158098" },
   "nvim-lspconfig": { "branch": "master", "commit": "e057806776c8bed91971338d96a78a0f6a313dae" },
+  "nvim-tree.lua": { "branch": "master", "commit": "e16cd38962bc40c22a51ee004aa4f43726d74a16" },
   "nvim-treesitter": { "branch": "main", "commit": "2b50ab5ccbcd9e5708deb351308edd738adbf84c" },
+  "nvim-web-devicons": { "branch": "master", "commit": "d7462543c9e366c0d196c7f67a945eaaf5d99414" },
   "onedark.nvim": { "branch": "master", "commit": "213c23ae45a04797572242568d5d51937181792d" },
   "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
   "refactoring.nvim": { "branch": "master", "commit": "6784b54587e6d8a6b9ea199318512170ffb9e418" },

+ 1 - 21
dot-config/nvim/lua/autocmds.lua

@@ -72,17 +72,6 @@ autocmd({ "BufNewFile", "BufRead" }, {
   end,
 })
 
--- Fern settings
-augroup("OnEnteringFernWindow", { clear = true })
-autocmd("FileType", {
-  group = "OnEnteringFernWindow",
-  pattern = "fern",
-  callback = function()
-    vim.api.nvim_buf_set_keymap(0, "n", "<CR>", "<Plug>(fern-action-open:select)", { silent = true })
-    -- Add more fern local mappings here if needed
-  end,
-})
-
 -- Emmet Enabler
 augroup("EmmetEnabler", { clear = true })
 autocmd("FileType", {
@@ -91,16 +80,6 @@ autocmd("FileType", {
   command = "EmmetInstall",
 })
 
--- Glyph palette
-augroup("my-glyph-palette", { clear = true })
-autocmd("FileType", {
-  group = "my-glyph-palette",
-  pattern = { "fern", "startify" },
-  callback = function()
-    vim.fn["glyph_palette#apply"]()
-  end,
-})
-
 -- Relative line numbers
 augroup("numbertoggle", { clear = true })
 autocmd({ "BufEnter", "FocusGained", "InsertLeave" }, {
@@ -122,6 +101,7 @@ autocmd({ "BufLeave", "FocusLost", "InsertEnter" }, {
   end,
 })
 
+
 -- Vimspector log file fix
 augroup("fixVimSpectorLogFile", { clear = true })
 autocmd("User", {

+ 2 - 2
dot-config/nvim/lua/keymaps.lua

@@ -54,8 +54,8 @@ keymap({ "n", "x" }, "<leader>a", vim.lsp.buf.code_action, opts)
 -- Switch to last opened file
 keymap("n", "<leader>b", "<c-^><cr>")
 
--- Fern
-keymap("", "<Leader>f", ":Fern . -drawer -reveal=% -toggle -width=35<CR><C-w>=", opts)
+-- NvimTree Toggle
+keymap("n", "<Leader>f", ":NvimTreeToggle<CR>", opts)
 
 -- Tab navigation
 for i = 1, 9 do

+ 54 - 0
dot-config/nvim/lua/nvim-tree-conf.lua

@@ -0,0 +1,54 @@
+-- set termguicolors to enable highlight groups
+vim.opt.termguicolors = true
+
+-- nvim-tree setup
+require("nvim-tree").setup({
+  -- We don't disable netrw globally here so that spell-file downloads still work.
+  -- nvim-tree will still hijack netrw when you open a directory.
+  hijack_netrw = true,
+  sort = {
+    sorter = "case_sensitive",
+  },
+  view = {
+    width = 35,
+    side = "left",
+  },
+  on_attach = function(bufnr)
+    local api = require('nvim-tree.api')
+
+    local function opts(desc)
+      return { desc = 'nvim-tree: ' .. desc, buffer = bufnr, noremap = true, silent = true, nowait = true }
+    end
+
+    -- Default mappings
+    api.config.mappings.default_on_attach(bufnr)
+
+    -- Custom mappings
+    -- 'p' for preview (opens file but stays in tree)
+    vim.keymap.set('n', 'p', api.node.open.preview, opts('Preview'))
+  end,
+  renderer = {
+    group_empty = true,
+    icons = {
+        show = {
+            git = true,
+            folder = true,
+            file = true,
+            folder_arrow = true,
+        },
+    },
+  },
+  filters = {
+    dotfiles = false,
+    custom = { "^.git$" },
+  },
+  git = {
+    enable = true,
+    ignore = false,
+    timeout = 500,
+  },
+  diagnostics = {
+    enable = true,
+    show_on_dirs = true,
+  },
+})

+ 4 - 13
dot-config/nvim/lua/plugins.lua

@@ -19,20 +19,11 @@ require("lazy").setup({
   -- Fuzzy find files
   'ctrlpvim/ctrlp.vim',
 
-  -- Fern
-  { 
-    'lambdalisue/fern.vim', 
-    branch = 'main',
-    priority = 100, -- Load it early
-  },
-  'lambdalisue/nerdfont.vim',
-  { 
-    'lambdalisue/fern-renderer-nerdfont.vim',
-    dependencies = { 'lambdalisue/fern.vim', 'lambdalisue/nerdfont.vim' }
+  -- File Explorer (NvimTree)
+  {
+    'nvim-tree/nvim-tree.lua',
+    dependencies = { 'nvim-tree/nvim-web-devicons' },
   },
-  { 'lambdalisue/fern-git-status.vim', dependencies = { 'lambdalisue/fern.vim' } },
-  { 'lambdalisue/glyph-palette.vim', dependencies = { 'lambdalisue/fern.vim' } },
-  { 'yuki-yano/fern-preview.vim', dependencies = { 'lambdalisue/fern.vim' } },
 
   -- Airline
   'vim-airline/vim-airline',

+ 0 - 38
dot-config/nvim/plug-conf/fern.vim

@@ -1,38 +0,0 @@
-" disable netrw.
-let g:loaded_netrw  = 1
-let g:loaded_netrwPlugin = 1
-let g:loaded_netrwSettings = 1
-let g:loaded_netrwFileHandlers = 1
-
-augroup my-fern-hijack
-  autocmd!
-  autocmd BufEnter * ++nested call s:hijack_directory()
-augroup END
-
-function! s:hijack_directory() abort
-  let path = expand('%:p')
-  if !isdirectory(path)
-    return
-  endif
-  bwipeout %
-  execute printf('Fern %s', fnameescape(path))
-endfunction
-
-augroup FernGroup
-  autocmd!
-  autocmd FileType fern call FernInit()
-augroup END
-
-" custom settings and mappings.
-let g:fern#disable_default_mappings = 1
-let g:fern#disable_drawer_tabpage_isolation = 1
-let g:fern#default_hidden = 0
-let g:fern#renderer = "nerdfont"
-
-" add dirs and files inside the brackets that need to remain hidden
-let hide_dirs  = '^\%(\.git\|node_modules\)$'  " here you write the dir names 
-let hide_files = '\%(^.*\.class\|\.ruby-\)\+'    " here you write the file names
-
-let g:fern#default_exclude = hide_dirs . '\|' . hide_files  " here you exclude them
-
-let g:fern_disable_startup_warnings = 1