From bd8817673bf475d91370d41bc204d9d3129a2562 Mon Sep 17 00:00:00 2001
From: Noah Pederson <noah.pederson@coldquanta.com>
Date: Tue, 17 Sep 2024 11:47:15 -0500
Subject: [PATCH] Fixes for nvim

---
 nvim/init.lua        |  8 +-------
 nvim/lua/plugins.lua | 39 ++++++++++++++++++++++++++++++---------
 2 files changed, 31 insertions(+), 16 deletions(-)

diff --git a/nvim/init.lua b/nvim/init.lua
index b5c0bf7..e0812c5 100644
--- a/nvim/init.lua
+++ b/nvim/init.lua
@@ -4,9 +4,6 @@ vim.g.maplocalleader = ","
 -- These need to happend before we load plugins
 -- Load Plugins
 require("plugins")
--- Color Scheme
-vim.cmd.colorscheme "noirbuddy"
--- vim.cmd([[colorscheme kanagawa]])
 -- Config for Nord, which I usually use
 -- vim.g.nord_italic = false
 -- vim.g.nord_bold = false
@@ -27,10 +24,6 @@ vim.opt.number = false
 vim.opt.relativenumber = false
 -- I don't like word wrapping
 vim.opt.wrap = false
-vim.opt.mouse = vim.opt.mouse - "a"
--- TODO: revisit this
---vim.opt.foldlevelstart = 20
---vim.opt.conceallevel = 3
 -- Show whitespace as dots
 vim.opt.lcs = vim.opt.lcs + "space:·"
 vim.opt.list = true
@@ -113,6 +106,7 @@ keymap("n", "<leader>hs", "<cmd>split<cr>", noremap)
 
 -- Toggle Line Numbers
 keymap("n", "<leader>n", "<cmd>set number! number?<CR>", silentnoremap)
+keymap("n", "<leader>N", "<cmd>set relativenumber! relativenumber?<CR>", silentnoremap)
 
 -- Edit this file
 keymap("n", "<leader>ec", "<cmd>e $MYVIMRC<CR>", silentnoremap)
diff --git a/nvim/lua/plugins.lua b/nvim/lua/plugins.lua
index 17069b9..d605555 100644
--- a/nvim/lua/plugins.lua
+++ b/nvim/lua/plugins.lua
@@ -44,7 +44,10 @@ require("lazy").setup({
             priority = 1000,
             opts = {
                 -- All of your `setup(opts)` will go here
-                preset = "slate",
+                preset = "oxide",
+                colors = {
+                    noir_8 = "#3A4649"
+                }
             },
         },
         -- Completion
@@ -146,8 +149,20 @@ require("lazy").setup({
         },
         {
             "nvim-lualine/lualine.nvim",
-            config = true,
-            dependencies = { "nvim-tree/nvim-web-devicons" }
+            config = function(_spec, _opt)
+                local noirbuddy_lualine = require("noirbuddy.plugins.lualine")
+                require("lualine").setup {
+                    options = {
+                        icons_enabled = true,
+                        -- when not using noirbuddy, uncomment this
+                        --theme = "auto"
+                        theme = noirbuddy_lualine.theme
+                    },
+                    sections = noirbuddy_lualine.sections,
+                    inactive_sections = noirbuddy_lualine.inactive_sections,
+                }
+            end,
+            dependencies = { "nvim-tree/nvim-web-devicons", "jesseleite/nvim-noirbuddy" }
         },
         -- Fuzzy finding stuff
         "junegunn/fzf.vim",
@@ -371,18 +386,24 @@ require("lazy").setup({
             ft = { "rust" }
         },                                         -- RISC-V Assembly syntax highlighting
         { "kylelaker/riscv.vim",   ft = "riscv" }, -- Hare Stuff
+        -- Hare stuff
         -- Haredoc
         {
             url = "https://git.sr.ht/~torresjrjr/vim-haredoc",
             lazy = true,
             ft = { "hare" },
             branch = "dev"
-        },                                                                                -- Hare.vim
-        { url = "https://git.sr.ht/~sircmpwn/hare.vim", ft = { "hare" } },                -- TCL
-        { "lewis6991/tree-sitter-tcl",                  lazy = true,    build = "make" }, -- LF
-        { "ptzz/lf.vim",                                lazy = true,    cmd = { "Lf" },
-                                                                                            dependencies = {
-                "voldikss/vim-floaterm" } },
+        },
+        { url = "https://git.sr.ht/~sircmpwn/hare.vim", ft = { "hare" } },
+        -- TCL
+        { "lewis6991/tree-sitter-tcl",                  lazy = true,    build = "make" },
+        -- LF
+        {
+            "ptzz/lf.vim",
+            lazy = true,
+            cmd = { "Lf" },
+            dependencies = { "voldikss/vim-floaterm" }
+        },
         -- SuperMaven, another AI coding tool
         {
             "supermaven-inc/supermaven-nvim",
-- 
2.51.2