diff --git a/fish/dot-config/fish/config.fish b/fish/dot-config/fish/config.fish index 35748ab..e8f3248 100644 --- a/fish/dot-config/fish/config.fish +++ b/fish/dot-config/fish/config.fish @@ -21,6 +21,5 @@ set -x -g RUSTUP_HOME $XDG_DATA_HOME/rustup set -x -g CARGO_HOME $HOME/.cargo set -x -g PATH $CARGO_HOME/bin $RUSTUP_HOME/bin $HOME/.local/bin $PATH -test (command -v fnm) && fnm env | source test (command -v zoxide) && zoxide init fish | source test -e /opt/asdf-vm/asdf.fish && source /opt/asdf-vm/asdf.fish diff --git a/nvim/dot-config/nvim/after/plugin/catppuccin.lua b/nvim/dot-config/nvim/after/plugin/catppuccin.lua index 0d46507..00a2ab5 100644 --- a/nvim/dot-config/nvim/after/plugin/catppuccin.lua +++ b/nvim/dot-config/nvim/after/plugin/catppuccin.lua @@ -13,8 +13,8 @@ catppuccin.setup { }, integrations = { cmp = true, + fidget = true, gitsigns = true, - notify = true, indent_blankline = { enabled = true, colored_indent_levels = false, @@ -37,6 +37,7 @@ catppuccin.setup { }, telescope = true, treesitter = true, + treesitter_context = true, }, } diff --git a/nvim/dot-config/nvim/after/plugin/indent-blankline.lua b/nvim/dot-config/nvim/after/plugin/indent-blankline.lua deleted file mode 100644 index bbeb915..0000000 --- a/nvim/dot-config/nvim/after/plugin/indent-blankline.lua +++ /dev/null @@ -1,11 +0,0 @@ -local ok, indent_blankline = pcall(require, "indent_blankline") -if not ok then - return -end - -indent_blankline.setup { - char = "▏", - show_current_context = true, - buftype_exclude = { "help" }, - filetype_exclude = { "alpha", "startify", "packer", "NvimTree" }, -} diff --git a/nvim/dot-config/nvim/after/plugin/lspconfig.lua b/nvim/dot-config/nvim/after/plugin/lspconfig.lua index de9e077..51b02c0 100644 --- a/nvim/dot-config/nvim/after/plugin/lspconfig.lua +++ b/nvim/dot-config/nvim/after/plugin/lspconfig.lua @@ -27,11 +27,6 @@ if has_cmp then capabilities = cmp_lsp.default_capabilities() end -local has_lsp_status, lsp_status = pcall(require, "lsp_status") -if has_lsp_status then - capabilities = vim.tbl_extend("keep", capabilities, lsp_status.capabilities) -end - local has_lsp_format, lsp_format = pcall(require, "lsp-format") if has_lsp_format then lsp_format.setup() @@ -64,10 +59,6 @@ local on_attach = function(client, bufnr) }) end - if has_lsp_status then - lsp_status.on_attach(client) - end - if has_lsp_format then lsp_format.on_attach(client) end diff --git a/nvim/dot-config/nvim/after/plugin/lualine.lua b/nvim/dot-config/nvim/after/plugin/lualine.lua index 51a47b3..c32fa23 100644 --- a/nvim/dot-config/nvim/after/plugin/lualine.lua +++ b/nvim/dot-config/nvim/after/plugin/lualine.lua @@ -14,11 +14,6 @@ local function diff_source() end end -local has_lsp_status, lsp_status = pcall(require, "lsp-status") -if has_lsp_status then - lsp_status.register_progress() -end - lualine.setup { options = { theme = "auto", @@ -41,13 +36,6 @@ lualine.setup { separator = "", }, { "filename" }, - { - function() - if has_lsp_status then - return lsp_status.status() - end - end, - }, { function() return vim.fn.search([[\s\+$]], "nw") ~= 0 and "trailing" or "" diff --git a/nvim/dot-config/nvim/after/plugin/mason.lua b/nvim/dot-config/nvim/after/plugin/mason.lua deleted file mode 100644 index 8e09902..0000000 --- a/nvim/dot-config/nvim/after/plugin/mason.lua +++ /dev/null @@ -1,6 +0,0 @@ -local ok, mason = pcall(require, "mason") -if not ok then - return -end - -mason.setup() diff --git a/nvim/dot-config/nvim/after/plugin/nvim-autopairs.lua b/nvim/dot-config/nvim/after/plugin/nvim-autopairs.lua deleted file mode 100644 index b19f5f8..0000000 --- a/nvim/dot-config/nvim/after/plugin/nvim-autopairs.lua +++ /dev/null @@ -1,6 +0,0 @@ -local ok, autopairs = pcall(require, "nvim-autopairs") -if not ok then - return -end - -autopairs.setup {} diff --git a/nvim/dot-config/nvim/after/plugin/zk.lua b/nvim/dot-config/nvim/after/plugin/zk.lua deleted file mode 100644 index b940f69..0000000 --- a/nvim/dot-config/nvim/after/plugin/zk.lua +++ /dev/null @@ -1,8 +0,0 @@ -local ok, zk = pcall(require, "zk") -if not ok then - return -end - -zk.setup { - picker = "telescope", -} diff --git a/nvim/dot-config/nvim/lazy-lock.json b/nvim/dot-config/nvim/lazy-lock.json index e8e6062..dba93a0 100644 --- a/nvim/dot-config/nvim/lazy-lock.json +++ b/nvim/dot-config/nvim/lazy-lock.json @@ -1,29 +1,29 @@ { - "LuaSnip": { "branch": "master", "commit": "99a94cc35ec99bf06263d0346128e908a204575c" }, + "LuaSnip": { "branch": "master", "commit": "409535b8fc54c650eb845b0c35e0cc7f08810284" }, "catppuccin": { "branch": "main", "commit": "490078b1593c6609e6a50ad5001e7902ea601824" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-cmdline": { "branch": "main", "commit": "8ee981b4a91f536f52add291594e89fb6645e451" }, "cmp-nvim-lsp": { "branch": "main", "commit": "44b16d11215dce86f253ce0c30949813c0a90765" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, - "gitsigns.nvim": { "branch": "main", "commit": "bae45ef449d8811061cc940459e70e883a3aa83a" }, + "fidget.nvim": { "branch": "main", "commit": "0ba1e16d07627532b6cae915cc992ecac249fb97" }, + "gitsigns.nvim": { "branch": "main", "commit": "55f8fc7b13205d44359080ed00095674c353bd76" }, "indent-blankline.nvim": { "branch": "master", "commit": "b7aa0aed55887edfaece23f7b46ab22232fc8741" }, "lazy.nvim": { "branch": "main", "commit": "dac844ed617dda4f9ec85eb88e9629ad2add5e05" }, "lsp-format.nvim": { "branch": "master", "commit": "ca0df5c8544e51517209ea7b86ecc522c98d4f0a" }, - "lsp-status.nvim": { "branch": "master", "commit": "54f48eb5017632d81d0fd40112065f1d062d0629" }, "lspkind.nvim": { "branch": "master", "commit": "57610d5ab560c073c465d6faf0c19f200cb67e6e" }, "lualine.nvim": { "branch": "master", "commit": "45e27ca739c7be6c49e5496d14fcf45a303c3a63" }, "mason.nvim": { "branch": "main", "commit": "5ad3e113b0c3fde3caba8630599373046f6197e8" }, "nvim-autopairs": { "branch": "master", "commit": "ae5b41ce880a6d850055e262d6dfebd362bb276e" }, "nvim-cmp": { "branch": "main", "commit": "51f1e11a89ec701221877532ee1a23557d291dd5" }, - "nvim-lspconfig": { "branch": "master", "commit": "a981d4447b92c54a4d464eb1a76b799bc3f9a771" }, - "nvim-treesitter": { "branch": "master", "commit": "bc52938ddde0ff6b3d51ff215d2c66f2e39b7099" }, - "nvim-treesitter-context": { "branch": "master", "commit": "3d4ab25056dcaf6dd11ebacf1da8525c8df6550f" }, + "nvim-lspconfig": { "branch": "master", "commit": "0d29cad8de3b2c654315203fc1fe12fde722a18a" }, + "nvim-treesitter": { "branch": "master", "commit": "5f01ffd47843d5030001df81a83c2f9ea1c06d97" }, + "nvim-treesitter-context": { "branch": "master", "commit": "d8fd71428e02190d8f75ff915b6cca9e3063992c" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "9e519b6146512c8e2e702faf8ac48420f4f5deec" }, "nvim-web-devicons": { "branch": "master", "commit": "ab899311f8ae00a47eae8e0879506cead8eb1561" }, "oil.nvim": { "branch": "master", "commit": "0138a2e0f9baacd98d5531ebb5078fafc5114fae" }, "playground": { "branch": "master", "commit": "2b81a018a49f8e476341dfcb228b7b808baba68b" }, "plenary.nvim": { "branch": "master", "commit": "267282a9ce242bbb0c5dc31445b6d353bed978bb" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "9bc8237565ded606e6c366a71c64c0af25cd7a50" }, - "telescope.nvim": { "branch": "master", "commit": "2d92125620417fbea82ec30303823e3cd69e90e8" }, + "telescope.nvim": { "branch": "0.1.x", "commit": "776b509f80dd49d8205b9b0d94485568236d1192" }, "zk-nvim": { "branch": "main", "commit": "797618aa07f58ceba6f79fb6e777e8e45c51e1ce" } } \ No newline at end of file diff --git a/nvim/dot-config/nvim/lua/my/plugins.lua b/nvim/dot-config/nvim/lua/my/plugins.lua index 5958789..549a57b 100644 --- a/nvim/dot-config/nvim/lua/my/plugins.lua +++ b/nvim/dot-config/nvim/lua/my/plugins.lua @@ -12,10 +12,8 @@ return { event = "InsertEnter", dependencies = { "hrsh7th/cmp-buffer", - "hrsh7th/cmp-cmdline", "hrsh7th/cmp-nvim-lsp", "hrsh7th/cmp-path", - "L3MON4D3/LuaSnip", } }, { @@ -26,17 +24,44 @@ return { "nvim-treesitter/playground", } }, - { "catppuccin/nvim", name = "catppuccin" }, - { "stevearc/oil.nvim", tag = "v1.0.0" }, - { "williamboman/mason.nvim", tag = "v1.6.2" }, - { "lukas-reineke/indent-blankline.nvim", tag = "v2.20.7" }, - { "lukas-reineke/lsp-format.nvim", tag = "v2.5.1" }, - { "nvim-tree/nvim-web-devicons", lazy = true }, + { + "j-hui/fidget.nvim", + tag = "legacy", + event = "LspAttach", + opts = { + window = { + blend = 0, + }, + }, + }, + { + "williamboman/mason.nvim", + tag = "v1.6.2", + opts = {}, + }, + { + "windwp/nvim-autopairs", + event = "InsertEnter", + opts = {} + }, + { + "lukas-reineke/indent-blankline.nvim", + tag = "v2.20.7", + opts = { + char = "▏", + show_current_context = true, + buftype_exclude = { "help" }, + filetype_exclude = { "alpha", "startify", "packer", "NvimTree" }, + } + }, + { "catppuccin/nvim", name = "catppuccin" }, + { "stevearc/oil.nvim", tag = "v1.0.0" }, + { "lukas-reineke/lsp-format.nvim", tag = "v2.5.1" }, + { "nvim-tree/nvim-web-devicons", lazy = true }, + "L3MON4D3/LuaSnip", + "hrsh7th/cmp-cmdline", "lewis6991/gitsigns.nvim", - "mickael-menu/zk-nvim", "neovim/nvim-lspconfig", - "nvim-lua/lsp-status.nvim", "nvim-lualine/lualine.nvim", "onsails/lspkind.nvim", - "windwp/nvim-autopairs", }