diff --git a/lazy-lock.json b/lazy-lock.json index 7cbdb48..304c37d 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -10,7 +10,7 @@ "dashboard-nvim": { "branch": "master", "commit": "ae309606940d26d8c9df8b048a6e136b6bbec478" }, "flash.nvim": { "branch": "main", "commit": "34c7be146a91fec3555c33fe89c7d643f6ef5cf1" }, "friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" }, - "fzf-lua": { "branch": "main", "commit": "21849312a3eae7d8115a83b7a3f9c54a4e29c611" }, + "fzf-lua": { "branch": "main", "commit": "8e6a1e9f92b531ee965db4713c0227aeb37b4a22" }, "gitsigns.nvim": { "branch": "main", "commit": "5f808b5e4fef30bd8aca1b803b4e555da07fc412" }, "grug-far.nvim": { "branch": "main", "commit": "11d0fbd6fff6f4e394af95319deeaab4ef88ce97" }, "lazy.nvim": { "branch": "main", "commit": "7e6c863bc7563efbdd757a310d17ebc95166cef3" }, @@ -27,22 +27,22 @@ "neotest-rspec": { "branch": "main", "commit": "f8c91edc5dd87ca467a624652f365ac217d7cc1c" }, "noice.nvim": { "branch": "main", "commit": "eaed6cc9c06aa2013b5255349e4f26a6b17ab70f" }, "nui.nvim": { "branch": "main", "commit": "53e907ffe5eedebdca1cd503b00aa8692068ca46" }, - "nvim-dap": { "branch": "master", "commit": "567da83810dd9da32f9414d941bc6848715fc102" }, + "nvim-dap": { "branch": "master", "commit": "7e48a80551e0b8fd7e34436d74243de7ae1ec397" }, "nvim-dap-ruby": { "branch": "main", "commit": "4176405d186a93ebec38a6344df124b1689cfcfd" }, "nvim-dap-ui": { "branch": "master", "commit": "ffa89839f97bad360e78428d5c740fdad9a0ff02" }, "nvim-dap-virtual-text": { "branch": "master", "commit": "76d80c3d171224315b61c006502a1e30c213a9ab" }, - "nvim-lint": { "branch": "master", "commit": "6b46370d02cd001509a765591a3ffc481b538794" }, - "nvim-lspconfig": { "branch": "master", "commit": "9f2c279cf9abe584f03bfeb37c6658d68e3ff49d" }, + "nvim-lint": { "branch": "master", "commit": "1fea92f1d9908eaa5eb8bafe08b4293d7aadaa55" }, + "nvim-lspconfig": { "branch": "master", "commit": "040001d85e9190a904d0e35ef5774633e14d8475" }, "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" }, "nvim-tree.lua": { "branch": "master", "commit": "f7b76cd1a75615c8d6254fc58bedd2a7304eb7d8" }, - "nvim-treesitter": { "branch": "master", "commit": "c47d8d27d047634d00a07ca80a1b694624743b38" }, + "nvim-treesitter": { "branch": "master", "commit": "fa915a30c5cdf1d18129e9ef6ac2ee0fa799904f" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "ad8f0a472148c3e0ae9851e26a722ee4e29b1595" }, "nvim-ts-autotag": { "branch": "main", "commit": "1cca23c9da708047922d3895a71032bc0449c52d" }, "nvim-web-devicons": { "branch": "master", "commit": "0eb18da56e2ba6ba24de7130a12bcc4e31ad11cb" }, "persistence.nvim": { "branch": "main", "commit": "f6aad7dde7fcf54148ccfc5f622c6d5badd0cc3d" }, "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" }, "rustaceanvim": { "branch": "master", "commit": "0a618c1d1c05a8059880076feccb15301da6993d" }, - "snacks.nvim": { "branch": "main", "commit": "972c61cc1cd254ef3b43ec1dfd51eefbdc441a7d" }, + "snacks.nvim": { "branch": "main", "commit": "9563bb1ffc890abf35341561ea2362b9ac51da04" }, "telescope.nvim": { "branch": "master", "commit": "2eca9ba22002184ac05eddbe47a7fe2d5a384dfc" }, "todo-comments.nvim": { "branch": "main", "commit": "ae0a2afb47cf7395dc400e5dc4e05274bf4fb9e0" }, "tokyonight.nvim": { "branch": "main", "commit": "b0e7c7382a7e8f6456f2a95655983993ffda745e" }, diff --git a/lua/plugins/editor_mine.lua b/lua/plugins/editor_mine.lua index 0f08b67..5a44143 100644 --- a/lua/plugins/editor_mine.lua +++ b/lua/plugins/editor_mine.lua @@ -2,25 +2,25 @@ return { { "nvim-tree/nvim-tree.lua", - -- event = "VeryLazy", + event = "VeryLazy", dependencies = { "nvim-tree/nvim-web-devicons" }, keys = { { - "fe", + "e", function() require("nvim-tree.api").tree.toggle({ path = LazyVim.root() }) end, desc = "Explorer NvimTree (Root)", }, { - "fE", + "E", function() require("nvim-tree.api").tree.toggle({ path = vim.uv.cwd() }) end, desc = "Explorer NvimTree (cwd)", }, - { "e", "fe", desc = "Explorer NvimTree (Root Dir)", remap = true }, - { "E", "fE", desc = "Explorer NvimTree (cwd)", remap = true }, + -- { "e", "fe", desc = "Explorer NvimTree (Root Dir)", remap = true }, + -- { "E", "fE", desc = "Explorer NvimTree (cwd)", remap = true }, { "0", function() diff --git a/lua/plugins/extras_ruby_mine.lua b/lua/plugins/extras_ruby_mine.lua index 8a269cb..a09dc80 100644 --- a/lua/plugins/extras_ruby_mine.lua +++ b/lua/plugins/extras_ruby_mine.lua @@ -1,4 +1,4 @@ --- return { +return { -- { -- "nvim-treesitter/nvim-treesitter", -- opts = { ensure_installed = { "ruby" } } @@ -64,4 +64,4 @@ -- }, -- }, -- }, --- } +} diff --git a/lua/plugins/js_mine.lua b/lua/plugins/js_mine.lua index 326e927..1dda554 100644 --- a/lua/plugins/js_mine.lua +++ b/lua/plugins/js_mine.lua @@ -1,4 +1,4 @@ --- return { +return { -- -- { -- -- "nvim-treesitter/nvim-treesitter", -- -- opts = function(_, opts) @@ -59,4 +59,4 @@ -- -- }, -- -- }, -- -- }, --- } +} diff --git a/lua/plugins/ui.lua b/lua/plugins/ui.lua index 85d6dbc..8742527 100644 --- a/lua/plugins/ui.lua +++ b/lua/plugins/ui.lua @@ -62,18 +62,27 @@ return { vim.o.laststatus = vim.g.lualine_laststatus + -- MY EDIT: START -- local my_catppuccin_frappe = require('lualine.themes.catppuccin-frappe') my_catppuccin_frappe.inactive.c = { fg = '#2c323c', bg = 'silver' } my_catppuccin_frappe.normal.c.bg = '#2c2b88' + -- MY EDIT: END -- - return { + local opts = { options = { + + -- MY EDIT: START -- theme = my_catppuccin_frappe, - globalstatus = false, - disabled_filetypes = { statusline = { "dashboard", "alpha", "starter" } }, + -- MY EDIT: END -- + + globalstatus = vim.o.laststatus == 3, + disabled_filetypes = { statusline = { "dashboard", "alpha", "ministarter", "snacks_dashboard" } }, + + -- MY EDIT: START -- -- remove separators to get more space; useful when branch and filepaths are long component_separators = {}, section_separators = {}, + -- MY EDIT: END -- }, sections = { lualine_a = { "mode" }, @@ -89,36 +98,47 @@ return { info = icons.diagnostics.Info, hint = icons.diagnostics.Hint, }, + -- MY EDIT: START -- padding = { left = 1, right = 0 }, + -- MY EDIT: END -- }, - { "filetype", icon_only = true, separator = "", padding = { left = 1, right = 0 } }, + -- MY EDIT: START -- { 'filename', path = 1, padding = 0 }, + -- MY EDIT: END -- + { "filetype", icon_only = true, separator = "", padding = { left = 1, right = 0 } }, }, lualine_x = { + Snacks.profiler.status(), -- stylua: ignore - { + { function() return require("noice").api.status.command.get() end, cond = function() return package.loaded["noice"] and require("noice").api.status.command.has() end, - color = LazyVim.ui.fg("Statement"), + color = function() return { fg = Snacks.util.color("Statement") } end, }, -- stylua: ignore { function() return require("noice").api.status.mode.get() end, cond = function() return package.loaded["noice"] and require("noice").api.status.mode.has() end, - color = LazyVim.ui.fg("Constant"), + color = function() return { fg = Snacks.util.color("Constant") } end, }, -- stylua: ignore { function() return " " .. require("dap").status() end, cond = function() return package.loaded["dap"] and require("dap").status() ~= "" end, - color = LazyVim.ui.fg("Debug"), + color = function() return { fg = Snacks.util.color("Debug") } end, }, + -- stylua: ignore { require("lazy.status").updates, cond = require("lazy.status").has_updates, - color = LazyVim.ui.fg("Special"), + color = function() return { fg = Snacks.util.color("Special") } end, }, + -- MY EDIT: START -- + -- moved diff to lualine_y + -- MY EDIT: END -- }, + -- MY EDIT: START -- + -- moved lualine_y to lualine_z lualine_y = { { "diff", @@ -139,10 +159,14 @@ return { end, }, }, + -- MY EDIT: END -- + -- MY EDIT: START -- + -- moved lualine_y to lualine_z + removed original lualine_z lualine_z = { { "progress", separator = " ", padding = { left = 1, right = 0 } }, { "location", padding = { left = 0, right = 1 } }, }, + -- MY EDIT: END -- }, inactive_sections = { lualine_c = { { 'filename', path = 1 } },