💪

after/plugin/colors.lua

@@ -1,5 +1,5 @@
 function Colors(color)
-	color = color or "catppuccin"
+	color = color or "nvchad"
 	vim.cmd.colorscheme(color)
 
 	-- vim.api.nvim_set_hl(0, "Normal", { bg = "none" })

after/plugin/lualine.lua

@@ -1,19 +1,19 @@
-require('lualine').setup({
-  sections = {
-    lualine_a = {'mode', {'datetime', style = '%I:%M %p'}},
-    lualine_b = {'branch', 'diff', 'diagnostics'},
-    lualine_c = {'filename'},
-    lualine_x = {'encoding', 'fileformat', 'filetype'},
-    lualine_y = {'progress'},
-    lualine_z = {'location'}
-  },
-  inactive_sections = {
-    lualine_a = {},
-    lualine_b = {},
-    lualine_c = {'filename'},
-    lualine_x = {'location'},
-    lualine_y = {},
-    lualine_z = {}
-  },
-})
-
+-- require('lualine').setup({
+--   sections = {
+--     lualine_a = {'mode', {'datetime', style = '%I:%M %p'}},
+--     lualine_b = {'branch', 'diff', 'diagnostics'},
+--     lualine_c = {'filename'},
+--     lualine_x = {'encoding', 'fileformat', 'filetype'},
+--     lualine_y = {'progress'},
+--     lualine_z = {'location'}
+--   },
+--   inactive_sections = {
+--     lualine_a = {},
+--     lualine_b = {},
+--     lualine_c = {'filename'},
+--     lualine_x = {'location'},
+--     lualine_y = {},
+--     lualine_z = {}
+--   },
+-- })
+--

lazy-lock.json

@@ -1,7 +1,8 @@
 {
   "Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" },
-  "LuaSnip": { "branch": "master", "commit": "2737edc9e674e537dc0a97e3405658d57d2d31ed" },
-  "avante.nvim": { "branch": "main", "commit": "7bab283616b3bddc92c669e554114fad850844f1" },
+  "LuaSnip": { "branch": "master", "commit": "0f7bbce41ea152a94d12aea286f2ce98e63c0f58" },
+  "avante.nvim": { "branch": "main", "commit": "3b390040f5b206e3b21176ac065eaa475512cd29" },
+  "base46": { "branch": "v2.5", "commit": "8971be55aeb6d5fe086169c0ee9ce647a3871570" },
   "catppuccin": { "branch": "main", "commit": "637d99e638bc6f1efedac582f6ccab08badac0c6" },
   "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
   "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
@@ -11,25 +12,28 @@
   "dressing.nvim": { "branch": "master", "commit": "fc78a3ca96f4db9f8893bb7e2fd9823e0780451b" },
   "harpoon": { "branch": "master", "commit": "1bc17e3e42ea3c46b33c0bbad6a880792692a1b3" },
   "img-clip.nvim": { "branch": "main", "commit": "28a32d811d69042f4fa5c3d5fa35571df2bc1623" },
-  "lazy.nvim": { "branch": "main", "commit": "b1134ab82ee4279e31f7ddf7e34b2a99eb9b7bc9" },
+  "lazy.nvim": { "branch": "main", "commit": "7967abe55752aa90532e6bb4bd4663fe27a264cb" },
   "lsp-zero.nvim": { "branch": "v3.x", "commit": "ab2a3413646fedd77aa0eab4214a6473e62f6a64" },
-  "lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "4d0e5b49363cac187326998b96aa6a2884e0e89b" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "43894adcf10bb1190c2184bd7c1750e8ea2b3dce" },
   "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
-  "mini.nvim": { "branch": "main", "commit": "7b4d5d48b6b5a75009d63f8f3e4ef4819b7e8139" },
+  "mini.nvim": { "branch": "main", "commit": "b07157c51e52a1b004ec7959f9618e9bc24686d3" },
   "neo-tree.nvim": { "branch": "v3.x", "commit": "a77af2e764c5ed4038d27d1c463fa49cd4794e07" },
   "nui.nvim": { "branch": "main", "commit": "b58e2bfda5cea347c9d58b7f11cf3012c7b3953f" },
   "nvim-cmp": { "branch": "main", "commit": "f17d9b4394027ff4442b298398dfcaab97e40c4f" },
-  "nvim-lspconfig": { "branch": "master", "commit": "d01864641c6e43c681c3e9f6cf4745c75fdd9dcc" },
-  "nvim-treesitter": { "branch": "master", "commit": "0603b3e3d21ebe2fa82dc5361a3d500e0d3ad3a8" },
-  "nvim-web-devicons": { "branch": "master", "commit": "19d257cf889f79f4022163c3fbb5e08639077bd8" },
+  "nvim-lspconfig": { "branch": "master", "commit": "f012c1b176f0e3c71f40eb309bdec0316689462e" },
+  "nvim-treesitter": { "branch": "master", "commit": "37427012d1c77c544356bfff0c9acc88fd3256bc" },
+  "nvim-web-devicons": { "branch": "master", "commit": "e87554285f581047b1bf236794b0eb812b444b87" },
   "playground": { "branch": "master", "commit": "ba48c6a62a280eefb7c85725b0915e021a1a0749" },
   "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" },
-  "render-markdown.nvim": { "branch": "main", "commit": "82184c4a3c3580a7a859b2cb7e58f16c10fd29ef" },
+  "render-markdown.nvim": { "branch": "main", "commit": "7f0143e9adf7140c8e3fa33a5bdf193d7a8f0429" },
+  "showkeys": { "branch": "main", "commit": "38a5d15ef687da37ef0de3d6944b9eb6830982f3" },
   "telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" },
   "telescope.nvim": { "branch": "master", "commit": "d829aa64059001ee7b2c8c8aa9c4e6df0b17d893" },
+  "timerly": { "branch": "main", "commit": "18b37ea5b0663e0e748546a399f07458f6ba8675" },
   "todo-comments.nvim": { "branch": "main", "commit": "ae0a2afb47cf7395dc400e5dc4e05274bf4fb9e0" },
+  "ui": { "branch": "v3.0", "commit": "9b31c25fc497d1ef726de15ae297769dbf90c1a5" },
   "undotree": { "branch": "master", "commit": "78b5241191852ffa9bb5da5ff2ee033160798c3b" },
   "vim-fugitive": { "branch": "master", "commit": "d4877e54cef67f5af4f950935b1ade19ed6b7370" },
+  "volt": { "branch": "main", "commit": "41c03a5d6a0a8a997e774a3482d82e5ef820c6ba" },
   "which-key.nvim": { "branch": "main", "commit": "68e37e12913a66b60073906f5d3f14dee0de19f2" }
 }

lua/chadrc.lua

@@ -0,0 +1,15 @@
+local M = {}
+
+M.base46 = {
+    theme = 'everforest',
+    transparency = true,
+}
+
+M.ui = {
+    statusline = {
+        theme = 'minimal'
+    }
+}
+
+return M
+

lua/zak/init.lua

@@ -1,4 +1,11 @@
+vim.g.base46_cache = vim.fn.stdpath "data" .. "/base46_cache/"
+
 require("zak.remap")
 require("zak.plugins")
 require("zak.set")
 require("zak.session")
+
+ for _, v in ipairs(vim.fn.readdir(vim.g.base46_cache)) do
+   dofile(vim.g.base46_cache .. v)
+ end
+

lua/zak/plugins.lua

@@ -86,10 +86,6 @@ return require('lazy').setup({
         { '<leader>h', group = 'Git [H]unk', mode = { 'n', 'v' } },
       },
     },
-  },
-    {
-        'nvim-lualine/lualine.nvim',
-        dependencies = { 'nvim-tree/nvim-web-devicons' }
   },
     -- 'github/copilot.vim',
     {
@@ -204,5 +200,22 @@ return require('lazy').setup({
             },
         })
       end,
-    } 
+    },
+    "nvzone/volt",
+    { "nvzone/timerly", cmd = "TimerlyToggle" },
+    { "nvzone/showkeys", cmd = "ShowkeysToggle" },
+     {
+       "nvchad/ui",
+        config = function()
+          require "nvchad" 
+        end
+     },
+
+     {
+        "nvchad/base46",
+        lazy = true,
+        build = function()
+          require("base46").load_all_highlights()
+        end,
+     },
 })

lua/zak/remap.lua

@@ -197,3 +197,7 @@ vim.keymap.set('n', '<A-z>', ToggleZen, { desc = 'Zen Mode' })
 vim.keymap.set('v', '<A-z>', ToggleZen, { desc = 'Zen Mode' })
 vim.keymap.set('i', '<A-z>', ToggleZen, { desc = 'Zen Mode' })
 vim.keymap.set('t', '<A-z>', ToggleZen, { desc = 'Zen Mode' })
+
+vim.keymap.set('n', '<leader>tt', '<cmd>TimerlyToggle<CR>')
+
+vim.keymap.set('n', '<leader>ww', '<cmd>wincmd =<CR>')

lua/zak/session.lua

@@ -4,5 +4,6 @@ vim.api.nvim_create_autocmd("UIEnter", {
     vim.cmd("vsplit | Explore")
     vim.cmd("wincmd l")
     vim.cmd("Explore")
+    vim.cmd("ShowkeysToggle")
   end,
 })