aboutsummaryrefslogtreecommitdiff
path: root/.config
diff options
context:
space:
mode:
Diffstat (limited to '.config')
-rw-r--r--.config/alacritty.toml2
-rw-r--r--.config/nvim/colors/xeno-yellow.lua8
-rw-r--r--.config/nvim/init.lua41
-rw-r--r--.config/nvim/nvim-pack-lock.json16
4 files changed, 52 insertions, 15 deletions
diff --git a/.config/alacritty.toml b/.config/alacritty.toml
index 50c70f0..d4598bd 100644
--- a/.config/alacritty.toml
+++ b/.config/alacritty.toml
@@ -16,7 +16,7 @@ draw_bold_text_with_bright_colors = true
[colors.primary]
foreground = "#FFFFFF"
-background = "#1A191C"
+background = "#161617"
[colors.normal]
black = "#333333"
diff --git a/.config/nvim/colors/xeno-yellow.lua b/.config/nvim/colors/xeno-yellow.lua
new file mode 100644
index 0000000..465ba94
--- /dev/null
+++ b/.config/nvim/colors/xeno-yellow.lua
@@ -0,0 +1,8 @@
+require("xeno").setup({
+ base = "#11100f",
+ accent = "#FFCC33",
+ variation = 0.0,
+ contrast = 0.1,
+ transparent = false,
+})
+vim.g.colors_name = "xeno-yellow"
diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua
index 4cf8c56..14d659b 100644
--- a/.config/nvim/init.lua
+++ b/.config/nvim/init.lua
@@ -6,21 +6,23 @@ vim.o.cc = "80"
vim.o.updatetime = 1000
vim.o.splitright = true
vim.o.splitbelow = true
-vim.o.winborder = "bold"
-vim.o.signcolumn = "no"
+vim.o.signcolumn = "no" -- diagnostics are already inline
vim.o.ignorecase = true
vim.o.tabstop = 2
vim.o.shiftwidth = 0
vim.o.expandtab = true
-vim.o.completeopt = "menu,menuone,noselect"
vim.o.undofile = true
-vim.opt.path:append("**")
+vim.o.scrolloff = 3
+vim.o.winborder = "bold"
+vim.o.mouse = ""
+vim.o.completeopt = "menu,menuone,noselect"
+
vim.g.mapleader = " "
-vim.g.qs_highlight_on_keys = {"f", "F", "t", "T"}
vim.pack.add({
"https://github.com/neovim/nvim-lspconfig",
- "https://github.com/WTFox/jellybeans.nvim",
+ "https://github.com/nvim-mini/mini.pick",
+ "https://github.com/wesleimp/min-theme.nvim",
})
for _, plugin in ipairs(vim.pack.get()) do
@@ -29,6 +31,10 @@ for _, plugin in ipairs(vim.pack.get()) do
end
end
+require("mini.pick").setup()
+
+vim.keymap.set("n", "<leader>f", ":Pick files tool='rg'<CR>")
+
-- Switch between semantically related files easily :)
local exts = {{"c", "h"}, {"cc", "hh"}, {"frag", "vert"}}
vim.keymap.set("n", "<leader>s", function()
@@ -45,13 +51,18 @@ vim.keymap.set("n", "<leader>s", function()
print("no files to swap to")
end)
--- I accidentally hit this when I'm incrementing and decrementing numbers
--- vim.keymap.set("n", "<C-z>", "<Nop>")
-vim.keymap.set("n", "<C-p>", ":find ")
-vim.keymap.set("n", "<C-f>", ":grep ")
+-- toggle inlay hints
+vim.keymap.set("n", "<leader>h", function()
+ vim.lsp.inlay_hint.enable(
+ not vim.lsp.inlay_hint.is_enabled({bufnr=0}),
+ {bufnr=0})
+end)
-vim.lsp.enable({"lua_ls", "clangd"})
-vim.diagnostic.config({virtual_text=true, severity_sort=true})
+vim.lsp.enable({"lua_ls", "clangd", "zls"})
+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}
@@ -69,6 +80,8 @@ vim.api.nvim_create_autocmd("LspAttach", {
end,
})
-vim.cmd.colorscheme("jellybeans")
-vim.api.nvim_set_hl(0, "ColorColumn", {bg="#222222"})
+vim.cmd.colorscheme("min-dark")
vim.api.nvim_set_hl(0, "NormalFloat", {link="Normal"})
+vim.api.nvim_set_hl(0, "LineNr", {link="Pmenu"})
+
+require('vim._extui').enable({})
diff --git a/.config/nvim/nvim-pack-lock.json b/.config/nvim/nvim-pack-lock.json
new file mode 100644
index 0000000..10d937d
--- /dev/null
+++ b/.config/nvim/nvim-pack-lock.json
@@ -0,0 +1,16 @@
+{
+ "plugins": {
+ "min-theme.nvim": {
+ "rev": "90f6cfe",
+ "src": "https://github.com/wesleimp/min-theme.nvim"
+ },
+ "mini.pick": {
+ "rev": "96ee37d",
+ "src": "https://github.com/nvim-mini/mini.pick"
+ },
+ "nvim-lspconfig": {
+ "rev": "e688b48",
+ "src": "https://github.com/neovim/nvim-lspconfig"
+ }
+ }
+} \ No newline at end of file