aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcrupest <crupest@outlook.com>2023-10-18 23:41:11 +0800
committercrupest <crupest@outlook.com>2023-10-18 23:41:11 +0800
commit376f33a464c5b4d3dfd48c36a48443126c004f82 (patch)
tree0fcf550ee66d469693470af852ca3319a79bee64
parentc94c7655878e549b5886d69b62edd5f0e5587223 (diff)
downloadcrupest-376f33a464c5b4d3dfd48c36a48443126c004f82.tar.gz
crupest-376f33a464c5b4d3dfd48c36a48443126c004f82.tar.bz2
crupest-376f33a464c5b4d3dfd48c36a48443126c004f82.zip
Update nvim config: Bring back gitsigns.
-rw-r--r--configs/nvim/init.lua12
-rw-r--r--configs/nvim/lazy-lock.json27
-rw-r--r--configs/nvim/lua/crupest/nvim/lsp/rust.lua13
-rw-r--r--configs/nvim/lua/plugins.lua1
4 files changed, 37 insertions, 16 deletions
diff --git a/configs/nvim/init.lua b/configs/nvim/init.lua
index e8987f7..d924b73 100644
--- a/configs/nvim/init.lua
+++ b/configs/nvim/init.lua
@@ -5,6 +5,7 @@ end
if vim.g.neovide then
-- spellchecker: disable-next-line
vim.opt.guifont = "CaskaydiaCove Nerd Font";
+ vim.g.neovide_refresh_rate = 60;
vim.g.neovide_transparency = 0.98;
vim.g.neovide_input_ime = false;
vim.g.neovide_cursor_vfx_mode = "ripple";
@@ -68,9 +69,9 @@ vim.cmd("colorscheme everforest")
require("neo-tree").setup({
filesystem = {
filtered_items = {
- hide_dotfiles = true,
- hide_gitignored = true,
- hide_hidden = true, -- only works on Windows for hidden files/directories
+ hide_dotfiles = false,
+ hide_gitignored = false,
+ hide_hidden = false, -- only works on Windows for hidden files/directories
},
use_libuv_file_watcher = true
}
@@ -92,6 +93,9 @@ require("toggleterm").setup {
-- setup autopairs
require("nvim-autopairs").setup {}
+-- setup gitsigns
+require('gitsigns').setup()
+
-- setup formatter
local formatter = require("crupest.nvim.plugins.formatter")
formatter.setup_formatter()
@@ -138,6 +142,8 @@ require("crupest.nvim.lsp.c").setup_lsp_c()
require("crupest.nvim.lsp.lua").setup_lsp_lua()
require("crupest.nvim.lsp.frontend").setup_lsp_frontend()
require("crupest.nvim.lsp.csharp").setup_lsp_csharp()
+-- There is some problem of rust analyzer.
+-- require("crupest.nvim.lsp.rust").setup_lsp_rust()
-- Use LspAttach autocommand to only map the following keys
-- after the language server attaches to the current buffer
diff --git a/configs/nvim/lazy-lock.json b/configs/nvim/lazy-lock.json
index 1ecb8f5..5069f37 100644
--- a/configs/nvim/lazy-lock.json
+++ b/configs/nvim/lazy-lock.json
@@ -1,23 +1,24 @@
{
- "LuaSnip": { "branch": "master", "commit": "480b032f6708573334f4437d3f83307d143f1a72" },
+ "LuaSnip": { "branch": "master", "commit": "80a8528f084a97b624ae443a6f50ff8074ba486b" },
"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" },
- "cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" },
+ "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
"everforest": { "branch": "master", "commit": "83b666410d7ae0eccf96dbbe3b4b6ac5b8172d38" },
"formatter.nvim": { "branch": "master", "commit": "34dcdfa0c75df667743b2a50dd99c84a557376f0" },
- "lazy.nvim": { "branch": "main", "commit": "59335c5b9d116f5d3948f833288a89e2a829a005" },
- "lualine.nvim": { "branch": "master", "commit": "45e27ca739c7be6c49e5496d14fcf45a303c3a63" },
- "neo-tree.nvim": { "branch": "main", "commit": "7e2a3caf999e2028abb643eb0472f351b2777591" },
- "nui.nvim": { "branch": "main", "commit": "c8de23342caf8d50b15d6b28368d36a56a69d76f" },
- "nvim-autopairs": { "branch": "master", "commit": "de4f7138a68d5d5063170f2182fd27faf06b0b54" },
- "nvim-cmp": { "branch": "main", "commit": "5dce1b778b85c717f6614e3f4da45e9f19f54435" },
- "nvim-lint": { "branch": "master", "commit": "1065763f115a7765ef237347ad676ba348d7193a" },
- "nvim-lspconfig": { "branch": "master", "commit": "361a2878a41f23452457eec12a807ff59bc75882" },
- "nvim-web-devicons": { "branch": "master", "commit": "45d0237c427baba8cd05e0ab26d30e2ee58c2c82" },
+ "gitsigns.nvim": { "branch": "main", "commit": "5a9a6ac29a7805c4783cda21b80a1e361964b3f2" },
+ "lazy.nvim": { "branch": "main", "commit": "4c75c8eeb957a99aa44ce8e526c04340ab358c5e" },
+ "lualine.nvim": { "branch": "master", "commit": "7533b0ead663d80452210c0c089e5105089697e5" },
+ "neo-tree.nvim": { "branch": "main", "commit": "63ebe879ad4798b66d29c0b2c8d04942389d438e" },
+ "nui.nvim": { "branch": "main", "commit": "c0c8e347ceac53030f5c1ece1c5a5b6a17a25b32" },
+ "nvim-autopairs": { "branch": "master", "commit": "f6c71641f6f183427a651c0ce4ba3fb89404fa9e" },
+ "nvim-cmp": { "branch": "main", "commit": "d3a3056204e1a9dbb7c7fe36c114dc43b681768c" },
+ "nvim-lint": { "branch": "master", "commit": "7c8b50a2bb62b544eb91434fd008a34c4b51fd6d" },
+ "nvim-lspconfig": { "branch": "master", "commit": "e49b1e90c1781ce372013de3fa93a91ea29fc34a" },
+ "nvim-web-devicons": { "branch": "master", "commit": "3af745113ea537f58c4b1573b64a429fefad9e07" },
"omnisharp-extended-lsp.nvim": { "branch": "main", "commit": "53edfb413a54c9e55dcddc9e9fa4977a897e4425" },
- "plenary.nvim": { "branch": "master", "commit": "9ce85b0f7dcfe5358c0be937ad23e456907d410b" },
- "telescope.nvim": { "branch": "master", "commit": "8c69f58427f98b2ca39a90a36db830c06e30351c" },
+ "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" },
+ "telescope.nvim": { "branch": "master", "commit": "74ce793a60759e3db0d265174f137fb627430355" },
"toggleterm.nvim": { "branch": "main", "commit": "c80844fd52ba76f48fabf83e2b9f9b93273f418d" }
} \ No newline at end of file
diff --git a/configs/nvim/lua/crupest/nvim/lsp/rust.lua b/configs/nvim/lua/crupest/nvim/lsp/rust.lua
new file mode 100644
index 0000000..219fc12
--- /dev/null
+++ b/configs/nvim/lua/crupest/nvim/lsp/rust.lua
@@ -0,0 +1,13 @@
+local lspconfig = require("lspconfig")
+local capabilities = require("cmp_nvim_lsp").default_capabilities()
+
+
+local function setup_lsp_rust()
+ lspconfig.rust_analyzer.setup {
+ capabilities = capabilities,
+ }
+end
+
+return {
+ setup_lsp_rust = setup_lsp_rust
+}
diff --git a/configs/nvim/lua/plugins.lua b/configs/nvim/lua/plugins.lua
index f692a3d..0cca1ef 100644
--- a/configs/nvim/lua/plugins.lua
+++ b/configs/nvim/lua/plugins.lua
@@ -22,6 +22,7 @@ return {
"mhartington/formatter.nvim",
"mfussenegger/nvim-lint",
"akinsho/toggleterm.nvim",
+ "lewis6991/gitsigns.nvim",
{
"nvim-neo-tree/neo-tree.nvim",
dependencies = {