mirror of
https://github.com/gabehf/nvim-conf.git
synced 2026-03-16 02:35:54 -07:00
rust support + YNPS v0.1
This commit is contained in:
parent
0d0df12d82
commit
b83b0f27a9
4 changed files with 72 additions and 63 deletions
|
|
@ -1,7 +1,7 @@
|
||||||
{
|
{
|
||||||
"Comment.nvim": { "branch": "master", "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" },
|
"Comment.nvim": { "branch": "master", "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" },
|
||||||
"LuaSnip": { "branch": "master", "commit": "be7be2ca7f55bb881a7ffc16b2efa5af034ab06b" },
|
"LuaSnip": { "branch": "master", "commit": "be7be2ca7f55bb881a7ffc16b2efa5af034ab06b" },
|
||||||
"NvChad": { "branch": "v2.5", "commit": "6833c60694a626615911e379d201dd723511546d" },
|
"NvChad": { "branch": "v2.5", "commit": "0b1f669caa312ca11be79b3833296d1271bf4c75" },
|
||||||
"base46": { "branch": "v2.5", "commit": "adb64a6ae70f8c61c5ab8892f07d29dafd4d47ad" },
|
"base46": { "branch": "v2.5", "commit": "adb64a6ae70f8c61c5ab8892f07d29dafd4d47ad" },
|
||||||
"cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
|
"cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
|
||||||
"cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" },
|
"cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" },
|
||||||
|
|
@ -10,8 +10,8 @@
|
||||||
"cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
|
"cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
|
||||||
"conform.nvim": { "branch": "master", "commit": "9d5ba06d6ee7418c674f498634617416d15b6239" },
|
"conform.nvim": { "branch": "master", "commit": "9d5ba06d6ee7418c674f498634617416d15b6239" },
|
||||||
"friendly-snippets": { "branch": "main", "commit": "ea068f1becd91bcd4591fceb6420d4335e2e14d3" },
|
"friendly-snippets": { "branch": "main", "commit": "ea068f1becd91bcd4591fceb6420d4335e2e14d3" },
|
||||||
"gitsigns.nvim": { "branch": "main", "commit": "1a50b94066def8591d5f65bd60a4233902e9def4" },
|
"gitsigns.nvim": { "branch": "main", "commit": "d96ef3bbff0bdbc3916a220f5c74a04c4db033f2" },
|
||||||
"go.nvim": { "branch": "master", "commit": "ae58327c9e894f6663bf43496063c167170b4ac3" },
|
"go.nvim": { "branch": "master", "commit": "591a0b837420f27c734600fa5c6de87f18352e50" },
|
||||||
"guihua.lua": { "branch": "master", "commit": "3b3126ae87c254f6849e708549ba76c39e3f42f8" },
|
"guihua.lua": { "branch": "master", "commit": "3b3126ae87c254f6849e708549ba76c39e3f42f8" },
|
||||||
"indent-blankline.nvim": { "branch": "master", "commit": "3d08501caef2329aba5121b753e903904088f7e6" },
|
"indent-blankline.nvim": { "branch": "master", "commit": "3d08501caef2329aba5121b753e903904088f7e6" },
|
||||||
"lazy.nvim": { "branch": "main", "commit": "31ddbea7c10b6920c9077b66c97951ca8682d5c8" },
|
"lazy.nvim": { "branch": "main", "commit": "31ddbea7c10b6920c9077b66c97951ca8682d5c8" },
|
||||||
|
|
@ -20,9 +20,9 @@
|
||||||
"nvim-autopairs": { "branch": "master", "commit": "4f41e5940bc0443fdbe5f995e2a596847215cd2a" },
|
"nvim-autopairs": { "branch": "master", "commit": "4f41e5940bc0443fdbe5f995e2a596847215cd2a" },
|
||||||
"nvim-cmp": { "branch": "main", "commit": "ce16de5665c766f39c271705b17fff06f7bcb84f" },
|
"nvim-cmp": { "branch": "main", "commit": "ce16de5665c766f39c271705b17fff06f7bcb84f" },
|
||||||
"nvim-colorizer.lua": { "branch": "master", "commit": "85855b38011114929f4058efc97af1059ab3e41d" },
|
"nvim-colorizer.lua": { "branch": "master", "commit": "85855b38011114929f4058efc97af1059ab3e41d" },
|
||||||
"nvim-lspconfig": { "branch": "master", "commit": "e25c4cdecd3d58c0deccce0f372426c8c480bcce" },
|
"nvim-lspconfig": { "branch": "master", "commit": "b3014f2209503944f2714cf27c95591433a0c7d8" },
|
||||||
"nvim-tree.lua": { "branch": "master", "commit": "81eb8d519233c105f30dc0a278607e62b20502fd" },
|
"nvim-tree.lua": { "branch": "master", "commit": "81eb8d519233c105f30dc0a278607e62b20502fd" },
|
||||||
"nvim-treesitter": { "branch": "master", "commit": "c16f66cca0c38b4e21371d8330b7f2ad6404f6dc" },
|
"nvim-treesitter": { "branch": "master", "commit": "ef267f0c285928ea3a0d3362a260a0728fd4a146" },
|
||||||
"nvim-web-devicons": { "branch": "master", "commit": "6e355632387a085f15a66ad68cf681c1d7374a04" },
|
"nvim-web-devicons": { "branch": "master", "commit": "6e355632387a085f15a66ad68cf681c1d7374a04" },
|
||||||
"plenary.nvim": { "branch": "master", "commit": "8aad4396840be7fc42896e3011751b7609ca4119" },
|
"plenary.nvim": { "branch": "master", "commit": "8aad4396840be7fc42896e3011751b7609ca4119" },
|
||||||
"telescope.nvim": { "branch": "master", "commit": "5a701e99906961218b55d7ad6c2a998f066c6fe0" },
|
"telescope.nvim": { "branch": "master", "commit": "5a701e99906961218b55d7ad6c2a998f066c6fe0" },
|
||||||
|
|
|
||||||
|
|
@ -5,10 +5,7 @@
|
||||||
local M = {}
|
local M = {}
|
||||||
|
|
||||||
M.ui = {
|
M.ui = {
|
||||||
theme = "chadracula",
|
theme = "your-pop-star",
|
||||||
changed_themes = {
|
|
||||||
chadracula = require "themes.your-pop-star",
|
|
||||||
},
|
|
||||||
hl_override = {
|
hl_override = {
|
||||||
Comment = { italic = true },
|
Comment = { italic = true },
|
||||||
["@comment"] = { italic = true },
|
["@comment"] = { italic = true },
|
||||||
|
|
|
||||||
|
|
@ -47,6 +47,13 @@ for _, lsp in ipairs(servers) do
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
|
|
||||||
|
-- rust
|
||||||
|
lspconfig.rust_analyzer.setup {
|
||||||
|
settings = {
|
||||||
|
["rust-analyzer"] = {},
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
-- typescript
|
-- typescript
|
||||||
lspconfig.tsserver.setup {
|
lspconfig.tsserver.setup {
|
||||||
on_attach = on_attach,
|
on_attach = on_attach,
|
||||||
|
|
|
||||||
|
|
@ -1,55 +1,60 @@
|
||||||
return {
|
local M = {}
|
||||||
base_16 = {
|
|
||||||
base00 = "#13121F", -- default bg
|
M.base_16 = {
|
||||||
base01 = "#312C5E", -- Lighter bg, line num, status bar, etc
|
base00 = "#13121F", -- default bg
|
||||||
base02 = "#2d294a", -- selection bg
|
base01 = "#312C5E", -- Lighter bg, line num, status bar, etc
|
||||||
base03 = "#222222", -- comments, line highlight
|
base02 = "#2d294a", -- selection bg
|
||||||
base04 = "#25233C", -- dark foreground (status bar)
|
base03 = "#826aed", -- comments, line highlight
|
||||||
base05 = "#ffffff", -- Default foreground, caret, delimeters, ops
|
base04 = "#25233C", -- dark foreground (status bar)
|
||||||
base06 = "#000000", -- Light foreground
|
base05 = "#f8f8f2", -- Default foreground, caret, delimeters, ops
|
||||||
base07 = "#aaaaaa", -- light background
|
base06 = "#000000", -- Light foreground
|
||||||
base08 = "#F066EC", -- vars, xml tag, markup links, diff delete
|
base07 = "#aaaaaa", -- light background
|
||||||
base09 = "#38F0E8", -- booleans, constants, ints
|
base08 = "#F066EC", -- vars, xml tag, markup links, diff delete
|
||||||
base0A = "#999999", -- classes, markup bold, search text bg
|
base09 = "#38F0E8", -- booleans, constants, ints, search text current
|
||||||
base0B = "#42F032", -- strings, inherited class, markup code, diff insert
|
base0A = "#00FFAB", -- classes, markup bold, search text bg
|
||||||
base0C = "#C9ECF5", -- support, regex, escape chars, markup quotes
|
base0B = "#42F032", -- strings, inherited class, markup code, diff insert
|
||||||
base0D = "#555555", -- funcs, methods, attr ids, headings, html inner text
|
base0C = "#C9ECF5", -- support, regex, escape chars, markup quotes, lua {}
|
||||||
base0E = "#ffe405", -- keywords, markup italic, diff changed
|
base0D = "#0CECDD", -- funcs, methods, attr ids, headings, html inner text
|
||||||
base0F = "#ffffff", -- lua comma, golang delimeter
|
base0E = "#ffe405", -- keywords, markup italic, diff changed
|
||||||
},
|
base0F = "#E3F6FF", -- lua comma, golang delimeter
|
||||||
base_30 = {
|
|
||||||
white = "#F8F8F2",
|
|
||||||
darker_black = "#19192c",
|
|
||||||
black = "#141423",
|
|
||||||
black2 = "#1c1c31",
|
|
||||||
one_bg = "#23233d",
|
|
||||||
one_bg2 = "#2b2b4c",
|
|
||||||
one_bg3 = "#373760",
|
|
||||||
grey = "#414171", -- line numbers
|
|
||||||
grey_fg = "#4b4b83", -- comments
|
|
||||||
grey_fg2 = "#555594",
|
|
||||||
light_grey = "#6060a4",
|
|
||||||
red = "#FF5ff5", -- changed git files,
|
|
||||||
baby_pink = "#FF6E6E",
|
|
||||||
pink = "#FF6BCB",
|
|
||||||
line = "#2D2D4E",
|
|
||||||
green = "#50FA7B",
|
|
||||||
vibrant_green = "#20E3B2",
|
|
||||||
nord_blue = "#05C3FF",
|
|
||||||
blue = "#2CCCFF",
|
|
||||||
yellow = "#F1FA8C", -- README nvim-tree
|
|
||||||
sun = "#F2FA95",
|
|
||||||
purple = "#BD93F9",
|
|
||||||
dark_purple = "#a166f6",
|
|
||||||
teal = "#92A2D4",
|
|
||||||
orange = "#FFB86C",
|
|
||||||
cyan = "#2CCCFF",
|
|
||||||
statusline_bg = "#19192c",
|
|
||||||
lightbg = "#2b2b4c",
|
|
||||||
pmenu_bg = "#9A86FD",
|
|
||||||
folder_bg = "#9A86FD",
|
|
||||||
violet = "#9A86FD",
|
|
||||||
darkgreen = "#1B312E",
|
|
||||||
brownred = "#5D2932",
|
|
||||||
},
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
M.base_30 = {
|
||||||
|
white = "#F8F8F2", -- active line num
|
||||||
|
darker_black = "#19192c",
|
||||||
|
black = "#141423",
|
||||||
|
black2 = "#1c1c31",
|
||||||
|
one_bg = "#23233d",
|
||||||
|
one_bg2 = "#2b2b4c",
|
||||||
|
one_bg3 = "#373760",
|
||||||
|
grey = M.base_16.base01, -- line numbers (STOP USING BASE30 FOR STUFF THAT BASE16 ALREADY DEFINED!!)
|
||||||
|
grey_fg = M.base_16.base03, -- comments (NVCHAD SHOULD REALLY NOT USE THIS SHIT FOR BASIC SYNTAX HL)
|
||||||
|
grey_fg2 = "#555594",
|
||||||
|
light_grey = "#6060a4",
|
||||||
|
red = "#FF5ff5", -- changed git files,
|
||||||
|
baby_pink = "#FF6E6E",
|
||||||
|
pink = "#FF6BCB",
|
||||||
|
line = "#2D2D4E",
|
||||||
|
green = "#50FA7B",
|
||||||
|
vibrant_green = "#20E3B2",
|
||||||
|
nord_blue = "#05C3FF",
|
||||||
|
blue = "#2CCCFF",
|
||||||
|
yellow = "#F1FA8C", -- README nvim-tree
|
||||||
|
sun = "#F2FA95",
|
||||||
|
purple = "#BD93F9",
|
||||||
|
dark_purple = "#a166f6",
|
||||||
|
teal = "#92A2D4",
|
||||||
|
orange = "#FFB86C",
|
||||||
|
cyan = "#2CCCFF",
|
||||||
|
statusline_bg = "#19192c",
|
||||||
|
lightbg = "#2b2b4c",
|
||||||
|
pmenu_bg = "#9A86FD",
|
||||||
|
folder_bg = "#9A86FD",
|
||||||
|
violet = "#9A86FD",
|
||||||
|
darkgreen = "#1B312E",
|
||||||
|
brownred = "#5D2932",
|
||||||
|
}
|
||||||
|
|
||||||
|
M.type = "dark"
|
||||||
|
|
||||||
|
return M
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue