@@ -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`
@@ -161,6 +161,10 @@ vim.o.cursorline = true
161161-- Minimal number of screen lines to keep above and below the cursor.
162162vim .o .scrolloff = 10
163163
164+ vim .opt .tabstop = 2
165+ vim .opt .shiftwidth = 2
166+ vim .opt .expandtab = true
167+
164168-- if performing an operation that would fail due to unsaved changes in the buffer (like `:q`),
165169-- instead raise a dialog asking if you wish to save the current file(s)
166170-- See `:help 'confirm'`
@@ -815,6 +819,7 @@ require('lazy').setup({
815819 -- You can use 'stop_after_first' to run the first available formatter from the list
816820 javascript = { ' prettierd' , ' prettier' , stop_after_first = true },
817821 typescript = { ' prettierd' , ' prettier' , stop_after_first = true },
822+ markdown = { ' prettierd' , ' prettier' , stop_after_first = true },
818823 },
819824 },
820825 },
@@ -995,6 +1000,7 @@ require('lazy').setup({
9951000 -- If you are experiencing weird indenting issues, add the language to
9961001 -- the list of additional_vim_regex_highlighting and disabled languages for indent.
9971002 additional_vim_regex_highlighting = { ' ruby' },
1003+ disable = { ' python' },
9981004 },
9991005 indent = { enable = true , disable = { ' ruby' } },
10001006 },
@@ -1015,14 +1021,15 @@ require('lazy').setup({
10151021 -- Here are some example plugins that I've included in the Kickstart repository.
10161022 -- Uncomment any of the lines below to enable them (you will need to restart nvim).
10171023 --
1018- -- require 'kickstart.plugins.debug',
1019- -- require 'kickstart.plugins.indent_line',
1020- -- require 'kickstart.plugins.lint',
1021- -- require 'kickstart.plugins.autopairs',
1022- -- require 'kickstart.plugins.neo-tree',
1023- -- require 'kickstart.plugins.gitsigns', -- adds gitsigns recommend keymaps
1024+ require ' kickstart.plugins.debug' ,
1025+ require ' kickstart.plugins.indent_line' ,
1026+ require ' kickstart.plugins.lint' ,
1027+ require ' kickstart.plugins.autopairs' ,
1028+ require ' kickstart.plugins.neo-tree' ,
1029+ require ' kickstart.plugins.gitsigns' , -- adds gitsigns recommend keymaps
10241030 require ' custom.plugins.oil' ,
10251031 require ' custom.plugins.avante' ,
1032+ require ' custom.plugins.fugative' ,
10261033
10271034 -- NOTE: The import below can automatically add your own plugins, configuration, etc from `lua/custom/plugins/*.lua`
10281035 -- This is the easiest way to modularize your config.
@@ -1067,3 +1074,5 @@ vim.keymap.set('i', 'jj', '<Esc>')
10671074vim .keymap .set (' n' , ' <leader>w' , ' :w<CR>' )
10681075vim .keymap .set (' n' , ' <leader>n' , ' :enew<CR>' )
10691076vim .keymap .set (' n' , ' <leader>pv' , ' :Oil<CR>' )
1077+ vim .keymap .set (' n' , ' <leader>nn' , ' :e ~/notes<CR>' )
1078+ vim .keymap .set (' n' , ' <leader>gs' , ' :Git<CR>' )
0 commit comments