From af9c9162a2c528d89e6560aa2fe0d37017208f6f Mon Sep 17 00:00:00 2001
From: Elizabeth Hunt <elizabeth@simponic.xyz>
Date: Sun, 15 Dec 2024 16:09:37 -0800
Subject: [PATCH] oceanic next for vim

---
 .config/alacritty/light.toml                   |  2 +-
 .config/nvim/lazy-lock.json                    |  3 ++-
 .config/nvim/lua/plugins/configs/lspconfig.lua |  2 +-
 .config/nvim/lua/plugins/init.lua              |  1 +
 .config/nvim/lua/theme.lua                     | 15 ++++++++-------
 .emacs.d/settings.org                          |  2 +-
 6 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/.config/alacritty/light.toml b/.config/alacritty/light.toml
index e004855..61b8d1e 100644
--- a/.config/alacritty/light.toml
+++ b/.config/alacritty/light.toml
@@ -1,4 +1,4 @@
-import = [
+general.import = [
   "~/.config/alacritty/catppucin-latte.toml",
   "~/.config/alacritty/config.toml"
 ]
diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json
index 66ac5e6..873f251 100644
--- a/.config/nvim/lazy-lock.json
+++ b/.config/nvim/lazy-lock.json
@@ -22,6 +22,7 @@
   "nvim-tree.lua": { "branch": "master", "commit": "82ab19ebf79c1839d7351f2fed213d1af13a598e" },
   "nvim-treesitter": { "branch": "master", "commit": "38c12cb9ac8e1c547a8472c87df9e9d7c8b1af0d" },
   "nvim-web-devicons": { "branch": "master", "commit": "19d257cf889f79f4022163c3fbb5e08639077bd8" },
+  "oceanic-next": { "branch": "master", "commit": "09833f72d5ba23de2e8bcae18f479f326f5f677a" },
   "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" },
   "telescope.nvim": { "branch": "master", "commit": "85922dde3767e01d42a08e750a773effbffaea3e" }
-}
\ No newline at end of file
+}
diff --git a/.config/nvim/lua/plugins/configs/lspconfig.lua b/.config/nvim/lua/plugins/configs/lspconfig.lua
index de71c52..274d460 100644
--- a/.config/nvim/lua/plugins/configs/lspconfig.lua
+++ b/.config/nvim/lua/plugins/configs/lspconfig.lua
@@ -64,7 +64,7 @@ lspconfig.lua_ls.setup {
 }
 
 -- setup multiple servers with same default options
-local servers = { "tsserver", "html", "cssls" }
+local servers = { "ts_ls", "html", "cssls" }
 
 for _, lsp in ipairs(servers) do
   lspconfig[lsp].setup {
diff --git a/.config/nvim/lua/plugins/init.lua b/.config/nvim/lua/plugins/init.lua
index a8468ef..8174e4e 100644
--- a/.config/nvim/lua/plugins/init.lua
+++ b/.config/nvim/lua/plugins/init.lua
@@ -2,6 +2,7 @@ local plugins = {
   { lazy = true, "nvim-lua/plenary.nvim" },
 
   { "catppuccin/nvim", name = "catppuccin", priority = 1000 },
+  { "mhartington/oceanic-next", name = "oceanic-next", priority = 1000 },
 
   -- file tree
   {
diff --git a/.config/nvim/lua/theme.lua b/.config/nvim/lua/theme.lua
index b5864c3..4cdcdc2 100644
--- a/.config/nvim/lua/theme.lua
+++ b/.config/nvim/lua/theme.lua
@@ -7,13 +7,14 @@ function Set_theme_at(path)
   theme = theme:gsub("%s+", "")
   f:close()
   vim.schedule(function()
-    if (theme == "light") then
-      vim.api.nvim_set_option("background", "light")
-      vim.cmd("colorscheme catppuccin-latte")
-    else
-      vim.api.nvim_set_option("background", "dark")
-      vim.cmd("colorscheme catppuccin-mocha")
-    end
+    vim.cmd("colorscheme OceanicNext")
+--    if (theme == "light") then
+--      vim.api.nvim_set_option("background", "light")
+--      vim.cmd("colorscheme catppuccin-latte")
+--    else
+--      vim.api.nvim_set_option("background", "dark")
+--      vim.cmd("colorscheme catppuccin-mocha")
+--    end
   end)
 end
 
diff --git a/.emacs.d/settings.org b/.emacs.d/settings.org
index f934f0c..a3056fa 100644
--- a/.emacs.d/settings.org
+++ b/.emacs.d/settings.org
@@ -169,7 +169,7 @@
     (global-ligature-mode t))
 #+END_SRC
 
-** Highlight indent guid
+** Highlight indent guides
 #+BEGIN_SRC emacs-lisp
   (use-package :highlight-indent-guides
     :ensure t