aboutsummaryrefslogtreecommitdiff
path: root/.config/nvim
diff options
context:
space:
mode:
Diffstat (limited to '.config/nvim')
-rw-r--r--.config/nvim/colors/mine.lua91
-rw-r--r--.config/nvim/colors/mini-theme.lua82
-rw-r--r--.config/nvim/init.lua23
3 files changed, 16 insertions, 180 deletions
diff --git a/.config/nvim/colors/mine.lua b/.config/nvim/colors/mine.lua
deleted file mode 100644
index 48af24b..0000000
--- a/.config/nvim/colors/mine.lua
+++ /dev/null
@@ -1,91 +0,0 @@
----@diagnostic disable: undefined-global
-
-vim.cmd("hi clear")
-
-vim.g.colors_name = "mine"
-vim.g.background = "dark"
-
-local colors = {
- ["Terminal"] = {link="Normal"},
- ["TermCursor"] = {link="Cursor"},
- ["TermCursorNC"] = {link="Cursor"},
- ["CurSearch"] = {link="Search"},
- ["CursorLineFold"] = {link="CursorLine"},
- ["CursorLineSign"] = {link="CursorLine"},
- ["MessageWindow"] = {link="Pmenu"},
- ["PopupNotification"] = {link="Todo"},
- ["Character"] = {link="String"},
- ["FloatBorder"] = {link="NormalFloat"},
- ["NormalFloat"] = {link="Normal"},
-
- ["ModeMsg"] = {fg="#FF88CC", bold=true},
- ["StatusLine"] = {fg="#000000", bg="#AA66DD"},
- ["StatusLineNC"] = {fg="#FFFFFF"},
- ["ColorColumn"] = {bg="#333333"},
- ["WinSeparator"] = {fg="#222222"},
- ["CursorLine"] = {bg="#222222"},
- ["EndOfBuffer"] = {fg="#222222"},
- ["LineNr"] = {fg="#CCCCCC"},
- ["LineNrAbove"] = {fg="#888888"},
- ["LineNrBelow"] = {fg="#888888"},
- ["MatchParen"] = {fg="#EE66AA", bold=true},
- ["Normal"] = {fg="#AAAAAA", bg="#1A191C"},
- ["Pmenu"] = {fg="#FFFFFF", bg="#333333"},
- ["PmenuSel"] = {fg="#333333", bg="#FFFFFF", bold=true},
- ["Search"] = {fg="#333333", bg="#FFFF88", bold=true},
- ["Visual"] = {bg="#333333"},
-
- ["Comment"] = {fg="#777777", italic=true},
-
- ["Constant"] = {fg="#44FF99"},
- ["Number"] = {fg="#44FF99"},
- ["String"] = {fg="#FFFF00"},
- ["Boolean"] = {fg="#44FF99"},
-
- ["Identifier"] = {fg="#FFFFFF"},
- ["Function"] = {fg="#5599EE"},
- ["Statement"] = {fg="#FF4499"},
- ["Label"] = {fg="#FF9944"},
-
- -- ["Operator"] = {link="Normal"},
-
- ["PreProc"] = {fg="#FF4499"},
- ["Typedef"] = {fg="#AA7FFF"},
- ["Type"] = {fg="#AA7FFF"},
-
- ["StorageClass"] = {fg="#4499FF"},
- ["Structure"] = {fg="#4499FF"},
-
- ["Special"] = {fg="#CCCCDD"},
- ["SpecialChar"] = {fg="#FFFFFF", bold=true},
-
- ["Error"] = {fg="#FF4444", bold=true, undercurl=true},
- ["Todo"] = {fg="#FFFFFF", bold=true, undercurl=true},
- ["Added"] = {fg="#44FF44"},
- ["Changed"] = {fg="#FFFF44"},
- ["Removed"] = {fg="#FF4444"},
-
- ["@constant.builtin"] = {link="Constant"},
- ["@type.builtin"] = {link="Type"},
- ["@function.builtin"] = {link="Function"},
- ["@attribute.builtin"] = {link="@attribute"},
-
- ["@keyword.repeat"] = {fg="#DD66FF"},
- ["@keyword.conditional"] = {fg="#FF66DD"},
-
- ["@variable"] = {fg="#CCCCCC"},
- ["@variable.parameter.builtin"] = {link="@variable.builtin"},
- ["@variable.parameter"] = {fg="#CCCCCC", italic=true},
- ["@variable.builtin"] = {fg="#DD66FF", italic=true},
- ["@variable.member"] = {fg="#9999FF"},
-
- ["@lsp.type.variable"] = {fg="none"},
- ["@lsp.type.parameter"] = {link="@variable.parameter"},
- ["@lsp.type.enumMember"] = {link="Constant"},
- ["@lsp.typemod.variable.static"] = {link="@lsp.typemod.variable.global"},
- ["@lsp.typemod.variable.global"] = {fg="#FFDD66"},
-}
-
-for k, v in pairs(colors) do
- vim.api.nvim_set_hl(0, k, v)
-end
diff --git a/.config/nvim/colors/mini-theme.lua b/.config/nvim/colors/mini-theme.lua
deleted file mode 100644
index 0d706dc..0000000
--- a/.config/nvim/colors/mini-theme.lua
+++ /dev/null
@@ -1,82 +0,0 @@
----@diagnostic disable: undefined-global
-
-vim.cmd("hi clear")
-
-vim.g.colors_name = "mine"
-vim.g.background = "dark"
-
-local colors = {
- ["Terminal"] = {link="Normal"},
- ["TermCursor"] = {link="Cursor"},
- ["TermCursorNC"] = {link="Cursor"},
- ["CurSearch"] = {link="Search"},
- ["CursorLineFold"] = {link="CursorLine"},
- ["CursorLineSign"] = {link="CursorLine"},
- ["MessageWindow"] = {link="Pmenu"},
- ["PopupNotification"] = {link="Todo"},
- ["Character"] = {link="String"},
- ["FloatBorder"] = {link="NormalFloat"},
- ["NormalFloat"] = {link="Normal"},
-
- ["ModeMsg"] = {fg="#FF88CC", bold=true},
- ["StatusLine"] = {fg="#000000", bg="#AA66DD"},
- ["StatusLineNC"] = {fg="#FFFFFF"},
- ["ColorColumn"] = {bg="#121115"},
- ["WinSeparator"] = {fg="#222222"},
- ["CursorLine"] = {bg="#222222"},
- ["EndOfBuffer"] = {fg="#222222"},
- ["LineNr"] = {fg="#CCCCCC", bg="#121115"},
- ["LineNrAbove"] = {fg="#888888", bg="#121115"},
- ["LineNrBelow"] = {fg="#888888", bg="#121115"},
- ["SignColumn"] = {fg="#888888", bg="#121115"},
- ["MatchParen"] = {fg="#EE66AA", bold=true},
- ["Normal"] = {fg="#AAAAAA", bg="#1A191C"},
- ["Pmenu"] = {fg="#FFFFFF", bg="#333333"},
- ["PmenuSel"] = {fg="#333333", bg="#FFFFFF", bold=true},
- ["Search"] = {fg="#333333", bg="#FFFF88", bold=true},
- ["Visual"] = {bg="#333333"},
-
- ["Comment"] = {fg="#88DEDE", italic=true},
-
- ["Constant"] = {fg="#DDDD66"--[[, bg="#272620"]]},
- ["Number"] = {link="Constant"},
- ["String"] = {link="Constant"},
- ["Boolean"] = {link="Constant"},
-
- ["Function"] = {fg="#9999EE", bold=true},
- ["Identifier"] = {link="Normal"},
- ["Statement"] = {bold=true},
- ["Label"] = {link="Normal"},
-
- ["Operator"] = {link="Normal"},
-
- ["Special"] = {fg="#CCCCDD"},
- ["SpecialChar"] = {fg="#FFFFFF"},
-
- ["Error"] = {fg="#FF4444", undercurl=true},
-
- ["@punctuation"] = {link="Operator"},
-
- ["@constant.builtin"] = {link="@constant"},
-
- ["@constructor"] = {link="Normal"},
-
- ["@lsp.typemod.function.declaration"] = {link="Function"},
- ["@lsp.type.function"] = {link="@function.call"},
- ["@lsp.type.method"] = {link="@function.call"},
- ["@lsp.type.function.lua"] = {link="@function.call"},
- ["@function.builtin"] = {link="@function.call"},
- ["@function.method.call"] = {link="@function.call"},
- ["@function.call"] = {fg="#9999EE"},
-
- ["@variable"] = {link="Normal"},
- -- ["@variable"] = {fg="#ff0000"},
- ["@variable.builtin"] = {link="@variable"},
-
- ["@module"] = {link="Normal"},
- ["@module.builtin"] = {link="@module"},
-}
-
-for k, v in pairs(colors) do
- vim.api.nvim_set_hl(0, k, v)
-end
diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua
index 301f329..286740d 100644
--- a/.config/nvim/init.lua
+++ b/.config/nvim/init.lua
@@ -6,7 +6,7 @@ vim.o.cc = "80"
vim.o.updatetime = 1000
vim.o.splitright = true
vim.o.splitbelow = true
-vim.o.signcolumn = "yes"
+vim.o.signcolumn = "no"
vim.o.ignorecase = true
vim.o.tabstop = 2
vim.o.shiftwidth = 0
@@ -22,6 +22,7 @@ vim.g.mapleader = " "
vim.pack.add({
"https://github.com/neovim/nvim-lspconfig",
"https://github.com/nvim-mini/mini.pick",
+ "https://github.com/stevearc/oil.nvim",
{src="https://github.com/nvim-treesitter/nvim-treesitter", version="main"},
})
@@ -39,14 +40,20 @@ require("mini.pick").setup({
},
})
+require("oil").setup({
+ view_options = {show_hidden=true},
+})
+
require("nvim-treesitter").install({"c", "cpp", "lua", "odin", "vim", "vimdoc"})
require("nvim-treesitter").setup()
vim.api.nvim_create_autocmd("FileType", {
pattern = "odin",
- callback = function() vim.treesitter.start() end
+ callback = function() vim.treesitter.start() end,
})
+vim.keymap.set("t", "<esc><esc>", "<C-\\><C-n>")
+vim.keymap.set("n", "<leader>t", ":hori term<CR>:resize 20<CR>")
vim.keymap.set("n", "<leader>f", ":Pick files tool='rg'<CR>")
-- Switch between semantically related files easily :)
@@ -107,10 +114,10 @@ vim.keymap.set("n", "<leader>o", function()
end)
vim.lsp.enable({"lua_ls", "clangd", "ols"})
--- vim.diagnostic.config({
--- virtual_text = true,
--- severity_sort = true,
--- })
+vim.diagnostic.config({
+ virtual_text = true,
+ severity_sort = true,
+})
vim.api.nvim_create_autocmd("LspAttach", {
callback = function(ev)
local opts = {silent=true, buffer=ev.buf}
@@ -128,6 +135,8 @@ vim.api.nvim_create_autocmd("LspAttach", {
end,
})
-vim.cmd.colorscheme("mini-theme")
+vim.cmd.colorscheme("lunaperche")
+
+vim.api.nvim_create_user_command("Ex", "Oil", {})
-- require('vim._extui').enable({})
generated by cgit v1.3-2-g0d8e (git 2.53.0) at 2026-06-06 11:09:32 +0000