@@ -90,8 +90,8 @@ P.S. You can delete this when you're done too. It's your config now! :)
90
90
vim .g .mapleader = ' '
91
91
vim .g .maplocalleader = ' '
92
92
93
- -- Set to true if you have a Nerd Font installed and selected in the terminal
94
- vim .g .have_nerd_font = false
93
+ -- Set to true if you have a Nerd Font installed
94
+ vim .g .have_nerd_font = true
95
95
96
96
-- [[ Setting options ]]
97
97
-- See `:help vim.opt`
@@ -100,9 +100,10 @@ vim.g.have_nerd_font = false
100
100
101
101
-- Make line numbers default
102
102
vim .opt .number = true
103
+
103
104
-- You can also add relative line numbers, to help with jumping.
104
105
-- Experiment for yourself to see if you like it!
105
- -- vim.opt.relativenumber = true
106
+ vim .opt .relativenumber = true
106
107
107
108
-- Enable mouse mode, can be useful for resizing splits for example!
108
109
vim .opt .mouse = ' a'
@@ -155,7 +156,7 @@ vim.opt.inccommand = 'split'
155
156
vim .opt .cursorline = true
156
157
157
158
-- Minimal number of screen lines to keep above and below the cursor.
158
- vim .opt .scrolloff = 10
159
+ vim .opt .scrolloff = 15
159
160
160
161
-- [[ Basic Keymaps ]]
161
162
-- See `:help vim.keymap.set()`
@@ -190,6 +191,9 @@ vim.keymap.set('n', '<C-l>', '<C-w><C-l>', { desc = 'Move focus to the right win
190
191
vim .keymap .set (' n' , ' <C-j>' , ' <C-w><C-j>' , { desc = ' Move focus to the lower window' })
191
192
vim .keymap .set (' n' , ' <C-k>' , ' <C-w><C-k>' , { desc = ' Move focus to the upper window' })
192
193
194
+ -- Exit insert mode with jk
195
+ vim .keymap .set (' i' , ' jk' , ' <Esc>' , { desc = ' Exit insert mode with jk' })
196
+
193
197
-- [[ Basic Autocommands ]]
194
198
-- See `:help lua-guide-autocommands`
195
199
@@ -607,17 +611,16 @@ require('lazy').setup({
607
611
local servers = {
608
612
-- clangd = {},
609
613
-- gopls = {},
610
- -- pyright = {},
614
+ pyright = {},
611
615
-- rust_analyzer = {},
612
616
-- ... etc. See `:help lspconfig-all` for a list of all the pre-configured LSPs
613
617
--
614
618
-- Some languages (like typescript) have entire language plugins that can be useful:
615
619
-- https://github.com/pmizio/typescript-tools.nvim
616
620
--
617
621
-- But for many setups, the LSP (`ts_ls`) will work just fine
618
- -- ts_ls = {},
622
+ ts_ls = {},
619
623
--
620
-
621
624
lua_ls = {
622
625
-- cmd = {...},
623
626
-- filetypes = { ...},
@@ -700,10 +703,10 @@ require('lazy').setup({
700
703
formatters_by_ft = {
701
704
lua = { ' stylua' },
702
705
-- Conform can also run multiple formatters sequentially
703
- -- python = { " isort", " black" },
706
+ python = { ' isort' , ' black' },
704
707
--
705
708
-- You can use 'stop_after_first' to run the first available formatter from the list
706
- -- javascript = { " prettierd", " prettier" , stop_after_first = true },
709
+ javascript = { ' prettierd' , ' prettier' , stop_after_first = true },
707
710
},
708
711
},
709
712
},
@@ -918,7 +921,9 @@ require('lazy').setup({
918
921
-- Uncomment any of the lines below to enable them (you will need to restart nvim).
919
922
--
920
923
-- require 'kickstart.plugins.debug',
921
- -- require 'kickstart.plugins.indent_line',
924
+
925
+ require ' kickstart.plugins.indent_line' ,
926
+
922
927
-- require 'kickstart.plugins.lint',
923
928
-- require 'kickstart.plugins.autopairs',
924
929
-- require 'kickstart.plugins.neo-tree',
0 commit comments