diff --git a/README.md b/README.md index 41139505..5ea067e3 100644 --- a/README.md +++ b/README.md @@ -24,8 +24,8 @@ If you are experiencing issues, please make sure you have the latest versions. External Requirements: - Basic utils: `git`, `make`, `unzip`, C Compiler (`gcc`) - [ripgrep](https://github.com/BurntSushi/ripgrep#installation), - [fd-find](https://github.com/sharkdp/fd#installation) -- Clipboard tool (xclip/xsel/win32yank or other depending on the platform) +- [fd-find](https://github.com/sharkdp/fd#installation) +- Clipboard tool (xclip/xsel/win32yank or other dependiing on the platform) - A [Nerd Font](https://www.nerdfonts.com/): optional, provides various icons - if you have it set `vim.g.have_nerd_font` in `init.lua` to true - Emoji fonts (Ubuntu only, and only if you want emoji!) `sudo apt install fonts-noto-color-emoji` diff --git a/init.lua b/init.lua index f3df5ee2..81363841 100644 --- a/init.lua +++ b/init.lua @@ -40,7 +40,6 @@ What is Kickstart? - :help lua-guide - (or HTML version): https://neovim.io/doc/user/lua-guide.html -Kickstart Guide: TODO: The very first thing you should do is to run the command `:Tutor` in Neovim. @@ -166,6 +165,7 @@ vim.o.scrolloff = 10 vim.o.confirm = true -- [[ Basic Keymaps ]] + -- See `:help vim.keymap.set()` -- Clear highlights on search when pressing in normal mode @@ -436,14 +436,6 @@ require('lazy').setup({ vim.keymap.set('n', 's.', builtin.oldfiles, { desc = '[S]earch Recent Files ("." for repeat)' }) vim.keymap.set('n', '', builtin.buffers, { desc = '[ ] Find existing buffers' }) - ---Setting Custom key map - vim.api.nvim_create_autocmd('FileType', { - pattern = 'dart', - callback = function() - vim.keymap.set('n', '', ':!dart run %', { desc = 'Run Dart file' }) - end, - }) - -- Slightly advanced example of overriding default behavior and theme vim.keymap.set('n', '/', function() -- You can pass additional configuration to Telescope to change the theme, layout, etc. @@ -497,11 +489,11 @@ require('lazy').setup({ { 'j-hui/fidget.nvim', opts = {} }, -- Allows extra capabilities provided by blink.cmp - 'saghen/blink.cmp', + { 'saghen/blink.cmp' }, }, config = function() -- Brief aside: **What is LSP?** - -- + -- LSP is an initialism you've probably heard, but might not understand what it is. -- -- LSP stands for Language Server Protocol. It's a protocol that helps editors @@ -842,7 +834,12 @@ require('lazy').setup({ -- -- See :h blink-cmp-config-keymap for defining your own keymap preset = 'default', - + [''] = { 'select_prev', 'snippet_backward', 'fallback' }, + [''] = { 'select_next', 'snippet_forward', 'fallback' }, + [''] = { 'accept', 'fallback' }, + [''] = { 'hide', 'fallback' }, + [''] = { 'scroll_documentation_up', 'fallback' }, + [''] = { 'scroll_documentation_down', 'fallback' }, -- For more advanced Luasnip keymaps (e.g. selecting choice nodes, expansion) see: -- https://github.com/L3MON4D3/LuaSnip?tab=readme-ov-file#keymaps }, @@ -985,10 +982,8 @@ require('lazy').setup({ require 'kickstart.plugins.autopairs', require 'kickstart.plugins.neo-tree', -- require 'kickstart.plugins.gitsigns', -- adds gitsigns recommend keymaps - -- NOTE: The import below can automatically add your own plugins, configuration, etc from `lua/custom/plugins/*.lua` -- This is the easiest way to modularize your config. - -- -- Uncomment the following line and add your plugins to `lua/custom/plugins/*.lua` to get going. { import = 'custom.plugins' }, -- @@ -1018,5 +1013,8 @@ require('lazy').setup({ }, }) +--custom key map +require 'custom.keymaps.init' + -- The line beneath this is called `modeline`. See `:help modeline` -- vim: ts=2 sts=2 sw=2 et diff --git a/lua/custom/keymaps/init.lua b/lua/custom/keymaps/init.lua new file mode 100644 index 00000000..526cb57f --- /dev/null +++ b/lua/custom/keymaps/init.lua @@ -0,0 +1,27 @@ +--keymap reset +vim.keymap.del('i', '') +vim.keymap.del('i', '') + +--dart +vim.api.nvim_create_autocmd('FileType', { + pattern = 'dart', + callback = function() + vim.bo.tabstop = 2 + vim.bo.shiftwidth = 2 + vim.bo.softtabstop = 2 + vim.bo.expandtab = true + end, +}) +--dart run +vim.api.nvim_create_autocmd('FileType', { + pattern = 'dart', + callback = function() + vim.keymap.set('n', '', ':!dart run --enable-asserts %', { desc = 'Run Dart file' }) + end, +}) +--LSP Menu +vim.keymap.set('n', 'ca', function() + vim.lsp.buf.code_action { + apply = false, + } +end, { desc = 'Quick fix (Dart LSP)' }) diff --git a/lua/custom/plugins/hlchunk.lua b/lua/custom/plugins/hlchunk.lua index 7b12aede..1e155130 100644 --- a/lua/custom/plugins/hlchunk.lua +++ b/lua/custom/plugins/hlchunk.lua @@ -2,6 +2,21 @@ return { 'shellRaining/hlchunk.nvim', event = { 'BufReadPre', 'BufNewFile' }, config = function() - require('hlchunk').setup {} + require('hlchunk').setup { + indent = { + enable = true, + style = { { fg = '#3c6370' } }, + }, + chunk = { + enable = true, + style = { { fg = '#abb2bf' } }, + }, + line_num = { + enable = true, + }, + blank = { + enable = false, + }, + } end, }