diff --git a/dot_config/nvim/lazy-lock.json b/dot_config/nvim/lazy-lock.json index f685e1f..2656a64 100644 --- a/dot_config/nvim/lazy-lock.json +++ b/dot_config/nvim/lazy-lock.json @@ -7,12 +7,14 @@ "direnv.nvim": { "branch": "main", "commit": "564146278b3d5fe4ffa389cd103bab20f9b515d6" }, "fidget.nvim": { "branch": "main", "commit": "7fa433a83118a70fe24c1ce88d5f0bd3453c0970" }, "flash.nvim": { "branch": "main", "commit": "fcea7ff883235d9024dc41e638f164a450c14ca2" }, + "friendly-snippets": { "branch": "main", "commit": "6cd7280adead7f586db6fccbd15d2cac7e2188b9" }, "lazy.nvim": { "branch": "main", "commit": "85c7ff3711b730b4030d03144f6db6375044ae82" }, "lazydev.nvim": { "branch": "main", "commit": "5231c62aa83c2f8dc8e7ba957aa77098cda1257d" }, "lualine.nvim": { "branch": "master", "commit": "47f91c416daef12db467145e16bed5bbfe00add8" }, "mason-nvim-dap.nvim": { "branch": "main", "commit": "9a10e096703966335bd5c46c8c875d5b0690dade" }, "mason.nvim": { "branch": "main", "commit": "44d1e90e1f66e077268191e3ee9d2ac97cc18e65" }, "mini.icons": { "branch": "main", "commit": "5b9076dae1bfbe47ba4a14bc8b967cde0ab5d77e" }, + "mini.indentscope": { "branch": "main", "commit": "e0601f75aa5137a5a13bb92a988c9a300f5bd3de" }, "neotest": { "branch": "master", "commit": "deadfb1af5ce458742671ad3a013acb9a6b41178" }, "neotest-go": { "branch": "main", "commit": "59b50505053f9c45a9febb79e11a56206c3e3901" }, "neotest-python": { "branch": "master", "commit": "b0d3a861bd85689d8ed73f0590c47963a7eb1bf9" }, diff --git a/dot_config/nvim/lua/plugins/blink.lua b/dot_config/nvim/lua/plugins/blink.lua index 2c424bd..eb8e782 100644 --- a/dot_config/nvim/lua/plugins/blink.lua +++ b/dot_config/nvim/lua/plugins/blink.lua @@ -1,6 +1,6 @@ return { "saghen/blink.cmp", - dependecies = { "rafamadriz/friendly-snippets" }, + dependencies = { "rafamadriz/friendly-snippets" }, version = "1.*", ---@module 'blink.cmp' ---@type blink.cmp.Config diff --git a/dot_config/nvim/lua/vim-options.lua b/dot_config/nvim/lua/vim-options.lua index 570a5af..60bc802 100644 --- a/dot_config/nvim/lua/vim-options.lua +++ b/dot_config/nvim/lua/vim-options.lua @@ -1,11 +1,23 @@ vim.g.mapleader = " " -vim.cmd("set tabstop=2") -vim.cmd("set softtabstop=2") -vim.cmd("set shiftwidth=2") -vim.cmd("set expandtab") -vim.cmd("set clipboard+=unnamedplus") + +vim.opt.tabstop = 2 +vim.opt.softtabstop = 2 +vim.opt.shiftwidth = 2 +vim.opt.expandtab = true + +vim.opt.clipboard:append("unnamedplus") + vim.cmd("highlight Normal guibg=none") vim.cmd("highlight NonText guibg=none") vim.cmd("highlight Normal ctermbg=none") vim.cmd("highlight NonText ctermbg=none") + vim.o.winborder = 'rounded' + +vim.opt.undofile = true +vim.opt.smartindent = true +vim.opt.wrap = false +vim.opt.cursorline = true +vim.opt.signcolumn = "yes" +vim.opt.scrolloff = 8 +vim.opt.sidescrolloff = 8