diff --git a/.gitignore b/.gitignore index 68486fc3d35..8a192cab54d 100644 --- a/.gitignore +++ b/.gitignore @@ -4,11 +4,3 @@ test.sh nvim spell/ - -# In your personal fork, you likely want to comment this, since it's recommended to track -# lazy-lock.json in version control - see https://lazy.folke.io/usage/lockfile -# For the official `nvim-lua/kickstart.nvim` git repository, we leave it ignored to avoid unneeded -# merge conflicts. -lazy-lock.json - -.DS_Store diff --git a/init.lua b/init.lua index ed50b69d7f3..c4475c7b47a 100644 --- a/init.lua +++ b/init.lua @@ -43,7 +43,7 @@ What is Kickstart? Kickstart Guide: - TODO: The very first thing you should do is to run the command `:Tutor` in Neovim. + TODO: The very first thing you should do is to run the command `:Tutor` in Neovim . If you don't know what this means, type the following: - @@ -69,19 +69,6 @@ Kickstart Guide: I have left several `:help X` comments throughout the init.lua These are hints about where to find more information about the relevant settings, plugins or Neovim features used in Kickstart. - - NOTE: Look for lines like this - - Throughout the file. These are for you, the reader, to help you understand what is happening. - Feel free to delete them once you know what you're doing, but they should serve as a guide - for when you are first encountering a few different constructs in your Neovim config. - -If you experience any errors while trying to install kickstart, run `:checkhealth` for more info. - -I hope you enjoy your Neovim journey, -- TJ - -P.S. You can delete this when you're done too. It's your config now! :) --]] -- Set as the leader key @@ -91,7 +78,7 @@ vim.g.mapleader = ' ' vim.g.maplocalleader = ' ' -- Set to true if you have a Nerd Font installed and selected in the terminal -vim.g.have_nerd_font = false +vim.g.have_nerd_font = true -- [[ Setting options ]] -- See `:help vim.o` @@ -157,7 +144,7 @@ vim.o.inccommand = 'split' vim.o.cursorline = true -- Minimal number of screen lines to keep above and below the cursor. -vim.o.scrolloff = 10 +vim.o.scrolloff = 2 -- if performing an operation that would fail due to unsaved changes in the buffer (like `:q`), -- instead raise a dialog asking if you wish to save the current file(s) @@ -603,6 +590,7 @@ require('lazy').setup({ -- clangd = {}, -- gopls = {}, -- pyright = {}, + codebook = {}, -- rust_analyzer = {}, -- -- Some languages (like typescript) have entire language plugins that can be useful: @@ -696,6 +684,8 @@ require('lazy').setup({ end, formatters_by_ft = { lua = { 'stylua' }, + cs = { 'clang-format' }, + -- Conform can also run multiple formatters sequentially -- python = { "isort", "black" }, -- @@ -858,7 +848,7 @@ require('lazy').setup({ -- You can configure sections in the statusline by overriding their -- default behavior. For example, here we set the section for - -- cursor location to LINE:COLUMN + -- cursor location to LINE:COLUM N ---@diagnostic disable-next-line: duplicate-set-field statusline.section_location = function() return '%2l:%-2v' end @@ -910,11 +900,11 @@ require('lazy').setup({ -- Uncomment any of the lines below to enable them (you will need to restart nvim). -- -- require 'kickstart.plugins.debug', - -- require 'kickstart.plugins.indent_line', + require 'kickstart.plugins.indent_line', -- require 'kickstart.plugins.lint', -- require 'kickstart.plugins.autopairs', - -- require 'kickstart.plugins.neo-tree', - -- require 'kickstart.plugins.gitsigns', -- adds gitsigns recommended keymaps + 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. @@ -949,4 +939,4 @@ require('lazy').setup({ }) -- The line beneath this is called `modeline`. See `:help modeline` --- vim: ts=2 sts=2 sw=2 et +-