From c5c4cf52159aaab16a5af76c54db2ffac238bad5 Mon Sep 17 00:00:00 2001 From: A_train63 Date: Wed, 20 Sep 2023 14:01:07 -0700 Subject: [PATCH] change config --- init.lua | 10 ---------- lua/core/keymaps.lua | 1 + lua/core/options.lua | 12 ++++++++++++ lua/plugins/alpha-nvim.lua | 7 +++++++ lua/plugins/lsp.lua | 12 +++++++++++- lua/plugins/misc.lua | 2 +- lua/plugins/neo-tree.lua | 3 +++ lua/plugins/telescope.lua | 3 +++ 8 files changed, 38 insertions(+), 12 deletions(-) create mode 100644 lua/plugins/alpha-nvim.lua diff --git a/init.lua b/init.lua index 605751d..86bd0dc 100644 --- a/init.lua +++ b/init.lua @@ -7,13 +7,3 @@ require("core.keymaps") -- Other options require("core.options") -vim.api.nvim_set_hl(0, "String", { fg = "#9ece6a", underline = false, bold = false }) -vim.api.nvim_set_hl(0, "Type", { fg = "#00ff00", underline = false, bold = false }) -vim.api.nvim_set_hl(0, "@lsp.type.selfKeyword.rust", {fg = "#b00202", bold = true, underline=false}) -vim.api.nvim_set_hl(0, "Identifier", { fg = "#ffffff", underline = false, bold = false }) -vim.api.nvim_set_hl(0, "Function", { fg = "#025fb0", underline = false, bold = false }) -vim.api.nvim_set_hl(0, "@lsp.typemod.variable.constant.rust", { fg = "#00ff00", underline = false, bold = false }) -vim.api.nvim_set_hl(0, "@lsp.type.interface", {fg = "#a402b0", bold = true, underline=false}) -vim.api.nvim_set_hl(0, "Comment", {fg = "#989898", bold = false, underline=false}) -vim.api.nvim_set_hl(0, "NvimTreeGitDirty", {fg = "#ffaa00", bold = false, underline=false}) -vim.api.nvim_set_hl(0, "@string.escape", {fg = "#aa00ff", bold = false, underline=false}) diff --git a/lua/core/keymaps.lua b/lua/core/keymaps.lua index d5fcdb8..b4132fe 100644 --- a/lua/core/keymaps.lua +++ b/lua/core/keymaps.lua @@ -6,6 +6,7 @@ map("n", "fa", "wa", "Write all") map("n", "qq", "q", "Quit") map("n", "qa", "qa!", "Quit all") map("n", "dw", "close", "Window") +map("n", ";", "A;", "places \";\" at end of line") -- Diagnostic keymaps map('n', 'gx', vim.diagnostic.open_float, "Show diagnostics under cursor") diff --git a/lua/core/options.lua b/lua/core/options.lua index d9c6d45..a263d3a 100644 --- a/lua/core/options.lua +++ b/lua/core/options.lua @@ -16,3 +16,15 @@ end -- Set other options local colorscheme = require("helpers.colorscheme") vim.cmd.colorscheme(colorscheme) + +vim.api.nvim_set_hl(0, "String", { fg = "#9ece6a", underline = false, bold = false }) +vim.api.nvim_set_hl(0, "Type", { fg = "#00ff00", underline = false, bold = false }) +vim.api.nvim_set_hl(0, "@lsp.type.selfKeyword.rust", {fg = "#b00202", bold = true, underline=false}) +vim.api.nvim_set_hl(0, "Identifier", { fg = "#ffffff", underline = false, bold = false }) +vim.api.nvim_set_hl(0, "Function", { fg = "#025fb0", underline = false, bold = false }) +vim.api.nvim_set_hl(0, "@lsp.typemod.variable.constant.rust", { fg = "#00ff00", underline = false, bold = false }) +vim.api.nvim_set_hl(0, "@lsp.type.interface", {fg = "#a402b0", bold = true, underline=false}) +vim.api.nvim_set_hl(0, "Comment", {fg = "#989898", bold = false, underline=false}) +vim.api.nvim_set_hl(0, "NvimTreeGitDirty", {fg = "#ffaa00", bold = false, underline=false}) +vim.api.nvim_set_hl(0, "@string.escape", {fg = "#aa00ff", bold = false, underline=false}) +vim.api.nvim_set_hl(0, "@type.builtin", {fg = "#00ff00", bold = false, underline=false}) diff --git a/lua/plugins/alpha-nvim.lua b/lua/plugins/alpha-nvim.lua new file mode 100644 index 0000000..24400a6 --- /dev/null +++ b/lua/plugins/alpha-nvim.lua @@ -0,0 +1,7 @@ +return { + 'goolord/alpha-nvim', + dependencies = { 'nvim-tree/nvim-web-devicons' }, + config = function () + require'alpha'.setup(require'alpha.themes.dashboard'.config) + end +} diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua index 8e3a539..c39d65d 100644 --- a/lua/plugins/lsp.lua +++ b/lua/plugins/lsp.lua @@ -9,6 +9,7 @@ return { "folke/neodev.nvim", "RRethy/vim-illuminate", "hrsh7th/cmp-nvim-lsp", + "simrat39/rust-tools.nvim", }, config = function() -- Set up Mason before anything else @@ -31,7 +32,7 @@ return { require("fidget").setup() -- Set up cool signs for diagnostics - local signs = { Error = " ", Warn = " ", Hint = " ", Info = " " } + local signs = { Error = "󰂭 ", Warn = " ", Hint = " ", Info = " " } for type, icon in pairs(signs) do local hl = "DiagnosticSign" .. type vim.fn.sign_define(hl, { text = icon, texthl = hl, numhl = "" }) @@ -138,6 +139,15 @@ return { }, }, }) + local rt = require("rust-tools") + rt.setup({ + server = { + on_attach= function(_, bufnr) + vim.keymap.set("n", "", rt.hover_actions.hover_actions, {buffer = bufnr}) + vim.keymap.set("n", "a", rt.code_action_group.code_action_group, {buffer = bufnr}) + end, + }, + }) end, }, } diff --git a/lua/plugins/misc.lua b/lua/plugins/misc.lua index c90210e..f9780df 100644 --- a/lua/plugins/misc.lua +++ b/lua/plugins/misc.lua @@ -38,11 +38,11 @@ return { }, { "simrat39/symbols-outline.nvim", - cmd = "SymbolsOutline", config = function () vim.keymap.set('n', 't', 'SymbolsOutline') end }, + "simrat39/rust-tools.nvim", } diff --git a/lua/plugins/neo-tree.lua b/lua/plugins/neo-tree.lua index 3f2c7f2..188d8fb 100644 --- a/lua/plugins/neo-tree.lua +++ b/lua/plugins/neo-tree.lua @@ -10,6 +10,9 @@ return { }, config = function() require("neo-tree").setup({ + default_component_configs = { git_status = { symbols = { + unstaged = "󰄱", + }}}, close_if_last_window=true, filesystem = { filtered_items = { diff --git a/lua/plugins/telescope.lua b/lua/plugins/telescope.lua index 37eab7b..a26cc8f 100644 --- a/lua/plugins/telescope.lua +++ b/lua/plugins/telescope.lua @@ -39,6 +39,9 @@ return { map("n", "sw", require("telescope.builtin").grep_string, "Current word") map("n", "sg", require("telescope.builtin").live_grep, "Grep") map("n", "sd", require("telescope.builtin").diagnostics, "Diagnostics") + map("n", "sC", require("telescope.builtin").colorscheme, "Colorscheme") + map("n", "sk", require("telescope.builtin").keymaps, "Keymaps") + map("n", "sH", require("telescope.builtin").highlights, "Highlight groups") map("n", "", require("telescope.builtin").keymaps, "Search keymaps") end,