diff options
Diffstat (limited to '.config/nvim')
| -rw-r--r-- | .config/nvim/colors/mine.lua | 10 | ||||
| -rw-r--r-- | .config/nvim/init.lua | 59 |
2 files changed, 24 insertions, 45 deletions
diff --git a/.config/nvim/colors/mine.lua b/.config/nvim/colors/mine.lua index 06fd8f1..ccdf48d 100644 --- a/.config/nvim/colors/mine.lua +++ b/.config/nvim/colors/mine.lua @@ -44,7 +44,7 @@ local colors = { ["Identifier"] = {fg="#FFFFFF"}, ["Function"] = {fg="#5599EE"}, - ["Statement"] = {fg="#FF4499"}, + ["Statement"] = {fg="#FF4499", bold=true}, ["Label"] = {fg="#FF9944"}, ["Operator"] = {fg="#AAAABB"}, @@ -70,12 +70,12 @@ local colors = { ["@function.builtin"] = {link="Function"}, ["@attribute.builtin"] = {link="@attribute"}, - ["@keyword.repeat"] = {fg="#DD66FF"}, - ["@keyword.conditional"] = {fg="#FF66DD"}, + ["@keyword.repeat"] = {fg="#DD66FF", bold=true}, + ["@keyword.conditional"] = {fg="#FF99CC", bold=true}, ["@variable"] = {fg="#CCCCCC"}, ["@variable.parameter.builtin"] = {link="@variable.builtin"}, - ["@variable.parameter"] = {fg="#CCCCCC", italic=true}, + ["@variable.parameter"] = {fg="#EDEDED", italic=true}, ["@variable.builtin"] = {fg="#DD66FF", italic=true}, ["@variable.member"] = {fg="#9999FF"}, @@ -83,7 +83,7 @@ local colors = { ["@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"}, + ["@lsp.typemod.variable.global"] = {fg="#FFDD66", italic=true}, } for k, v in pairs(colors) do diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index baffd53..7cc90f9 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -1,7 +1,4 @@ ---@diagnostic disable: undefined-global - -local ns = vim.api.nvim_create_namespace("mine") - vim.o.termguicolors = true vim.o.relativenumber = true vim.o.number = true @@ -10,31 +7,27 @@ vim.o.swapfile = false vim.o.splitright = true vim.o.splitbelow = true vim.o.winborder = "bold" -vim.o.signcolumn = "yes" -vim.o.guicursor = -"n-v:block,i-c:ver25,r-cr:hor100,i-r-c:blinkon100,i-r-c:blinkoff100,n-v:blinkon0" +vim.o.signcolumn = "no" vim.o.tabstop = 2 vim.o.shiftwidth = 0 vim.o.expandtab = true vim.o.completeopt = "menu,menuone,noselect" - vim.g.mapleader = " " vim.g.qs_highlight_on_keys = {"f", "F", "t", "T"} vim.pack.add({ - {src="https://github.com/ibhagwan/fzf-lua"}, - {src="https://github.com/williamboman/mason.nvim"}, - {src="https://github.com/neovim/nvim-lspconfig"}, - {src="https://github.com/nvim-treesitter/nvim-treesitter"}, - {src="https://github.com/unblevable/quick-scope"}, + "https://github.com/ibhagwan/fzf-lua", + "https://github.com/neovim/nvim-lspconfig", + "https://github.com/WTFox/jellybeans.nvim", }) -require("mason").setup({}) +for _, plugin in ipairs(vim.pack.get()) do + if not plugin.active then + vim.pack.del({plugin.path:match(".*/(.*)$")}) + end +end + require("fzf-lua").setup(require("fzf-lua.profiles.telescope")) -require("nvim-treesitter.configs").setup( - {ensure_installed = {"lua", "c"}, - highlight = {enable=true} -}) -- Switch between semantically related files easily :) local exts = {{"c", "h"}, {"cc", "hh"}, {"frag", "vert"}} @@ -50,28 +43,17 @@ vim.keymap.set("n", "<leader>s", function() end end print("no files to swap to") -end, {}) - -vim.keymap.set("n", "<leader>e", ":Ex<CR>", {}) --- I'm constantly hitting this and I hate it -vim.keymap.set("n", "<C-z>", "<Nop>", {}) -vim.keymap.set("n", "<C-p>", function() FzfLua.files({}) end, {}) -vim.keymap.set("n", "<C-f>", function() FzfLua.grep() end, {}) -vim.keymap.set("n", "gf", ":vert wincmd f<CR>", {silent=true}) -vim.keymap.set("n", "<leader>b", ":ToScratch<CR>", {silent=true}) +end) --- open up the current buffer in a scratch buffer -vim.api.nvim_create_user_command("ToScratch", function() - local linec = vim.api.nvim_buf_line_count(0) - local lines = vim.api.nvim_buf_get_lines(0, 0, linec, false) - local buf = vim.api.nvim_create_buf(false, true) - vim.api.nvim_set_option_value( - "filetype", vim.api.nvim_get_option_value("filetype", {buf=0}), {buf=buf}) - vim.api.nvim_buf_set_lines(buf, 0, linec, false, lines) - vim.api.nvim_open_win(buf, false, {split="below", win=0}) -end, {nargs=0}) +vim.keymap.set("n", "<leader>e", ":Ex<CR>") +-- I accidentally hit this when I'm incrementing and decrementing numbers +vim.keymap.set("n", "<C-z>", "<Nop>") +vim.keymap.set("n", "<C-p>", function() FzfLua.files({}) end) +vim.keymap.set("n", "<C-f>", function() FzfLua.live_grep() end) +vim.keymap.set("t", "<esc><esc>", "<C-\\><C-n>") vim.lsp.enable({"lua_ls", "clangd"}) +vim.diagnostic.config({virtual_text=true, severity_sort=true}) vim.api.nvim_create_autocmd("LspAttach", { callback = function(ev) local client = vim.lsp.get_client_by_id(ev.data.client_id) @@ -85,9 +67,6 @@ vim.api.nvim_create_autocmd("LspAttach", { end end, }) -vim.diagnostic.config({virtual_text=true, severity_sort=true}) vim.cmd.colorscheme("mine") -vim.api.nvim_set_hl(0, "Normal", {bg="none"}) -vim.api.nvim_set_hl(0, "QuickScopePrimary", {fg="#FFFFFF", bg="#1166F3", underline=true}) -vim.api.nvim_set_hl(0, "QuickScopeSecondary", {fg="none", bg="#333333", underline=true}) +vim.api.nvim_set_hl(0, "ColorColumn", {bg="#222222"}) |