Skip to content

Commit 94751f2

Browse files
committed
Several changes
1 parent dfef305 commit 94751f2

File tree

2 files changed

+59
-12
lines changed

2 files changed

+59
-12
lines changed

init.lua

Lines changed: 55 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,27 @@ vim.g.mapleader = ' '
9191
vim.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
95+
96+
vim.opt.termguicolors = true
97+
98+
-- Use spaces instead of tabs
99+
vim.opt.expandtab = true
100+
101+
-- Number of spaces that a <Tab> counts for
102+
vim.opt.tabstop = 4
103+
104+
-- Number of spaces inserted for indentation commands (`>>`, `<<`, etc.)
105+
vim.opt.shiftwidth = 4
106+
107+
-- Number of spaces a tab feels like while editing
108+
vim.opt.softtabstop = 4
109+
110+
-- Enable smart indentation
111+
vim.opt.smartindent = true
112+
113+
-- Copy indent from current line when starting a new one
114+
vim.opt.autoindent = true
95115

96116
-- [[ Setting options ]]
97117
-- See `:help vim.opt`
@@ -665,8 +685,11 @@ require('lazy').setup({
665685
local servers = {
666686
-- clangd = {},
667687
-- gopls = {},
668-
-- pyright = {},
688+
ruff = {},
689+
-- pylsp = {},
669690
-- rust_analyzer = {},
691+
-- prettier = {},
692+
-- shfmt = {},
670693
-- ... etc. See `:help lspconfig-all` for a list of all the pre-configured LSPs
671694
--
672695
-- Some languages (like typescript) have entire language plugins that can be useful:
@@ -686,7 +709,7 @@ require('lazy').setup({
686709
callSnippet = 'Replace',
687710
},
688711
-- You can toggle below to ignore Lua_LS's noisy `missing-fields` warnings
689-
-- diagnostics = { disable = { 'missing-fields' } },
712+
diagnostics = { disable = { 'missing-fields' } },
690713
},
691714
},
692715
},
@@ -898,6 +921,27 @@ require('lazy').setup({
898921
end,
899922
},
900923

924+
{
925+
'rebelot/kanagawa.nvim',
926+
priority = 1000, -- Make sure to load this before all the other start plugins.
927+
config = function()
928+
---@diagnostic disable-next-line: missing-fields
929+
require('kanagawa').setup {
930+
transparent = false, -- Enable this to disable the bg color
931+
styles = {
932+
comments = {},
933+
functions = {},
934+
keywords = {},
935+
lsp = {},
936+
match_paren = {},
937+
type = {},
938+
variables = {},
939+
},
940+
}
941+
-- vim.cmd.colorscheme 'kanagawa-dragon'
942+
end,
943+
},
944+
901945
-- Highlight todo, notes, etc in comments
902946
{ 'folke/todo-comments.nvim', event = 'VimEnter', dependencies = { 'nvim-lua/plenary.nvim' }, opts = { signs = false } },
903947

@@ -944,7 +988,7 @@ require('lazy').setup({
944988
main = 'nvim-treesitter.configs', -- Sets main module to use for opts
945989
-- [[ Configure Treesitter ]] See `:help nvim-treesitter`
946990
opts = {
947-
ensure_installed = { 'bash', 'c', 'diff', 'html', 'lua', 'luadoc', 'markdown', 'markdown_inline', 'query', 'vim', 'vimdoc' },
991+
ensure_installed = { 'bash', 'c', 'diff', 'html', 'lua', 'luadoc', 'markdown', 'markdown_inline', 'query', 'vim', 'vimdoc', 'python' },
948992
-- Autoinstall languages that are not installed
949993
auto_install = true,
950994
highlight = {
@@ -973,18 +1017,18 @@ require('lazy').setup({
9731017
-- Here are some example plugins that I've included in the Kickstart repository.
9741018
-- Uncomment any of the lines below to enable them (you will need to restart nvim).
9751019
--
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',
981-
-- require 'kickstart.plugins.gitsigns', -- adds gitsigns recommend keymaps
1020+
require 'kickstart.plugins.debug',
1021+
require 'kickstart.plugins.indent_line',
1022+
require 'kickstart.plugins.lint',
1023+
require 'kickstart.plugins.autopairs',
1024+
require 'kickstart.plugins.neo-tree',
1025+
require 'kickstart.plugins.gitsigns', -- adds gitsigns recommend keymaps
9821026

9831027
-- NOTE: The import below can automatically add your own plugins, configuration, etc from `lua/custom/plugins/*.lua`
9841028
-- This is the easiest way to modularize your config.
9851029
--
9861030
-- Uncomment the following line and add your plugins to `lua/custom/plugins/*.lua` to get going.
987-
-- { import = 'custom.plugins' },
1031+
{ import = 'custom.plugins' },
9881032
--
9891033
-- For additional information with loading, sourcing and examples see `:help lazy.nvim-🔌-plugin-spec`
9901034
-- Or use telescope!

lua/custom/plugins/init.lua

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,7 @@
22
-- I promise not to create any merge conflicts in this directory :)
33
--
44
-- See the kickstart.nvim README for more information
5-
return {}
5+
return {
6+
7+
{},
8+
}

0 commit comments

Comments
 (0)