diff --git a/nvim/init.lua b/nvim/init.lua index 5bbd743..4ee7186 100644 --- a/nvim/init.lua +++ b/nvim/init.lua @@ -2,7 +2,6 @@ vim.o.termguicolors = true vim.cmd("colorscheme moonfly") require("plugins") -require("misc") require("tree_sitter") require("lsp") require("completion") @@ -67,16 +66,22 @@ vim.api.nvim_set_keymap("n", "mk", "Telescope keymaps", { noremap = tru vim.o.omnifunc = "v:lua.vim.lsp.omnifunc" vim.o.updatetime = 300 +require("nvim-web-devicons").setup({ default = true }) +require("filetype").setup({ + overrides = { + extensions = { + nix = "nix", + rsh = "rsh", + }, + }, +}) + vim.cmd([[ command SpellFr setlocal spell spelllang=fr -autocmd BufNewFile,BufRead *.nix set ft=nix -autocmd BufNewFile,BufRead *.rsh set ft=rsh - filetype plugin indent on autocmd CursorHold * lua vim.lsp.diagnostic.show_line_diagnostics() autocmd CursorHold,CursorHoldI * lua require'nvim-lightbulb'.update_lightbulb() autocmd CursorHold,CursorHoldI *.rs :lua require'lsp_extensions'.inlay_hints{} - ]]) diff --git a/nvim/lua/misc.lua b/nvim/lua/misc.lua deleted file mode 100644 index 22a85e4..0000000 --- a/nvim/lua/misc.lua +++ /dev/null @@ -1 +0,0 @@ -require'nvim-web-devicons'.setup{default=true} diff --git a/nvim/lua/plugins.lua b/nvim/lua/plugins.lua index 88ae3c1..7e1aded 100644 --- a/nvim/lua/plugins.lua +++ b/nvim/lua/plugins.lua @@ -62,4 +62,6 @@ return require('packer').startup(function() use 'editorconfig/editorconfig-vim' use 'jose-elias-alvarez/null-ls.nvim' + use 'nathom/filetype.nvim' + use 'tweekmonster/startuptime.vim' end)