mira/nvim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix lunar witch, plugins

Browse source
This commit is contained in:
Mira Kristipati 2024-06-25 10:44:22 -04:00
parent cddbfdc5e9
commit ba85f279ae
3 changed files with 70 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lua/mappings.lua
View file

@ -143,4 +143,7 @@ M.Obsidian = function()
return require("obsidian").util.toggle_checkbox() return require("obsidian").util.toggle_checkbox()
end, { desc = "obsidian Toggle Checkmark", "opts = { buffer = trueue, remap = true }" }) end, { desc = "obsidian Toggle Checkmark", "opts = { buffer = trueue, remap = true }" })
end end
M.Trouble = function()
map("n", "<leader>dx", "<cmd>Trouble diagnostics toggle<cr>", { desc = "Trouble Diagnostics" })
end
return M return M

34
lua/plugins.lua
View file

@ -131,7 +131,7 @@ return {
"nvim-treesitter/nvim-treesitter", "nvim-treesitter/nvim-treesitter",
opts = overrides.treesitter, opts = overrides.treesitter,
dependencies = { dependencies = {
-- NOTE: additional parser -- additional parser
{ "nushell/tree-sitter-nu" }, { "nushell/tree-sitter-nu" },
}, },
}, },
@ -140,19 +140,24 @@ return {
"nvim-tree/nvim-tree.lua", "nvim-tree/nvim-tree.lua",
opts = overrides.nvimtree, opts = overrides.nvimtree,
}, },
-- Diagnostics
-- Syntax Highlighting
{ {
"nvim-treesitter/nvim-treesitter", "folke/trouble.nvim",
-- TODO: config = function()
opts = overrides.treesitter, require("trouble").setup()
mappings.Trouble()
end,
}, },
-- File manager -- todo Highlights
{ {
"nvim-tree/nvim-tree.lua", "folke/todo-comments.nvim",
opts = overrides.nvimtree, dependencies = { "nvim-lua/plenary.nvim", "folke/trouble.nvim" },
config = function()
require("todo-comments").setup()
end,
lazy = false,
}, },
-- TODO: look into this
{ {
"max397574/better-escape.nvim", "max397574/better-escape.nvim",
event = "InsertEnter", event = "InsertEnter",
@ -161,7 +166,14 @@ return {
end, end,
}, },
{ "zbirenbaum/copilot.lua", event = "InsertEnter", lazy = false }, {
"zbirenbaum/copilot.lua",
event = "InsertEnter",
lazy = false,
config = function()
require("copilot").setup()
end,
},
-- Nyoom around files -- Nyoom around files
{ {
"smoka7/hop.nvim", "smoka7/hop.nvim",

89
lua/themes/lunar_witch.lua
View file

@ -1,66 +1,65 @@
local M = {} local M = {}
M.base_30 = { M.base_30 = {
black = "#010206",-- theme bg black = "#010206", -- theme bg
darker_black = "#000000", darker_black = "#000000",
black2 = "#2A2644", -- base02 black2 = "#504573", -- base02
one_bg = "#1E1B30", -- base01 one_bg = "#1e1b30", -- base01
one_bg2 = "#2A2644", -- base02 one_bg2 = "#504573", -- base02
one_bg3 = "#51545A", -- base03 one_bg3 = "#746e95", -- base03
light_grey = "#BFBFC0", -- base05 light_grey = "#c1c7db", -- base05
grey_fg = "#51545A", -- base04, used for comments grey_fg = "#9a9ab8", -- base04, used for comments
grey = "#5078A4", -- accent grey = "#1a538d", -- accent
grey_fg2 = "#0B5393", -- light accent, used for line numbers grey_fg2 = "#5078a4", -- light accent, used for line numbers
line = "#2A2644", -- base02 line = "#504573", -- base02
baby_pink = "#F385A6", -- pink baby_pink = "#f3709a", -- pink
nord_blue = "#0B5393", -- accent nord_blue = "#1a538d", -- accent
orange = "#F4B766", orange = "#eaa950",
statusline_bg = "#1E1B30", -- base01 statusline_bg = "#1e1b30", -- base01
lightbg = "#2a2644", -- base02 lightbg = "#504573", -- base02
lightbg2 = "#2a2644", -- base02 lightbg2 = "#504573", -- base02
folder_bg = "#445F9B", -- ansi-blue folder_bg = "#334773", -- ansi-blue
pmenu_bg = "#445F9B", -- ansi-blue pmenu_bg = "#334773", -- ansi-blue
red = "#A04558", red = "#a04558",
green = "#6FA47E", green = "#76aa73",
yellow = "#E0CA00", yellow = "#ad9d3d",
dark_purple = "#9B4271", --ansi-magenta dark_purple = "#a34a78", --ansi-magenta
teal = "#2A97B1", -- ansi-cyan teal = "#2a97b1", -- ansi-cyan
pink = "#F5A9B8", --ansi-bright-red pink = "#ed8096", --ansi-bright-red
vibrant_green = "#98DB95", --ansi-bright-green vibrant_green = "#a0dc9b", --ansi-bright-green
sun = "#ffe70a", -- ansi-bright-yellow sun = "#c1b254", -- ansi-bright-yellow
blue = "#445F9B", --ansi-bright-blue blue = "#445f9b", --ansi-bright-blue
purple = "#ee5e95", --ansi-bright-magenta purple = "#ee5e95", --ansi-bright-magenta
cyan = "#5BCEFA", --ansi-bright-cyan cyan = "#5bcefa", --ansi-bright-cyan
white = "#ebf6ff", -- actually fg white = "#ebf6ff", -- actually fg
} }
M.base_16 = { M.base_16 = {
base00 = "#010206",-- Default bg base00 = "#010206", -- Default bg
base01 = "#1E1B30",-- Lighter bg (status bar, line number, folding mks) base01 = "#1e1b30", -- Lighter bg (status bar, line number, folding mks)
base02 = "#2A2644",-- Selection bg, base02 = "#504573", -- Selection bg,
base03 = "#51545A",-- Comments, invisibles, line hl, ansi-bright-black base03 = "#746e95", -- Comments, invisibles, line hl, ansi-bright-black
base04 = "#808082",-- Dark fg (status bars), ansi-white base04 = "#9a9ab8", -- Dark fg (status bars), ansi-white
base05 = "#BFBFC0",-- Default fg (caret, delimiters, Operators), ansi-bright-white base05 = "#c1c7db", -- Default fg (caret, delimiters, Operators), ansi-bright-white
base06 = "#EBF6FF",-- Light fg (not often used), fg base06 = "#ebf6ff", -- Light fg (not often used), fg
base07 = "#F0F2FF",-- Light bg (not often used) base07 = "#fbfbff", -- Light bg (not often used)
base08 = "#F5A9B8",-- Variables, XML Tags, Markup Link Text, Markup Lists, Diff Deleted, ansi-bright-red base08 = "#ed8096", -- Variables, XML Tags, Markup Link Text, Markup Lists, Diff Deleted, ansi-bright-red
base09 = "#F4B766",-- Integers, Boolean, Constants, XML Attributes, Markup Link Url, orange base09 = "#eaa950", -- Integers, Boolean, Constants, XML Attributes, Markup Link Url, orange
base0A = "#E0CA00",-- Classes, Markup Bold, Search Text Background, ansi-yellow base0A = "#c1b254", -- Classes, Markup Bold, Search Text Background, ansi-yellow
base0B = "#98DB95",-- Strings, Inherited Class, Markup Code, Diff Inserted, ansi-green base0B = "#a0dc9b", -- Strings, Inherited Class, Markup Code, Diff Inserted, ansi-green
base0C = "#2A97B1",-- Support, regex, escape chars, ansi-cyan base0C = "#2a97b1", -- Support, regex, escape chars, ansi-cyan
base0D = "#5BCEFA",-- Function, methods, headings, ansi-bright-cyan base0D = "#5bcefa", -- Function, methods, headings, ansi-bright-cyan
base0E = "#EE5E95",-- Keywords, ansi-bright-magenta base0E = "#ee5e95", -- Keywords, ansi-bright-magenta
base0F = "#A34A78",-- Deprecated, open/close embedded tags, ansi-magenta base0F = "#a34a78", -- Deprecated, open/close embedded tags, ansi-magenta
} }
M.type = "dark" M.type = "dark"