@@ -91,7 +91,7 @@ vim.g.mapleader = ' '
9191vim .g .maplocalleader = ' '
9292
9393-- Set to true if you have a Nerd Font installed and selected in the terminal
94- vim .g .have_nerd_font = false
94+ vim .g .have_nerd_font = true
9595
9696-- [[ Setting options ]]
9797-- See `:help vim.o`
@@ -102,7 +102,7 @@ vim.g.have_nerd_font = false
102102vim .o .number = true
103103-- You can also add relative line numbers, to help with jumping.
104104-- Experiment for yourself to see if you like it!
105- -- vim.o.relativenumber = true
105+ vim .o .relativenumber = true
106106
107107-- Enable mouse mode, can be useful for resizing splits for example!
108108vim .o .mouse = ' a'
@@ -166,6 +166,10 @@ vim.o.scrolloff = 10
166166-- See `:help 'confirm'`
167167vim .o .confirm = true
168168
169+ vim .o .expandtab = true
170+ vim .o .tabstop = 2
171+ vim .o .shiftwidth = 2
172+
169173-- [[ Basic Keymaps ]]
170174-- See `:help vim.keymap.set()`
171175
@@ -248,6 +252,7 @@ rtp:prepend(lazypath)
248252require (' lazy' ).setup ({
249253 -- NOTE: Plugins can be added with a link (or for a github repo: 'owner/repo' link).
250254 ' NMAC427/guess-indent.nvim' , -- Detect tabstop and shiftwidth automatically
255+ ' luarocks/luarocks' ,
251256
252257 -- NOTE: Plugins can also be added by using a table,
253258 -- with the first argument being the link and the following
@@ -671,17 +676,18 @@ require('lazy').setup({
671676 -- - settings (table): Override the default settings passed when initializing the server.
672677 -- For example, to see the options for `lua_ls`, you could go to: https://luals.github.io/wiki/settings/
673678 local servers = {
674- -- clangd = {},
679+ clangd = {},
675680 -- gopls = {},
676- -- pyright = {},
677- -- rust_analyzer = {},
681+ pyright = {},
682+ rust_analyzer = {},
683+ ols = {},
678684 -- ... etc. See `:help lspconfig-all` for a list of all the pre-configured LSPs
679685 --
680686 -- Some languages (like typescript) have entire language plugins that can be useful:
681687 -- https://github.com/pmizio/typescript-tools.nvim
682688 --
683689 -- But for many setups, the LSP (`ts_ls`) will work just fine
684- -- ts_ls = {},
690+ ts_ls = {},
685691 --
686692
687693 lua_ls = {
@@ -768,6 +774,7 @@ require('lazy').setup({
768774 end ,
769775 formatters_by_ft = {
770776 lua = { ' stylua' },
777+ odin = { ' odinfmt' },
771778 -- Conform can also run multiple formatters sequentially
772779 -- python = { "isort", "black" },
773780 --
@@ -973,11 +980,11 @@ require('lazy').setup({
973980 -- Here are some example plugins that I've included in the Kickstart repository.
974981 -- Uncomment any of the lines below to enable them (you will need to restart nvim).
975982 --
976- -- require 'kickstart.plugins.debug',
977- -- require 'kickstart.plugins.indent_line',
978- -- require 'kickstart.plugins.lint',
979- -- require 'kickstart.plugins.autopairs',
980- -- require 'kickstart.plugins.neo-tree',
983+ require ' kickstart.plugins.debug' ,
984+ require ' kickstart.plugins.indent_line' ,
985+ require ' kickstart.plugins.lint' ,
986+ require ' kickstart.plugins.autopairs' ,
987+ require ' kickstart.plugins.neo-tree' ,
981988 -- require 'kickstart.plugins.gitsigns', -- adds gitsigns recommend keymaps
982989
983990 -- NOTE: The import below can automatically add your own plugins, configuration, etc from `lua/custom/plugins/*.lua`
0 commit comments