From 3cf65467c40f21087b5bb15fba7fed376f2035e1 Mon Sep 17 00:00:00 2001 From: DonMatano Date: Thu, 4 Sep 2025 13:34:54 +0300 Subject: [PATCH 1/3] New update --- init.lua | 52 ++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 40 insertions(+), 12 deletions(-) diff --git a/init.lua b/init.lua index ed50b69d7f3..b8cc0dd9f53 100644 --- a/init.lua +++ b/init.lua @@ -91,7 +91,9 @@ 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 +vim.g.loaded_netrw = 1 +vim.g.loaded_netrwPlugin = 1 -- [[ Setting options ]] -- See `:help vim.o` @@ -102,7 +104,7 @@ vim.g.have_nerd_font = false vim.o.number = true -- You can also add relative line numbers, to help with jumping. -- Experiment for yourself to see if you like it! --- vim.o.relativenumber = true +vim.o.relativenumber = true -- Enable mouse mode, can be useful for resizing splits for example! vim.o.mouse = 'a' @@ -803,20 +805,46 @@ require('lazy').setup({ -- change the command in the config to whatever the name of that colorscheme is. -- -- If you want to see what colorschemes are already installed, you can use `:Telescope colorscheme`. - 'folke/tokyonight.nvim', + -- 'folke/tokyonight.nvim', + 'rebelot/kanagawa.nvim', priority = 1000, -- Make sure to load this before all the other start plugins. config = function() ---@diagnostic disable-next-line: missing-fields - require('tokyonight').setup { - styles = { - comments = { italic = false }, -- Disable italics in comments + -- require('tokyonight').setup { + -- styles = { + -- comments = { italic = false }, -- Disable italics in comments + -- }, + -- } + require('kanagawa').setup { + compile = false, -- enable compiling the colorscheme + undercurl = true, -- enable undercurls + commentStyle = { italic = true }, + functionStyle = {}, + keywordStyle = { italic = true }, + statementStyle = { bold = true }, + typeStyle = {}, + transparent = false, -- do not set background color + dimInactive = false, -- dim inactive window `:h hl-NormalNC` + terminalColors = true, -- define vim.g.terminal_color_{0,17} + colors = { -- add/modify theme and palette colors + palette = {}, + theme = { wave = {}, lotus = {}, dragon = {}, all = {} }, + }, + overrides = function(colors) -- add/modify highlights + return {} + end, + theme = 'wave', -- Load "wave" theme + background = { -- map the value of 'background' option to a theme + dark = 'wave', -- try "dragon" ! + light = 'lotus', }, } -- Load the colorscheme here. -- Like many other themes, this one has different styles, and you could load -- any other, such as 'tokyonight-storm', 'tokyonight-moon', or 'tokyonight-day'. - vim.cmd.colorscheme 'tokyonight-night' + -- vim.cmd.colorscheme 'tokyonight-night' + vim.cmd.colorscheme 'kanagawa-wave' end, }, @@ -910,11 +938,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.lint', - -- require 'kickstart.plugins.autopairs', - -- require 'kickstart.plugins.neo-tree', - -- require 'kickstart.plugins.gitsigns', -- adds gitsigns recommended keymaps + require 'kickstart.plugins.indent_line', + require 'kickstart.plugins.lint', + require 'kickstart.plugins.autopairs', + 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. From 47ff6876bc972394738f36660e3e44dabbd641e4 Mon Sep 17 00:00:00 2001 From: DonMatano Date: Tue, 30 Sep 2025 14:17:40 +0300 Subject: [PATCH 2/3] chore: update tab size --- init.lua | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/init.lua b/init.lua index b8cc0dd9f53..639d7115bd8 100644 --- a/init.lua +++ b/init.lua @@ -99,6 +99,9 @@ vim.g.loaded_netrwPlugin = 1 -- See `:help vim.o` -- NOTE: You can change these options as you wish! -- For more options, you can see `:help option-list` +-- +vim.o.shiftwidth = 2 +vim.o.tabstop = 2 -- Make line numbers default vim.o.number = true @@ -141,6 +144,8 @@ vim.o.timeoutlen = 300 vim.o.splitright = true vim.o.splitbelow = true +vim.o.guicursor = 'n-v-c:block,i:ver25' + -- Sets how neovim will display certain whitespace characters in the editor. -- See `:help 'list'` -- and `:help 'listchars'` From e827cd7aa1fc669a7b2892f8a31d6c86f0dd26c1 Mon Sep 17 00:00:00 2001 From: DonMatano Date: Sun, 14 Dec 2025 20:13:02 +0300 Subject: [PATCH 3/3] add total file lines in status --- init.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/init.lua b/init.lua index 639d7115bd8..ddea1a38747 100644 --- a/init.lua +++ b/init.lua @@ -893,7 +893,9 @@ require('lazy').setup({ -- default behavior. For example, here we set the section for -- cursor location to LINE:COLUMN ---@diagnostic disable-next-line: duplicate-set-field - statusline.section_location = function() return '%2l:%-2v' end + statusline.section_location = function() + return '%2l:%-2v - %L' + end -- ... and there is more! -- Check out: https://github.com/nvim-mini/mini.nvim