diff --git a/.config/nushell/env.nu b/.config/nushell/env.nu index 855aa1d..76aa312 100644 --- a/.config/nushell/env.nu +++ b/.config/nushell/env.nu @@ -1,2 +1,3 @@ $env.EDITOR = "nvim" $env.GOPATH = $"($env.HOME)/.go" +$env.LANG = "en_US.UTF-8" diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json index 0a6e8f8..db734f4 100644 --- a/.config/nvim/lazy-lock.json +++ b/.config/nvim/lazy-lock.json @@ -5,22 +5,22 @@ "cmp-nvim-lsp": { "branch": "main", "commit": "44b16d11215dce86f253ce0c30949813c0a90765" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "flash.nvim": { "branch": "main", "commit": "967117690bd677cb7b6a87f0bc0077d2c0be3a27" }, - "gitsigns.nvim": { "branch": "main", "commit": "79127db3b127f5d125f35e0d44ba60715edf2842" }, + "gitsigns.nvim": { "branch": "main", "commit": "d8590288417fef2430f85bc8b312fae8b1cf2c40" }, "lazy.nvim": { "branch": "main", "commit": "2a9354c7d2368d78cbd5575a51a2af5bd8a6ad01" }, - "neodev.nvim": { "branch": "main", "commit": "0d210aa340ec9840ac963938bf1b5d06cfdf67dc" }, + "neodev.nvim": { "branch": "main", "commit": "183f5a7357397260b631d6cccceccc3621b50f78" }, "noice.nvim": { "branch": "main", "commit": "791c7adda821fd03529f995df2ee284ad591dabd" }, - "nui.nvim": { "branch": "main", "commit": "9e3916e784660f55f47daa6f26053ad044db5d6a" }, + "nui.nvim": { "branch": "main", "commit": "0f913a3ae1a24c8a4487fbf111b4044cc22b1b0d" }, "nvim-cmp": { "branch": "main", "commit": "5dce1b778b85c717f6614e3f4da45e9f19f54435" }, "nvim-lspconfig": { "branch": "master", "commit": "a27356f1ef9c11e1f459cc96a3fcac5c265e72d6" }, "nvim-notify": { "branch": "master", "commit": "ea9c8ce7a37f2238f934e087c255758659948e0f" }, "nvim-spectre": { "branch": "master", "commit": "411cee67fe3f8242023eb8d9edafefbbfb2d06f1" }, "nvim-tree.lua": { "branch": "master", "commit": "00741206c2df9c4b538055def19b99790f0c95c8" }, - "nvim-treesitter": { "branch": "master", "commit": "cb74c1c5aefd8b903f1b547d08d4df42be07aa2a" }, + "nvim-treesitter": { "branch": "master", "commit": "6def3eea22c213a475fc42644cd48c924b67a03f" }, "nvim-web-devicons": { "branch": "master", "commit": "cfc8824cc1db316a276b36517f093baccb8e799a" }, "nvterm": { "branch": "main", "commit": "5ae78fb332e92447121d2af58a6313189a7799fb" }, "onedark.nvim": { "branch": "master", "commit": "7bd3558c17045b95c961d28861c1b3bd9bdc992a" }, "plenary.nvim": { "branch": "master", "commit": "0dbe561ae023f02c2fb772b879e905055b939ce3" }, "telescope-project.nvim": { "branch": "master", "commit": "7c64b181dd4e72deddcf6f319e3bf1e95b2a2f30" }, - "telescope.nvim": { "branch": "master", "commit": "207285ccec21b69996a4d3bcfa59df35d48610e8" }, + "telescope.nvim": { "branch": "master", "commit": "1dfa66b845673effc8771f9ebe511bb36a09f560" }, "trouble.nvim": { "branch": "main", "commit": "40aad004f53ae1d1ba91bcc5c29d59f07c5f01d3" } } \ No newline at end of file diff --git a/.config/nvim/lua/config/keys.lua b/.config/nvim/lua/config/keys.lua index c7d4c51..283f50c 100644 --- a/.config/nvim/lua/config/keys.lua +++ b/.config/nvim/lua/config/keys.lua @@ -22,10 +22,12 @@ map("v", "<", "", ">gv") -- LSP -map("n", "gr", vim.lsp.buf.references, "Get references") -map("n", "gd", vim.lsp.buf.definition, "Get definition") -map({ "n", "i" }, "", vim.lsp.buf.hover, "Show information") +map("n", "gr", vim.lsp.buf.references, "References") +map("n", "gd", vim.lsp.buf.definition, "Definition") +map({ "n", "i" }, "", vim.lsp.buf.hover, "Hover") +map("n", "", vim.lsp.buf.rename, "Rename") map({ "n", "i" }, "", vim.lsp.buf.format, "Format") +map("n", "ca", vim.lsp.buf.code_action, "Code action") -- Package manager map("n", "l", "Lazy", "Lazy") diff --git a/.config/nvim/lua/config/settings.lua b/.config/nvim/lua/config/settings.lua index f944711..8f183f5 100644 --- a/.config/nvim/lua/config/settings.lua +++ b/.config/nvim/lua/config/settings.lua @@ -43,5 +43,5 @@ opt.fillchars = { eob = " ", vert = " " } opt.laststatus = 0 opt.number = true opt.relativenumber = false -opt.signcolumn = "yes:1" +opt.signcolumn = "number" opt.statusline = "%{repeat('─',winwidth('.'))}" diff --git a/.config/nvim/lua/plugins/tree.lua b/.config/nvim/lua/plugins/tree.lua index c3dcf3c..e80e06a 100644 --- a/.config/nvim/lua/plugins/tree.lua +++ b/.config/nvim/lua/plugins/tree.lua @@ -15,7 +15,20 @@ return { dotfiles = false, }, renderer = { - root_folder_label = false + root_folder_label = false, + highlight_git = true, + icons = { + show = { + git = false, + }, + glyphs = { + git = { + unstaged = "", + untracked = "", + deleted = "", + }, + }, + }, }, sync_root_with_cwd = true, update_focused_file = {