change config

This commit is contained in:
A_train63 2023-09-20 14:01:07 -07:00
parent 59a277ad3f
commit c5c4cf5215
8 changed files with 38 additions and 12 deletions

View File

@ -7,13 +7,3 @@ require("core.keymaps")
-- Other options -- Other options
require("core.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})

View File

@ -6,6 +6,7 @@ map("n", "<leader>fa", "<cmd>wa<cr>", "Write all")
map("n", "<leader>qq", "<cmd>q<cr>", "Quit") map("n", "<leader>qq", "<cmd>q<cr>", "Quit")
map("n", "<leader>qa", "<cmd>qa!<cr>", "Quit all") map("n", "<leader>qa", "<cmd>qa!<cr>", "Quit all")
map("n", "<leader>dw", "<cmd>close<cr>", "Window") map("n", "<leader>dw", "<cmd>close<cr>", "Window")
map("n", ";", "A;<Esc>", "places \";\" at end of line")
-- Diagnostic keymaps -- Diagnostic keymaps
map('n', 'gx', vim.diagnostic.open_float, "Show diagnostics under cursor") map('n', 'gx', vim.diagnostic.open_float, "Show diagnostics under cursor")

View File

@ -16,3 +16,15 @@ end
-- Set other options -- Set other options
local colorscheme = require("helpers.colorscheme") local colorscheme = require("helpers.colorscheme")
vim.cmd.colorscheme(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})

View File

@ -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
}

View File

@ -9,6 +9,7 @@ return {
"folke/neodev.nvim", "folke/neodev.nvim",
"RRethy/vim-illuminate", "RRethy/vim-illuminate",
"hrsh7th/cmp-nvim-lsp", "hrsh7th/cmp-nvim-lsp",
"simrat39/rust-tools.nvim",
}, },
config = function() config = function()
-- Set up Mason before anything else -- Set up Mason before anything else
@ -31,7 +32,7 @@ return {
require("fidget").setup() require("fidget").setup()
-- Set up cool signs for diagnostics -- 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 for type, icon in pairs(signs) do
local hl = "DiagnosticSign" .. type local hl = "DiagnosticSign" .. type
vim.fn.sign_define(hl, { text = icon, texthl = hl, numhl = "" }) 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", "<C-space>", rt.hover_actions.hover_actions, {buffer = bufnr})
vim.keymap.set("n", "<Leader>a", rt.code_action_group.code_action_group, {buffer = bufnr})
end,
},
})
end, end,
}, },
} }

View File

@ -38,11 +38,11 @@ return {
}, },
{ {
"simrat39/symbols-outline.nvim", "simrat39/symbols-outline.nvim",
cmd = "SymbolsOutline",
config = function () config = function ()
vim.keymap.set('n', '<leader>t', '<cmd>SymbolsOutline<cr>') vim.keymap.set('n', '<leader>t', '<cmd>SymbolsOutline<cr>')
end end
}, },
"simrat39/rust-tools.nvim",
} }

View File

@ -10,6 +10,9 @@ return {
}, },
config = function() config = function()
require("neo-tree").setup({ require("neo-tree").setup({
default_component_configs = { git_status = { symbols = {
unstaged = "󰄱",
}}},
close_if_last_window=true, close_if_last_window=true,
filesystem = { filesystem = {
filtered_items = { filtered_items = {

View File

@ -39,6 +39,9 @@ return {
map("n", "<leader>sw", require("telescope.builtin").grep_string, "Current word") map("n", "<leader>sw", require("telescope.builtin").grep_string, "Current word")
map("n", "<leader>sg", require("telescope.builtin").live_grep, "Grep") map("n", "<leader>sg", require("telescope.builtin").live_grep, "Grep")
map("n", "<leader>sd", require("telescope.builtin").diagnostics, "Diagnostics") map("n", "<leader>sd", require("telescope.builtin").diagnostics, "Diagnostics")
map("n", "<leader>sC", require("telescope.builtin").colorscheme, "Colorscheme")
map("n", "<leader>sk", require("telescope.builtin").keymaps, "Keymaps")
map("n", "<leader>sH", require("telescope.builtin").highlights, "Highlight groups")
map("n", "<C-p>", require("telescope.builtin").keymaps, "Search keymaps") map("n", "<C-p>", require("telescope.builtin").keymaps, "Search keymaps")
end, end,