Update config

2 files changed, 17 insertions, 15 deletions

diff --git a/.config/alacritty.toml b/.config/alacritty.toml
index ee277ae..50c70f0 100644
--- a/.config/alacritty.toml
+++ b/.config/alacritty.toml
@@ -3,13 +3,13 @@ dynamic_padding = true
 opacity = 1
 
 [font]
-normal      = {family="Fixed", style="Regular"}
-bold        = {family="Fixed", style="Bold"}
-italic      = {family="Fixed", style="Italic"}
-bold_italic = {family="Fixed", style="Bold Italic"}
+normal      = {family="CommitMono", style="Regular"}
+bold        = {family="CommitMono", style="Bold"}
+italic      = {family="CommitMono", style="Italic"}
+bold_italic = {family="CommitMono", style="Bold Italic"}
 offset.x = 0
 offset.y = 0
-size = 10.5
+size = 12
 
 [colors]
 draw_bold_text_with_bright_colors = true
diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua
index 7cc90f9..4cf8c56 100644
--- a/.config/nvim/init.lua
+++ b/.config/nvim/init.lua
@@ -3,20 +3,22 @@ vim.o.termguicolors = true
 vim.o.relativenumber = true
 vim.o.number = true
 vim.o.cc = "80"
-vim.o.swapfile = false
+vim.o.updatetime = 1000
 vim.o.splitright = true
 vim.o.splitbelow = true
 vim.o.winborder = "bold"
 vim.o.signcolumn = "no"
+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.g.mapleader = " "
 vim.g.qs_highlight_on_keys = {"f", "F", "t", "T"}
 
 vim.pack.add({
-  "https://github.com/ibhagwan/fzf-lua",
   "https://github.com/neovim/nvim-lspconfig",
   "https://github.com/WTFox/jellybeans.nvim",
 })
@@ -27,8 +29,6 @@ for _, plugin in ipairs(vim.pack.get()) do
   end
 end
 
-require("fzf-lua").setup(require("fzf-lua.profiles.telescope"))
-
 -- Switch between semantically related files easily :)
 local exts = {{"c", "h"}, {"cc", "hh"}, {"frag", "vert"}}
 vim.keymap.set("n", "<leader>s", function()
@@ -45,17 +45,18 @@ vim.keymap.set("n", "<leader>s", function()
   print("no files to swap to")
 end)
 
-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.keymap.set("n", "<C-z>", "<Nop>")
+vim.keymap.set("n", "<C-p>", ":find ")
+vim.keymap.set("n", "<C-f>", ":grep ")
 
 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 opts = {silent=true, buffer=ev.buf}
+    vim.keymap.set("n", "gD", function() vim.lsp.buf.declaration() end, opts)
+    vim.keymap.set("n", "gd", function() vim.lsp.buf.definition() end, opts)
     local client = vim.lsp.get_client_by_id(ev.data.client_id)
     local chars = {}
     for i = 32, 126 do
@@ -68,5 +69,6 @@ vim.api.nvim_create_autocmd("LspAttach", {
   end,
 })
 
-vim.cmd.colorscheme("mine")
+vim.cmd.colorscheme("jellybeans")
 vim.api.nvim_set_hl(0, "ColorColumn", {bg="#222222"})
+vim.api.nvim_set_hl(0, "NormalFloat", {link="Normal"})