From 9a537bacf1abcdb28c9c46f98d5d8402ddc9ac92 Mon Sep 17 00:00:00 2001 From: Eugene Triguba Date: Tue, 22 Apr 2025 08:58:20 -0400 Subject: update neovim settings --- nvim/.config/nvim/init.lua | 8 +++---- nvim/.config/nvim/lazy-lock.json | 10 ++++++++- nvim/.config/nvim/lua/config/filetypes.lua | 16 ++++++-------- nvim/.config/nvim/lua/config/keymaps.lua | 3 +++ nvim/.config/nvim/lua/config/options.lua | 11 +++++++++ nvim/.config/nvim/lua/plugins/colorscheme.lua | 11 --------- nvim/.config/nvim/lua/plugins/editor.lua | 21 ++++++++++++++++++ nvim/.config/nvim/lua/plugins/ui.lua | 32 +++++++++++++++++++++++++++ 8 files changed, 87 insertions(+), 25 deletions(-) delete mode 100644 nvim/.config/nvim/lua/plugins/colorscheme.lua create mode 100644 nvim/.config/nvim/lua/plugins/editor.lua create mode 100644 nvim/.config/nvim/lua/plugins/ui.lua (limited to 'nvim') diff --git a/nvim/.config/nvim/init.lua b/nvim/.config/nvim/init.lua index de5bfc1..b73d02d 100644 --- a/nvim/.config/nvim/init.lua +++ b/nvim/.config/nvim/init.lua @@ -1,6 +1,6 @@ -require("config.options") -- Vim Options -require("config.keymaps") -- Kep mappings -require("config.autocmds") -- Auto commands +require("config.options") -- Vim Options +require("config.keymaps") -- Kep mappings +require("config.autocmds") -- Auto commands require("config.filetypes") -- Language-specific settings -require("config.lazy") -- Plugin management +require("config.lazy") -- Plugin management diff --git a/nvim/.config/nvim/lazy-lock.json b/nvim/.config/nvim/lazy-lock.json index 57d2f1e..1493a28 100644 --- a/nvim/.config/nvim/lazy-lock.json +++ b/nvim/.config/nvim/lazy-lock.json @@ -1,3 +1,11 @@ { - "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" } + "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, + "lualine.nvim": { "branch": "master", "commit": "86fe39534b7da729a1ac56c0466e76f2c663dc42" }, + "mini.surround": { "branch": "main", "commit": "5aab42fcdcf31fa010f012771eda5631c077840a" }, + "neo-tree.nvim": { "branch": "v3.x", "commit": "1ef260eb4f54515fe121a2267b477efb054d108a" }, + "nui.nvim": { "branch": "main", "commit": "8d3bce9764e627b62b07424e0df77f680d47ffdb" }, + "nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" }, + "nvim-web-devicons": { "branch": "master", "commit": "855c97005c8eebcdd19846f2e54706bffd40ee96" }, + "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, + "tokyonight.nvim": { "branch": "main", "commit": "057ef5d260c1931f1dffd0f052c685dcd14100a3" } } diff --git a/nvim/.config/nvim/lua/config/filetypes.lua b/nvim/.config/nvim/lua/config/filetypes.lua index dfe37ec..7e0e416 100644 --- a/nvim/.config/nvim/lua/config/filetypes.lua +++ b/nvim/.config/nvim/lua/config/filetypes.lua @@ -3,10 +3,17 @@ local api = vim.api api.nvim_create_autocmd("FileType", { pattern = "python", callback = function() + -- PEP 8 indentation settings vim.opt_local.tabstop = 4 + vim.opt_local.softtabstop = 4 vim.opt_local.shiftwidth = 4 vim.opt_local.expandtab = true + + -- 88 character length lines for Black formatter vim.opt_local.colorcolumn = "88" + + -- Google-style docstrings + g.python_style = "google" end, }) @@ -19,15 +26,6 @@ api.nvim_create_autocmd("FileType", { end, }) -api.nvim_create_autocmd("FileType", { - pattern = "rust", - callback = function() - vim.opt_local.tabstop = 4 - vim.opt_local.shiftwidth = 4 - vim.opt_local.commentstring = "// %s" - end, -}) - api.nvim_create_autocmd("FileType", { pattern = { "html", "css", "javascript", "typescript", "javascriptreact", "typescriptreact" }, callback = function() diff --git a/nvim/.config/nvim/lua/config/keymaps.lua b/nvim/.config/nvim/lua/config/keymaps.lua index ee7c68b..d4d2a45 100644 --- a/nvim/.config/nvim/lua/config/keymaps.lua +++ b/nvim/.config/nvim/lua/config/keymaps.lua @@ -1,2 +1,5 @@ vim.g.mapleader = "" vim.g.maplocalleader = "\\" + +local map = vim.keymap.set + diff --git a/nvim/.config/nvim/lua/config/options.lua b/nvim/.config/nvim/lua/config/options.lua index 80522dc..b1daeef 100644 --- a/nvim/.config/nvim/lua/config/options.lua +++ b/nvim/.config/nvim/lua/config/options.lua @@ -18,3 +18,14 @@ opt.smartcase = true opt.termguicolors = true opt.signcolumn = "yes" opt.cursorline = true + +-- Files +opt.swapfile = false +opt.backup = false +opt.undofile = true +opt.undodir = vim.fn.stdpath("data") .. "/undodir" + +-- Behavior +opt.hidden = true +opt.scrolloff = 8 +opt.mouse = "a" diff --git a/nvim/.config/nvim/lua/plugins/colorscheme.lua b/nvim/.config/nvim/lua/plugins/colorscheme.lua deleted file mode 100644 index be7f5b8..0000000 --- a/nvim/.config/nvim/lua/plugins/colorscheme.lua +++ /dev/null @@ -1,11 +0,0 @@ -return { - { - "folke/tokyonight.nvim", - lazy = false, - priority = 1000, - opts = { style = "moon" }, - init = function() - vim.cmd([[colorscheme tokyonight]]) - end, - } -} diff --git a/nvim/.config/nvim/lua/plugins/editor.lua b/nvim/.config/nvim/lua/plugins/editor.lua new file mode 100644 index 0000000..022b72a --- /dev/null +++ b/nvim/.config/nvim/lua/plugins/editor.lua @@ -0,0 +1,21 @@ +return { + { + "echasnovski/mini.surround", + version = false, + config = function() + require('mini.surround').setup() + end, + }, + { + "nvim-neo-tree/neo-tree.nvim", + branch = "v3.x", + dependencies = { + "nvim-lua/plenary.nvim", + "nvim-tree/nvim-web-devicons", + "MunifTanjim/nui.nvim", + -- {"3rd/image.nvim", opts = {}}, + }, + lazy = false, + opts = {}, + } +} diff --git a/nvim/.config/nvim/lua/plugins/ui.lua b/nvim/.config/nvim/lua/plugins/ui.lua new file mode 100644 index 0000000..00ca27e --- /dev/null +++ b/nvim/.config/nvim/lua/plugins/ui.lua @@ -0,0 +1,32 @@ +return { + -- Colorscheme + { + "folke/tokyonight.nvim", + lazy = false, + priority = 1000, + opts = { style = "moon" }, + init = function() + vim.cmd([[colorscheme tokyonight]]) + end, + }, + -- Status bar + { + "nvim-lualine/lualine.nvim", + event = "VeryLazy", + dependencies = { "nvim-tree/nvim-web-devicons" }, + opts = { + options = { + theme = "tokyonight", + component_separators = { left = "|", right = "|" }, + section_separators = { left = "", right = "" }, + }, + }, + }, + -- Color highlighter + { + "norcalli/nvim-colorizer.lua", + config = function() + require 'colorizer'.setup() + end, + } +} -- cgit v1.2.3