diff --git a/lazy-lock.json b/lazy-lock.json index 8507499..7e2ed62 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,17 +1,14 @@ { "LuaSnip": { "branch": "master", "commit": "f3b3d3446bcbfa62d638b1903ff00a78b2b730a1" }, - "cellular-automaton.nvim": { "branch": "main", "commit": "b7d056dab963b5d3f2c560d92937cb51db61cb5b" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-cmdline": { "branch": "main", "commit": "8ee981b4a91f536f52add291594e89fb6645e451" }, "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, - "copilot.vim": { "branch": "release", "commit": "79e1a892ca9b4fa6234fd25f2930dba5201700bd" }, - "editorconfig.nvim": { "branch": "master", "commit": "5b9e303e1d6f7abfe616ce4cc8d3fffc554790bf" }, "fidget.nvim": { "branch": "main", "commit": "60404ba67044c6ab01894dd5bf77bd64ea5e09aa" }, "lazy.nvim": { "branch": "main", "commit": "aedcd79811d491b60d0a6577a9c1701063c2a609" }, "lualine.nvim": { "branch": "master", "commit": "7d131a8d3ba5016229e8a1d08bf8782acea98852" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "fe4cce44dec93c69be17dad79b21de867dde118a" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "21d33d69a81f6351e5a5f49078b2e4f0075c8e73" }, "mason.nvim": { "branch": "main", "commit": "c43eeb5614a09dc17c03a7fb49de2e05de203924" }, "mini.comment": { "branch": "main", "commit": "a4b7e46deb9ad2feb8902cc5dbf087eced112ee5" }, "mini.indentscope": { "branch": "main", "commit": "cf07f19e718ebb0bcc5b00999083ce11c37b8d40" }, @@ -19,14 +16,14 @@ "mini.pairs": { "branch": "main", "commit": "04f58f2545ed80ac3b52dd4826e93f33e15b2af6" }, "mini.surround": { "branch": "main", "commit": "a1b590cc3b676512de507328d6bbab5e43794720" }, "nvim-cmp": { "branch": "main", "commit": "04e0ca376d6abdbfc8b52180f8ea236cbfddf782" }, - "nvim-lspconfig": { "branch": "master", "commit": "d1bab4cf4b69e49d6058028fd933d8ef5e74e680" }, - "nvim-tree.lua": { "branch": "master", "commit": "030defdb6522f5f716d8201d20ca1a2baa57ca66" }, - "nvim-treesitter": { "branch": "master", "commit": "917d696592a34917a12208f579d5e72c1a904aee" }, + "nvim-lspconfig": { "branch": "master", "commit": "b8751ff9ac9fd6ce253e0653d898de02e54040d5" }, + "nvim-tree.lua": { "branch": "master", "commit": "d52fdeb0a300ac42b9cfa65ae0600a299f8e8677" }, + "nvim-treesitter": { "branch": "master", "commit": "9896ef5f701cc8258c4f04c6944b77e7cfa244e3" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "7f00d94543f1fd37cab2afa2e9a6cd54e1c6b9ef" }, "nvim-web-devicons": { "branch": "master", "commit": "14ac5887110b06b89a96881d534230dac3ed134d" }, "plenary": { "branch": "master", "commit": "4f71c0c4a196ceb656c824a70792f3df3ce6bb6d" }, "rose-pine": { "branch": "main", "commit": "f977eeba34b030b37f93ece2fbd792477606203b" }, "telescope-file-browser.nvim": { "branch": "master", "commit": "48ffb8de688a22942940f50411d5928631368848" }, - "telescope.nvim": { "branch": "master", "commit": "b744cf59752aaa01561afb4223006de26f3836fd" }, + "telescope.nvim": { "branch": "master", "commit": "2e1e382df42467029b493c143c2e727028140214" }, "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" } } \ No newline at end of file diff --git a/lua/stevenmm/lazy/colors.lua b/lua/stevenmm/lazy/colors.lua index 833905d..5fdb773 100644 --- a/lua/stevenmm/lazy/colors.lua +++ b/lua/stevenmm/lazy/colors.lua @@ -1,5 +1,5 @@ function ColorMyPencils(color) - color = color or "rose-pine" + color = color or "rose-pine-moon" vim.cmd.colorscheme(color) vim.api.nvim_set_hl(0, "Normal", {bg = "none" }) @@ -12,7 +12,7 @@ return { name = "rose-pine", config = function() require("rose-pine").setup({ - variant = "main", + variant = "moon", styles = { bold = true, diff --git a/lua/stevenmm/lazy/init.lua b/lua/stevenmm/lazy/init.lua index 5c535da..0ec5fdb 100644 --- a/lua/stevenmm/lazy/init.lua +++ b/lua/stevenmm/lazy/init.lua @@ -4,7 +4,7 @@ return { name = "plenary" }, - "github/copilot.vim", - "eandrju/cellular-automaton.nvim", - "gpanders/editorconfig.nvim", +-- "github/copilot.vim", +-- "eandrju/cellular-automaton.nvim", +-- "gpanders/editorconfig.nvim", } diff --git a/lua/stevenmm/lazy/lualine.lua b/lua/stevenmm/lazy/lualine.lua index 0d7c73d..bce0803 100644 --- a/lua/stevenmm/lazy/lualine.lua +++ b/lua/stevenmm/lazy/lualine.lua @@ -19,7 +19,7 @@ return { lualine.setup({ options = { theme = 'rose-pine', - globalstatus = false, + globalstatus = true, -- fmt = default, -- fmt = string.upper, -- disabled_filetypes = { @@ -42,7 +42,7 @@ return { -- }, { 'diff', - colored = true, + colored = false, diff_color = { added = 'LuaLineDiffAdd', modified = 'LuaLineDiffChange', diff --git a/lua/stevenmm/lazy/minicomment.lua b/lua/stevenmm/lazy/minicomment.lua new file mode 100644 index 0000000..5c3ea4a --- /dev/null +++ b/lua/stevenmm/lazy/minicomment.lua @@ -0,0 +1,7 @@ +return { + 'echasnovski/mini.comment', + version = false, + config = function () + require('mini.comment').setup() + end +} diff --git a/lua/stevenmm/lazy/miniindentscope.lua b/lua/stevenmm/lazy/miniindentscope.lua new file mode 100644 index 0000000..a91ec67 --- /dev/null +++ b/lua/stevenmm/lazy/miniindentscope.lua @@ -0,0 +1,7 @@ +return { + 'echasnovski/mini.indentscope', + version = false, + config = function () + require('mini.indentscope').setup() + end +} diff --git a/lua/stevenmm/lazy/minimove.lua b/lua/stevenmm/lazy/minimove.lua new file mode 100644 index 0000000..082c120 --- /dev/null +++ b/lua/stevenmm/lazy/minimove.lua @@ -0,0 +1,7 @@ +return { + 'echasnovski/mini.move', + version = false, + config = function () + require('mini.move').setup() + end, +} diff --git a/lua/stevenmm/lazy/mininvim.lua b/lua/stevenmm/lazy/mininvim.lua deleted file mode 100644 index 935e585..0000000 --- a/lua/stevenmm/lazy/mininvim.lua +++ /dev/null @@ -1,30 +0,0 @@ -return { - { - 'echasnovski/mini.pairs', - version = false, - }, - { - 'echasnovski/mini.move', - version = false, - }, - { - 'echasnovski/mini.surround', - version = false, - }, - { - 'echasnovski/mini.indentscope', - version = false, - }, - { - 'echasnovski/mini.comment', - version = false, - }, - - config = function () - require('mini.pairs').setup() - require('mini.move').setup() - require('mini.surround').setup() - require('mini.indentscope').setup() - require('mini.comment').setup() - end -} diff --git a/lua/stevenmm/lazy/minipairs.lua b/lua/stevenmm/lazy/minipairs.lua new file mode 100644 index 0000000..5abfdba --- /dev/null +++ b/lua/stevenmm/lazy/minipairs.lua @@ -0,0 +1,7 @@ +return { + 'echasnovski/mini.pairs', + version = false, + config = function () + require('mini.pairs').setup() + end, +} diff --git a/lua/stevenmm/lazy/minisurround.lua b/lua/stevenmm/lazy/minisurround.lua new file mode 100644 index 0000000..5db9968 --- /dev/null +++ b/lua/stevenmm/lazy/minisurround.lua @@ -0,0 +1,7 @@ +return { + 'echasnovski/mini.surround', + version = false, + config = function () + require('mini.surround').setup() + end +} diff --git a/lua/stevenmm/set.lua b/lua/stevenmm/set.lua index 6e1c25b..828e41c 100644 --- a/lua/stevenmm/set.lua +++ b/lua/stevenmm/set.lua @@ -4,11 +4,12 @@ vim.opt.number = true vim.opt.relativenumber = true vim.opt.encoding = 'UTF-8' -vim.opt.guifont = 'monospace' +vim.opt.guifont = 'NotoSansM Nerd Font Mono' vim.opt.tabstop = 4 vim.opt.softtabstop = 4 vim.shiftwidth = 4 +vim.opt.smarttab = true vim.opt.expandtab = true vim.opt.smartindent = true