LuaLine, iTerm2, Material

nvim/config/lua/base.lua

@@ -1,3 +1,7 @@
+-- Set Leader
+vim.keymap.set("n", "<Space>", "<Nop>", { silent = true })
+vim.g.mapleader = " "
+
 -- Disable NetRW
 vim.g.loaded_netrw = 1
 vim.g.loaded_netrwPlugin = 1
@@ -22,24 +26,11 @@ vim.opt.foldmethod = "indent"
 vim.opt.foldnestmax = 10
 vim.opt.foldlevel = 2
 
--- Lightline config
-vim.g['lightline'] = {
-  colorscheme = 'embark',
-  separator = {
-    left = "\u{e0b0}",
-    right = "\u{e0b2}"
-  },
-  subseparator = {
-    left = "\u{e0b1}",
-    right = "\u{e0b3}"
-  }
-}
-
 -- Set Color Scheme
-vim.cmd('colorscheme embark')
-vim.diagnostic.config({
-  virtual_text = false,
-})
+-- vim.cmd('colorscheme embark')
+-- vim.cmd('colorscheme OceanicNext')
+-- vim.cmd('colorscheme material')
+-- vim.g.material_style = "oceanic"
 
 -- Mappings.
 -- See `:help vim.diagnostic.*` for documentation on any of the below functions

nvim/config/lua/init.lua

@@ -1,10 +1,13 @@
+require('base')
 require('aerial-config')
 require('autopairs-config')
-require('base')
 require('cmp-config')
 require('comment-config')
+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')

nvim/config/lua/leap-config.lua

@@ -0,0 +1 @@
+require('leap').add_default_mappings()

nvim/config/lua/lsp-lines-config.lua

@@ -1 +1,4 @@
 require("lsp_lines").setup()
+vim.diagnostic.config({
+  virtual_text = false,
+})

nvim/config/lua/lualine-config.lua

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

nvim/config/lua/material-config.lua

@@ -0,0 +1,3 @@
+require('material').setup()
+vim.cmd('colorscheme material')
+vim.g.material_style = "oceanic"

nvim/default.nix

@@ -28,6 +28,7 @@
       aerial-nvim     # Code Outline
       comment-nvim    # Code Comments
       diffview-nvim   # Diff View
+      leap-nvim       # Quick Movement
       numb-nvim       # Peek / Jump to Lines
       nvim-autopairs  # Automatically Close Pairs (),[],{}
       nvim-tree-lua   # File Explorer
@@ -37,8 +38,8 @@
       # ------------------
       # --- Theme / UI ---
       # ------------------
-      embark-vim        # Theme
-      lightline-vim     # Bottom Line
+      lualine-nvim      # Bottom Line
+      material-nvim     # Theme
       noice-nvim        # UI Tweaks
       nvim-web-devicons # Dev Icons