From 8456e321a93823e2006503b734c9701fbb0e2fd3 Mon Sep 17 00:00:00 2001
From: Shadow Cat <shadowcatzero@protonmail.com>
Date: Fri, 24 Feb 2023 05:58:24 -0500
Subject: [PATCH] changed theme, added C-6 mapping, need to figure out how to
 load deno or node depending on project

---
 lua/config/mappings.lua |  3 +++
 lua/config/theme.lua    | 12 ++++++------
 lua/plugins/lsp.lua     | 18 +++++++++++++-----
 lua/plugins/util.lua    | 25 +++++++++++--------------
 lua/plugins/visual.lua  |  9 +++++----
 5 files changed, 38 insertions(+), 29 deletions(-)

diff --git a/lua/config/mappings.lua b/lua/config/mappings.lua
index ed3d3f2..0d32b21 100644
--- a/lua/config/mappings.lua
+++ b/lua/config/mappings.lua
@@ -22,6 +22,9 @@ m.nmap("[d", vim.diagnostic.goto_prev)
 m.nmap("]d", vim.diagnostic.goto_next)
 m.nmap("<leader>q", vim.diagnostic.setloclist)
 
+-- easier <C-6>
+m.nmap("<leader>n", "<C-6>")
+
 -- colemak-dh
 local l = u.layout
 l.swap("n", "h")
diff --git a/lua/config/theme.lua b/lua/config/theme.lua
index 544813f..a62ac9f 100644
--- a/lua/config/theme.lua
+++ b/lua/config/theme.lua
@@ -10,10 +10,10 @@ hl("ExtraWhitespace", { ctermbg = "red", bg = "#ff8888" })
 vim.cmd [[match ExtraWhitespace /\s\+$/]]
 
 -- make background transparent
-gbhl("Normal", "none")
-gbhl("EndOfBuffer", "none")
-gbhl("SignColumn", "none")
-gbhl("NeoTreeNormal", "none")
-gbhl("NeoTreeNormalNC", "none")
-gbhl("NeoTreeEndOfBuffer", "none")
+-- gbhl("Normal", "none")
+-- gbhl("EndOfBuffer", "none")
+-- gbhl("SignColumn", "none")
+-- gbhl("NeoTreeNormal", "none")
+-- gbhl("NeoTreeNormalNC", "none")
+-- gbhl("NeoTreeEndOfBuffer", "none")
 
diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua
index e1a2b8e..c3c7698 100644
--- a/lua/plugins/lsp.lua
+++ b/lua/plugins/lsp.lua
@@ -25,10 +25,10 @@ local config = function()
     vim.g.markdown_fenced_languages = {
         "ts=typescript"
     }
-    require("lspconfig").denols.setup {
-        on_attach = on_attach,
-        capabilities = capabilities,
-    }
+    --require("lspconfig").denols.setup {
+    --    on_attach = on_attach,
+    --    capabilities = capabilities,
+    --}
     require("lspconfig").clangd.setup {
         on_attach = on_attach,
         capabilities = capabilities,
@@ -45,6 +45,14 @@ local config = function()
         on_attach = on_attach,
         capabilities = capabilities
     }
+    require("lspconfig").angularls.setup {
+        on_attach = on_attach,
+        capabilities = capabilities
+    }
+    require("lspconfig").tsserver.setup {
+        on_attach = on_attach,
+        capabilities = capabilities
+    }
 end
 
 local rs_config = function()
@@ -70,7 +78,7 @@ return {
             "nvim-lua/plenary.nvim",
             "mfussenegger/nvim-dap",
         },
-        rs_config = rs_config
+        config = rs_config
     },
     {
         "windwp/nvim-autopairs",
diff --git a/lua/plugins/util.lua b/lua/plugins/util.lua
index be69a20..6fd920c 100644
--- a/lua/plugins/util.lua
+++ b/lua/plugins/util.lua
@@ -1,33 +1,30 @@
 return {
     {
-        'nvim-neorg/neorg',
-        tag = '0.0.12',
+        "nvim-neorg/neorg",
+        tag = "0.0.12",
         config = function()
-            require('neorg').setup {
+            require("neorg").setup {
                 load = {
-                    ['core.defaults'] = {},
-                    ['core.norg.concealer'] = {},
-                    ['core.norg.completion'] = {
+                    ["core.defaults"] = {},
+                    ["core.norg.concealer"] = {},
+                    ["core.norg.completion"] = {
                         config = {
-                            engine = 'nvim-cmp'
+                            engine = "nvim-cmp"
                         }
                     },
-                    ['core.export'] = {},
+                    ["core.export"] = {},
                 }
             }
         end,
-        dependencies = 'nvim-lua/plenary.nvim'
+        dependencies = { "nvim-lua/plenary.nvim" },
+        build = ":Neorg sync-parsers"
     },
     {
         "folke/which-key.nvim",
         config = function()
             vim.o.timeout = true
             vim.o.timeoutlen = 300
-            require("which-key").setup({
-                -- your configuration comes here
-                -- or leave it empty to use the default settings
-                -- refer to the configuration section below
-            })
+            require("which-key").setup {}
         end,
     },
 }
diff --git a/lua/plugins/visual.lua b/lua/plugins/visual.lua
index a70cefd..f8e3b54 100644
--- a/lua/plugins/visual.lua
+++ b/lua/plugins/visual.lua
@@ -1,9 +1,11 @@
 return {
     {
-        "navarasu/onedark.nvim",
+        "catppuccin/nvim",
         config = function()
-            require("onedark").setup { style = "darker" }
-            require("onedark").load()
+            require("catppuccin").setup({
+                transparent_background = true
+            })
+            vim.cmd.colorscheme("catppuccin-mocha")
             package.loaded["config.theme"] = nil
             require("config.theme")
         end
@@ -36,7 +38,6 @@ return {
         end,
         config = function()
             require("nvim-treesitter.configs").setup {
-                ensure_installed = { "norg" },
                 highlight = { enable = true }
             }
         end,