diff --git a/init.lua b/init.lua index f36e80e..29f74d5 100644 --- a/init.lua +++ b/init.lua @@ -20,7 +20,7 @@ vim.cmd("set shiftwidth=4") vim.cmd("set expandtab") vim.cmd("set wrap") vim.lsp.inlay_hint.enable(false) -vim.o.sessionoptions="blank,buffers,curdir,folds,help,tabpages,winsize,winpos,terminal,localoptions" +vim.o.sessionoptions = "blank,buffers,curdir,folds,help,tabpages,winsize,winpos,terminal,localoptions" -- ╭─────────────╮ -- │ Colorscheme │ diff --git a/lazy-lock.json b/lazy-lock.json index d24e96e..1b2bca6 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,35 +1,28 @@ { - "Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" }, "aerial.nvim": { "branch": "master", "commit": "5c0df1679bf7c814c924dc6646cc5291daca8363" }, - "auto-session": { "branch": "main", "commit": "00334ee24b9a05001ad50221c8daffbeedaa0842" }, - "blink.cmp": { "branch": "main", "commit": "022521a8910a5543b0251b21c9e1a1e989745796" }, + "blink.cmp": { "branch": "main", "commit": "bae4bae0eedd1fa55f34b685862e94a222d5c6f8" }, "blueprints": { "branch": "main", "commit": "e5825c30464f98e77e8b5ffb88d59fd98df6c802" }, "bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" }, - "conform.nvim": { "branch": "master", "commit": "8132ec733eed3bf415b97b76797ca41b59f51d7d" }, + "conform.nvim": { "branch": "master", "commit": "973f3cb73887d510321653044791d7937c7ec0fa" }, "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, - "flash.nvim": { "branch": "main", "commit": "3c942666f115e2811e959eabbdd361a025db8b63" }, "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" }, - "gitsigns.nvim": { "branch": "main", "commit": "d0f90ef51d4be86b824b012ec52ed715b5622e51" }, + "gitsigns.nvim": { "branch": "main", "commit": "ca8bf696be575efa925ef531c4efd897b5c3086b" }, "indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" }, "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, "lualine.nvim": { "branch": "master", "commit": "a94fc68960665e54408fe37dcf573193c4ce82c9" }, - "mini.icons": { "branch": "main", "commit": "397ed3807e96b59709ef3292f0a3e253d5c1dc0a" }, - "neo-tree.nvim": { "branch": "main", "commit": "e01ca7de8e6dbc6118bcb12c4cbe1f88162a337f" }, + "mini.icons": { "branch": "main", "commit": "b8f6fa6f5a3fd0c56936252edcd691184e5aac0c" }, + "neo-tree.nvim": { "branch": "main", "commit": "46fa0c22ca39e05fe15744102d21feb07fe9a94a" }, "no-neck-pain.nvim": { "branch": "main", "commit": "ecdfe60f23134089fac92659e688b65fdd8b5cc0" }, - "noice.nvim": { "branch": "main", "commit": "0427460c2d7f673ad60eb02b35f5e9926cf67c59" }, "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" }, - "nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" }, "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, "nvim-ts-autotag": { "branch": "main", "commit": "a1d526af391f6aebb25a8795cbc05351ed3620b5" }, - "nvim-web-devicons": { "branch": "master", "commit": "1fb58cca9aebbc4fd32b086cb413548ce132c127" }, + "nvim-web-devicons": { "branch": "master", "commit": "c2599a81ecabaae07c49ff9b45dcd032a8d90f1a" }, "nvim-window-picker": { "branch": "main", "commit": "6382540b2ae5de6c793d4aa2e3fe6dbb518505ec" }, - "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, - "scope.nvim": { "branch": "main", "commit": "6b4208f017da9b122d69ddc5841e040dffe7313c" }, - "smear-cursor.nvim": { "branch": "main", "commit": "aff844fc1483fd673f721a41affcd7e2fcb885f5" }, + "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, + "smear-cursor.nvim": { "branch": "main", "commit": "58e69a911e7f5296b3d7fec5e7414df5a4ac91fb" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "1f08ed60cafc8f6168b72b80be2b2ea149813e55" }, "telescope-git-file-history.nvim": { "branch": "master", "commit": "e7d495319f2a04df96402057a6992ea970f8914d" }, "telescope.nvim": { "branch": "master", "commit": "b4da76be54691e854d3e0e02c36b0245f945c2c7" }, "trouble.nvim": { "branch": "main", "commit": "85bedb7eb7fa331a2ccbecb9202d8abba64d37b3" }, - "vim-be-good": { "branch": "master", "commit": "0ae3de14eb8efc6effe7704b5e46495e91931cc5" }, - "vim-fugitive": { "branch": "master", "commit": "4a745ea72fa93bb15dd077109afbb3d1809383f2" } + "vim-fugitive": { "branch": "master", "commit": "61b51c09b7c9ce04e821f6cf76ea4f6f903e3cf4" } } diff --git a/lua/plugins/code-utils.lua b/lua/plugins/code-utils.lua index 90f5cae..b4eeed7 100644 --- a/lua/plugins/code-utils.lua +++ b/lua/plugins/code-utils.lua @@ -12,14 +12,6 @@ return { require("nvim-treesitter.configs").setup(opts) end, }, - -- To test if TreeSitter is working - -- "nvim-treesitter/playground", - -- { - -- "nvim-treesitter/nvim-treesitter-context", - -- opts = function() - -- return require("plugins.opts.treesitterContext") - -- end, - -- }, -- │ Completion │ { @@ -66,20 +58,4 @@ return { "folke/trouble.nvim", opts = { use_diagnostic_signs = true }, }, - - -- │ Easy comments │ - -- { - -- "numToStr/Comment.nvim", - -- keys = { - -- { "gcc", mode = "n", desc = "Comment toggle current line" }, - -- { "gc", mode = { "n", "o" }, desc = "Comment toggle linewise" }, - -- { "gc", mode = "x", desc = "Comment toggle linewise (visual)" }, - -- { "gbc", mode = "n", desc = "Comment toggle current block" }, - -- { "gb", mode = { "n", "o" }, desc = "Comment toggle blockwise" }, - -- { "gb", mode = "x", desc = "Comment toggle blockwise (visual)" }, - -- }, - -- config = function(_, opts) - -- require("Comment").setup(opts) - -- end, - -- }, } diff --git a/lua/plugins/context.lua b/lua/plugins/context.lua index b8a12bf..5d8535b 100644 --- a/lua/plugins/context.lua +++ b/lua/plugins/context.lua @@ -11,9 +11,6 @@ return { end, }, - -- Separate buffers in tabs - { "tiagovla/scope.nvim", config = true }, - { "nvim-lualine/lualine.nvim", event = "VeryLazy", diff --git a/lua/plugins/navigation.lua b/lua/plugins/navigation.lua index ddc2630..97aeadd 100644 --- a/lua/plugins/navigation.lua +++ b/lua/plugins/navigation.lua @@ -1,28 +1,2 @@ return { - -- ╭────────────╮ - -- │ Navigation │ - -- ╰────────────╯ - -- { - -- "folke/flash.nvim", - -- event = "VeryLazy", - -- opts = {}, - -- keys = { - -- { - -- "s", - -- mode = { "n", "x", "o" }, - -- function() - -- require("flash").jump() - -- end, - -- desc = "Flash", - -- }, - -- { - -- "S", - -- mode = { "n", "x", "o" }, - -- function() - -- require("flash").treesitter() - -- end, - -- desc = "Flash Treesitter", - -- }, - -- }, - -- }, } diff --git a/lua/plugins/opts/neotree.lua b/lua/plugins/opts/neotree.lua index 3a8ab0f..15687d3 100644 --- a/lua/plugins/opts/neotree.lua +++ b/lua/plugins/opts/neotree.lua @@ -4,7 +4,7 @@ local config = { enable_git_status = true, enable_diagnostics = true, open_files_do_not_replace_types = { "terminal", "trouble", "qf" }, -- when opening files, do not use windows containing these filetypes or buftypes - sort_case_insensitive = false, -- used when sorting files and directories in the tree + sort_case_insensitive = false, -- used when sorting files and directories in the tree sort_function = nil, follow_current_file = { enabled = true }, source_selector = { @@ -88,7 +88,7 @@ local config = { -- see `:h neo-tree-custom-commands-global` commands = {}, window = { - position = "left", + position = "float", width = 40, mapping_options = { noremap = true, @@ -176,7 +176,7 @@ local config = { --".null-ls_*", }, }, - group_empty_dirs = false, -- when true, empty folders will be grouped together + group_empty_dirs = false, -- when true, empty folders will be grouped together hijack_netrw_behavior = "open_default", -- netrw disabled, opening a directory opens neo-tree -- in whatever position is specified in window.position -- "open_current", -- netrw disabled, opening a directory opens within the @@ -221,11 +221,11 @@ local config = { }, buffers = { follow_current_file = { - enabled = true, -- This will find and focus the file in the active buffer every time + enabled = true, -- This will find and focus the file in the active buffer every time -- -- the current file is changed while the tree is open. leave_dirs_open = false, -- `false` closes auto expanded dirs, such as with `:Neotree reveal` }, - group_empty_dirs = true, -- when true, empty folders will be grouped together + group_empty_dirs = true, -- when true, empty folders will be grouped together show_unloaded = true, window = { mappings = { diff --git a/lua/plugins/style.lua b/lua/plugins/style.lua index 7b37e8a..6fc1b99 100644 --- a/lua/plugins/style.lua +++ b/lua/plugins/style.lua @@ -12,44 +12,29 @@ return { }, }, { "echasnovski/mini.icons" }, - { - "folke/noice.nvim", - event = "VeryLazy", - dependencies = { - "MunifTanjim/nui.nvim", - -- OPTIONAL: (if not mini is the backup) - -- "rcarriga/nvim-notify", - }, - opts = function() - return require("plugins.opts.noice") - end, - }, + { - "norcalli/nvim-colorizer.lua", - config = function() - require("colorizer").setup({}) - end, + "shortcuts/no-neck-pain.nvim", + version = "*", }, - { "shortcuts/no-neck-pain.nvim", version = "*" }, - - { - "sphamba/smear-cursor.nvim", - opts = { - smear_between_buffers = false, - smear_between_neighbor_lines = true, - scroll_buffer_space = true, - -- Set to `true` if your font supports legacy computing symbols (block unicode symbols). - legacy_computing_symbols_support = false, - smear_insert_mode = true, - - -- fast smear - stiffness = 0.8, -- 0.6 [0, 1] - trailing_stiffness = 0.5, -- 0.4 [0, 1] - stiffness_insert_mode = 0.6, -- 0.4 [0, 1] - trailing_stiffness_insert_mode = 0.6, -- 0.4 [0, 1] - distance_stop_animating = 0.5, -- 0.1 > 0 - }, - }, + -- { + -- "sphamba/smear-cursor.nvim", + -- opts = { + -- smear_between_buffers = false, + -- smear_between_neighbor_lines = true, + -- scroll_buffer_space = true, + -- -- Set to `true` if your font supports legacy computing symbols (block unicode symbols). + -- legacy_computing_symbols_support = false, + -- smear_insert_mode = true, + -- + -- -- fast smear + -- stiffness = 0.8, -- 0.6 [0, 1] + -- trailing_stiffness = 0.5, -- 0.4 [0, 1] + -- stiffness_insert_mode = 0.6, -- 0.4 [0, 1] + -- trailing_stiffness_insert_mode = 0.6, -- 0.4 [0, 1] + -- distance_stop_animating = 0.5, -- 0.1 > 0 + -- }, + -- }, }