Update Theme

nvim/config/lua/base.lua

@@ -1,3 +1,7 @@
+-- Set Theme
+vim.cmd('colorscheme embark')
+--vim.cmd('colorscheme gruvbox-material')
+
 -- Set Leader
 vim.keymap.set("n", "<Space>", "<Nop>", { silent = true })
 vim.g.mapleader = " "

nvim/config/lua/init.lua

@@ -7,8 +7,8 @@ require('leap-config')
 require('lsp-config')
 require('lsp-lines-config')
 require('lualine-config')
-require('material-config')
 require('noice-config')
 require('numb-config')
 require('nvim-tree-config')
 require('telescope-config')
+require('ts-config')

nvim/config/lua/lualine-config.lua

@@ -1,5 +1,5 @@
 require('lualine').setup({
   options = {
-    theme = "material",
+    theme = "OceanicNext",
   }
 })

nvim/config/lua/noice-config.lua

@@ -14,4 +14,8 @@ require("noice").setup({
     inc_rename = false, -- enables an input dialog for inc-rename.nvim
     lsp_doc_border = true, -- add a border to hover docs and signature help
   },
+  popupmenu = {
+    enabled = true,
+    backend = 'cmp',
+  },
 })

nvim/config/lua/ts-config.lua

@@ -0,0 +1,6 @@
+require'nvim-treesitter.configs'.setup {
+  highlight = {
+    enable = true,
+    additional_vim_regex_highlighting = false,
+  },
+}

nvim/default.nix

@@ -1,5 +1,7 @@
 { config, pkgs, ... }:
-
+let
+  inherit (pkgs.lib.lists) subtractLists;
+in
 {
   programs.neovim = {
     enable = true;
@@ -38,8 +40,8 @@
       # ------------------
       # --- Theme / UI ---
       # ------------------
+      embark-vim        # Theme
       lualine-nvim      # Bottom Line
-      material-nvim     # Theme
       noice-nvim        # UI Tweaks
       nvim-web-devicons # Dev Icons
 
@@ -48,14 +50,11 @@
       # ------------------
       (
         nvim-treesitter.withPlugins (
-          plugins: with pkgs.tree-sitter-grammars; [
-            # tree-sitter-bash            # Incompatibility (Prevents Noice Highlighting)
-            tree-sitter-lua
-            tree-sitter-markdown
-            tree-sitter-markdown-inline
-            tree-sitter-regex
-            tree-sitter-vim
-          ]
+          # Exclude Outdated Packages (Causes Issues)
+          plugins: with pkgs; subtractLists [
+            tree-sitter-grammars.tree-sitter-bash
+            tree-sitter-grammars.tree-sitter-kotlin
+          ] tree-sitter.allGrammars
         )
       )