diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json index 19d173b..f513a6d 100644 --- a/nvim/lazy-lock.json +++ b/nvim/lazy-lock.json @@ -2,13 +2,13 @@ "LazyVim": { "branch": "main", "commit": "d0c366e4d861b848bdc710696d5311dca2c6d540" }, "auto-save.nvim": { "branch": "main", "commit": "b58948445c43e6903987a9bb97c82e66fdcc0786" }, "blink.cmp": { "branch": "main", "commit": "5f442681df24fe705d1ee7ce5b4d435aa4b4dee4" }, - "bufferline.nvim": { "branch": "main", "commit": "261a72b90d6db4ed8014f7bda976bcdc9dd7ce76" }, + "bufferline.nvim": { "branch": "main", "commit": "9f0826ae6adfd836a23bf8a4910e3c07450211f4" }, "catppuccin": { "branch": "main", "commit": "f67b886d65a029f12ffa298701fb8f1efd89295d" }, "conform.nvim": { "branch": "master", "commit": "9180320205d250429f0f80e073326c674e2a7149" }, "ctrlsf.vim": { "branch": "master", "commit": "32236a8b376d9311dec9b5fe795ca99d32060b13" }, "flash.nvim": { "branch": "main", "commit": "34c7be146a91fec3555c33fe89c7d643f6ef5cf1" }, "friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" }, - "fzf-lua": { "branch": "main", "commit": "d99996b5838a30f4725e584bac5e8a0194e5a2a6" }, + "fzf-lua": { "branch": "main", "commit": "c054a21cd22cef41c62ce96247040abccaab8dbc" }, "gitsigns.nvim": { "branch": "main", "commit": "5f808b5e4fef30bd8aca1b803b4e555da07fc412" }, "gp.nvim": { "branch": "main", "commit": "2372d5323c6feaa2e9c19f7ccb537c615d878e18" }, "grug-far.nvim": { "branch": "main", "commit": "c88435b825a35bfa468b47159709b3221976ecd1" }, @@ -19,24 +19,24 @@ "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, "mini.ai": { "branch": "main", "commit": "ebb04799794a7f94628153991e6334c3304961b8" }, "mini.hipatterns": { "branch": "main", "commit": "f34975103a38b3f608219a1324cdfc58ea660b8b" }, - "mini.icons": { "branch": "main", "commit": "44c0160526f7ae17ca8e8eab9ab235d047fcf7a6" }, + "mini.icons": { "branch": "main", "commit": "6787321f70d674a481776b7cc2c781fb7002c644" }, "mini.pairs": { "branch": "main", "commit": "7e834c5937d95364cc1740e20d673afe2d034cdb" }, - "neo-tree.nvim": { "branch": "main", "commit": "a9f8943b4c31f8460d25c71e0f463d65e9775f1c" }, + "mini.surround": { "branch": "main", "commit": "aa5e245829dd12d8ff0c96ef11da28681d6049aa" }, + "neo-tree.nvim": { "branch": "main", "commit": "2a0b2c5d394a280cee9444c9894582ac53098604" }, "noice.nvim": { "branch": "main", "commit": "eaed6cc9c06aa2013b5255349e4f26a6b17ab70f" }, "nui.nvim": { "branch": "main", "commit": "53e907ffe5eedebdca1cd503b00aa8692068ca46" }, "nvim-asciidoc-preview": { "branch": "main", "commit": "3ae4598a68bc966160a695cec127ee5cc06add02" }, - "nvim-autopairs": { "branch": "master", "commit": "b464658e9b880f463b9f7e6ccddd93fb0013f559" }, "nvim-lint": { "branch": "master", "commit": "1fea92f1d9908eaa5eb8bafe08b4293d7aadaa55" }, - "nvim-lspconfig": { "branch": "master", "commit": "57154fd9a24e76907e3b0bdba4677ef42c88d91c" }, + "nvim-lspconfig": { "branch": "master", "commit": "8b15a1a597a59f4f5306fad9adfe99454feab743" }, "nvim-surround": { "branch": "main", "commit": "9f0cb495f25bff32c936062d85046fbda0c43517" }, - "nvim-treesitter": { "branch": "master", "commit": "5d18ef22dc63624e90aa7b6dbc17f2c3856ae716" }, + "nvim-treesitter": { "branch": "master", "commit": "5f78e989243f9fb0fb55e0cf54820920d86dfd30" }, "nvim-treesitter-endwise": { "branch": "master", "commit": "8b34305ffc28bd75a22f5a0a9928ee726a85c9a6" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "ad8f0a472148c3e0ae9851e26a722ee4e29b1595" }, "nvim-ts-autotag": { "branch": "main", "commit": "1cca23c9da708047922d3895a71032bc0449c52d" }, "persistence.nvim": { "branch": "main", "commit": "f6aad7dde7fcf54148ccfc5f622c6d5badd0cc3d" }, "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" }, "project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" }, - "snacks.nvim": { "branch": "main", "commit": "98df370703b3c47a297988f3e55ce99628639590" }, + "snacks.nvim": { "branch": "main", "commit": "d312053f78b4fb55523def179ac502438dd93193" }, "todo-comments.nvim": { "branch": "main", "commit": "ae0a2afb47cf7395dc400e5dc4e05274bf4fb9e0" }, "tokyonight.nvim": { "branch": "main", "commit": "45d22cf0e1b93476d3b6d362d720412b3d34465c" }, "treesj": { "branch": "main", "commit": "94f6df623f2d15630b1b617abff39962024cb501" }, @@ -46,8 +46,6 @@ "vim-dadbod": { "branch": "master", "commit": "f740950d0703099e0f172016f10e0e39f50fd0ba" }, "vim-dadbod-completion": { "branch": "master", "commit": "71eb73d1f7399be6a56cc43b928276cd5ca27ffd" }, "vim-dadbod-ui": { "branch": "master", "commit": "0fec59e3e1e619e302198cd491b7d27f8d398b7c" }, - "vim-rails": { "branch": "master", "commit": "d3954dfe3946c9330dc91b4fbf79ccacb2c626c0" }, - "vim-slim": { "branch": "master", "commit": "a0a57f75f20a03d5fa798484743e98f4af623926" }, "vim-table-mode": { "branch": "master", "commit": "e4365bde024f73e205eefa2fb78e3029ddb92ea9" }, "which-key.nvim": { "branch": "main", "commit": "8ab96b38a2530eacba5be717f52e04601eb59326" }, "window-picker": { "branch": "main", "commit": "41cfaa428577c53552200a404ae9b3a0b5719706" } diff --git a/nvim/lazyvim.json b/nvim/lazyvim.json index 12e990f..1c0a353 100644 --- a/nvim/lazyvim.json +++ b/nvim/lazyvim.json @@ -1,5 +1,6 @@ { "extras": [ + "lazyvim.plugins.extras.coding.mini-surround", "lazyvim.plugins.extras.formatting.biome", "lazyvim.plugins.extras.lang.ruby", "lazyvim.plugins.extras.lang.sql", diff --git a/nvim/lua/config/options.lua b/nvim/lua/config/options.lua index 6d98bd3..6321feb 100644 --- a/nvim/lua/config/options.lua +++ b/nvim/lua/config/options.lua @@ -14,3 +14,5 @@ vim.g.autoformat = false vim.g.root_spec = { "cwd" } vim.o.smartindent = false + +vim.g.snacks_animate = false diff --git a/nvim/lua/plugins/disabled.lua b/nvim/lua/plugins/disabled.lua index f94b7c6..d9d01e0 100644 --- a/nvim/lua/plugins/disabled.lua +++ b/nvim/lua/plugins/disabled.lua @@ -2,5 +2,6 @@ return { -- disable trouble -- { "folke/flash.nvim", enabled = false }, -- { - { "folke/noice.nvim", enabled = false } + { "folke/noice.nvim", enabled = false }, + { "folke/flash.nvim", enabled = false } } diff --git a/nvim/lua/plugins/fzf-lua.lua b/nvim/lua/plugins/fzf-lua.lua new file mode 100644 index 0000000..b956071 --- /dev/null +++ b/nvim/lua/plugins/fzf-lua.lua @@ -0,0 +1,9 @@ +return { + { + "ibhagwan/fzf-lua", + opts = function(_, opts) + local config = require("fzf-lua.config") + config.defaults.keymap.fzf["ctrl-u"] = "unix-line-discard" + end, + }, +} diff --git a/nvim/lua/plugins/lspconfig.lua b/nvim/lua/plugins/lspconfig.lua index 91f4b22..2a195ae 100644 --- a/nvim/lua/plugins/lspconfig.lua +++ b/nvim/lua/plugins/lspconfig.lua @@ -16,6 +16,7 @@ return { -- -- }, }, servers = { + cssls = {}, -- kotlin_language_server = {}, -- https://www.arthurkoziel.com/json-schemas-in-neovim/ -- helm_ls = {}, diff --git a/nvim/lua/plugins/neo-tree.lua b/nvim/lua/plugins/neo-tree.lua index 7e6dea6..a38e434 100644 --- a/nvim/lua/plugins/neo-tree.lua +++ b/nvim/lua/plugins/neo-tree.lua @@ -13,6 +13,7 @@ return { window = { mappings = { ["/"] = "none", + ["e"] = "open", }, }, -- follow_current_file = { enabled = true }, diff --git a/nvim/lua/plugins/others.lua b/nvim/lua/plugins/others.lua index 5b6f0a3..52aa127 100644 --- a/nvim/lua/plugins/others.lua +++ b/nvim/lua/plugins/others.lua @@ -13,10 +13,16 @@ return { opts = {}, }, { - "windwp/nvim-autopairs", - event = "InsertEnter", - opts = {}, + "echasnovski/mini.pairs", + opts = { + modes = { command = false } + } }, + -- { + -- "windwp/nvim-autopairs", + -- event = "InsertEnter", + -- opts = {}, + -- }, { "isobit/vim-caddyfile" }, { "okuuva/auto-save.nvim", @@ -43,25 +49,24 @@ return { require("window-picker").setup() end, }, - { "slim-template/vim-slim" }, - { "tpope/vim-rails" }, - { "slim-template/vim-slim" }, + -- { "tpope/vim-rails" }, + -- { "slim-template/vim-slim" }, { "dhruvasagar/vim-table-mode" }, -- { "tree-sitter/tree-sitter-embedded-template" }, { "RRethy/nvim-treesitter-endwise" }, { "dyng/ctrlsf.vim" }, -- { "digitaltoad/vim-pug" }, -- { - { - "kylechui/nvim-surround", - version = "*", -- Use for stability; omit to use `main` branch for the latest features - event = "VeryLazy", - config = function() - require("nvim-surround").setup({ - -- Configuration here, or leave empty to use defaults - }) - end, - }, + -- { + -- "kylechui/nvim-surround", + -- version = "*", -- Use for stability; omit to use `main` branch for the latest features + -- event = "VeryLazy", + -- config = function() + -- require("nvim-surround").setup({ + -- -- Configuration here, or leave empty to use defaults + -- }) + -- end, + -- }, -- lazy.nvim { "robitx/gp.nvim", diff --git a/nvim/lua/plugins/snacks.lua b/nvim/lua/plugins/snacks.lua index d3d96be..68e7151 100644 --- a/nvim/lua/plugins/snacks.lua +++ b/nvim/lua/plugins/snacks.lua @@ -2,7 +2,7 @@ return { { "snacks.nvim", opts = { - scroll = { enabled = false }, + -- scroll = { enabled = false }, }, }, } diff --git a/nvim/lua/plugins/telescope.lua b/nvim/lua/plugins/telescope.lua deleted file mode 100644 index cf04342..0000000 --- a/nvim/lua/plugins/telescope.lua +++ /dev/null @@ -1,73 +0,0 @@ -return { - -- { - -- "nvim-telescope/telescope.nvim", - -- opts = { - -- defaults = { - -- -- sorting_strategy = "ascending", - -- mappings = { - -- -- restore default behavior - -- i = { - -- [""] = false, - -- [""] = false, - -- }, - -- n = {}, - -- }, - -- }, - -- -- pickers = { - -- -- buffers = { - -- -- ignore_current_buffer = true, - -- -- sort_mru = true, - -- -- }, - -- -- }, - -- }, - -- }, - -- { - -- "otavioschwanck/telescope-alternate", - -- dependencies = { "nvim-telescope/telescope.nvim" }, - -- lazy = true, - -- opts = { - -- mappings = { - -- { - -- "app/Http/Controllers/(.*)Controller.php", - -- { - -- { "tests/Feature/[1]Test.php", "Test" }, - -- { "resources/js/Pages/[1]/*.tsx", "View" }, - -- }, - -- }, - -- { - -- "app/Models/(.*).php", - -- { - -- { "tests/Unit/[1]Test.php", "Test" }, - -- { "database/factories/[1]Factory.php", "Factory" }, - -- }, - -- }, - -- { - -- "database/factories/(.*)Factory.php", - -- { - -- -- { "tests/Models/[1]Test.php", "Test" }, - -- { "app/Models/[1].php", "Model" }, - -- }, - -- }, - -- { - -- "tests/Feature/(.*)Test.php", - -- { - -- { "app/Http/Controllers/[1]Controller.php", "Controller" }, - -- }, - -- }, - -- { - -- "tests/Unit/(.*)Test.php", - -- { - -- { "app/Models/[1].php", "Model" }, - -- }, - -- }, - -- { - -- "resources/js/Pages/(.*)/.*.tsx", - -- { - -- { "app/Http/Controllers/[1]Controller.php", "Controller" }, - -- }, - -- }, - -- }, - -- }, - -- }, - -- -}