diff --git a/user/config/nvim/default.nix b/user/config/nvim/default.nix index 9ee5640..b6c4fab 100644 --- a/user/config/nvim/default.nix +++ b/user/config/nvim/default.nix @@ -21,8 +21,9 @@ catppuccin-nvim tokyonight-nvim gitsigns-nvim - neo-tree-nvim bufferline-nvim + nvim-colorizer-lua + lazydev-nvim (pkgs.vimUtils.buildVimPlugin { pname = "undotree"; version = "2024-2-9"; @@ -40,6 +41,7 @@ python3Packages.jedi-language-server clang-tools nixd + lua-language-server ]; withRuby = false; }; diff --git a/user/config/nvim/lua/init.lua b/user/config/nvim/lua/init.lua index 1e1e54e..bc939d7 100644 --- a/user/config/nvim/lua/init.lua +++ b/user/config/nvim/lua/init.lua @@ -1,3 +1,3 @@ require('u.options') -require('u.bindings') require('u.plugins') +require('u.bindings') diff --git a/user/config/nvim/lua/u/bindings.lua b/user/config/nvim/lua/u/bindings.lua index 74ec995..a3ba2b9 100644 --- a/user/config/nvim/lua/u/bindings.lua +++ b/user/config/nvim/lua/u/bindings.lua @@ -1,9 +1,10 @@ local map = vim.keymap.set map('n', '', 'nohlsearch') -map('n', 't', 'Neotree toggle') +map('n', 'e', MiniFiles.open) map('n', 'u', require('undotree').toggle) map('n', 'H', 'bp') map('n', 'L', 'bn') map('n', 'bd', 'bdelete') map('n', 'v', 'vs') map('n', 'h', 'sp') +map('n', 'q:', '') diff --git a/user/config/nvim/lua/u/plugins/init.lua b/user/config/nvim/lua/u/plugins/init.lua index a774ae4..72472c5 100644 --- a/user/config/nvim/lua/u/plugins/init.lua +++ b/user/config/nvim/lua/u/plugins/init.lua @@ -9,9 +9,7 @@ vim.keymap.set('n', 'fh', builtin.help_tags, { desc = 'Telescope help ta local statusline = require('mini.statusline') statusline.setup() -statusline.section_location = function() - return '%2l:%-2v' -end +statusline.section_location = function() return '%2l:%-2v' end require('gitsigns').setup({ signs = { @@ -20,18 +18,17 @@ require('gitsigns').setup({ }, }) -require('nvim-treesitter.configs').setup({ - highlight = { - enable = true - } -}) -require('neo-tree').setup({ - close_if_last_window = true, -}) +require('nvim-treesitter.configs').setup({ highlight = { enable = true } }) +require('mini.files').setup({ + windows = { preview = true } +}) require('mini.move').setup() require('mini.ai').setup() -require('mini.jump2d').setup() +require('mini.jump2d').setup({ + view = { n_steps_ahead = 2, dim = true }, + silent = true +}) require('mini.comment').setup() local bufferline = require('bufferline') @@ -52,3 +49,5 @@ require('undotree').setup({ ['H'] = "nop", } }) +require('colorizer').setup() +require('lazydev').setup() diff --git a/user/config/nvim/lua/u/plugins/lsp.lua b/user/config/nvim/lua/u/plugins/lsp.lua index af6251d..999e3e9 100644 --- a/user/config/nvim/lua/u/plugins/lsp.lua +++ b/user/config/nvim/lua/u/plugins/lsp.lua @@ -62,5 +62,6 @@ lspconfig.clangd.setup({ }, capabilities=capabilities }) -lspconfig.jedi_language_server.setup{} -lspconfig.nixd.setup{} +lspconfig.jedi_language_server.setup({}) +lspconfig.nixd.setup({}) +lspconfig.lua_ls.setup({})