update nvim theming

init.lua

@@ -1,6 +1,8 @@
 -- https://learnxinyminutes.com/docs/lua/
 
 vim.g.mapleader = ' '
+vim.g.user_emmet_install_global = 0
+vim.g.user_emmet_leader_key = ","
 vim.g.maplocalleader = ' '
 
 local lazypath = vim.fn.stdpath 'data' .. '/lazy/lazy.nvim'
@@ -66,8 +68,10 @@ require('lazy').setup({
             on_attach = function(bufnr)
                 vim.keymap.set('n', '<leader>gp', require('gitsigns').prev_hunk,
                     { buffer = bufnr, desc = '[G]o to [P]revious Hunk' })
-        vim.keymap.set('n', '<leader>gn', require('gitsigns').next_hunk, { buffer = bufnr, desc = '[G]o to [N]ext Hunk' })
+                vim.keymap.set('n', '<leader>gn', require('gitsigns').next_hunk,
-        vim.keymap.set('n', '<leader>ph', require('gitsigns').preview_hunk, { buffer = bufnr, desc = '[P]review [H]unk' })
+                    { buffer = bufnr, desc = '[G]o to [N]ext Hunk' })
+                vim.keymap.set('n', '<leader>ph', require('gitsigns').preview_hunk,
+                    { buffer = bufnr, desc = '[P]review [H]unk' })
             end,
         },
     },
@@ -79,8 +83,8 @@ require('lazy').setup({
         -- See `:help lualine.txt`
         opts = {
             options = {
-        icons_enabled = false,
+                icons_enabled = true,
-        theme = 'ayu_dark',
+                theme = 'moonfly',
                 component_separators = '|',
                 section_separators = '',
             },
@@ -92,10 +96,8 @@ require('lazy').setup({
         'lukas-reineke/indent-blankline.nvim',
         -- Enable `lukas-reineke/indent-blankline.nvim`
         -- See `:help indent_blankline.txt`
-    opts = {
+        main = 'ibl',
-      char = '┊',
+        opts = {},
-      show_trailing_blankline_indent = false,
-    },
     },
 
     -- "gc" to comment visual regions/lines
@@ -180,6 +182,7 @@ vim.api.nvim_create_autocmd('TextYankPost', {
     pattern = '*',
 })
 
+local fb_actions = require "telescope".extensions.file_browser.actions
 -- [[ Configure Telescope ]]
 require('telescope').setup {
     defaults = {
@@ -343,12 +346,14 @@ end
 
 local servers = {
     -- clangd = {},
-  -- gopls = {},
-  -- pyright = {},
-  rust_analyzer = {},
-  gopls = {},
-  -- tsserver = {},
     -- hls = {},
+    rust_analyzer = {},
+    gopls = {
+        usePlaceholders = true,
+        analyses = {
+            unusedparams = true,
+        }
+    },
     html = { provideFormatter = false },
     cssls = {},
     tsserver = {},
@@ -391,10 +396,10 @@ mason_lspconfig.setup_handlers {
 -- this is for my personal config, i cant bother seeing every TJ's default and changing it to my own
 require("jabuxas")
 
-vim.opt.tabstop = 2
+vim.opt.tabstop = 4
-vim.opt.softtabstop = 2
+vim.opt.softtabstop = 4
-vim.opt.shiftwidth = 2
+vim.opt.shiftwidth = 4
 vim.opt.expandtab = true
 
 -- The line beneath this is called `modeline`. See `:help modeline`
--- vim: ts=2 sts=2 sw=2 et
+-- vim: ts=4 sts=4 sw=4 et

lua/custom/plugins/bufferline.lua

@@ -2,8 +2,12 @@ return {
   'akinsho/bufferline.nvim',
   version = "*",
   dependencies = 'nvim-tree/nvim-web-devicons',
+  opts = {
+    options = {
+      mode = "tabs"
+    }
+  },
   config = function()
-    require('bufferline').setup()
     vim.keymap.set("n", "<A-.>", "<cmd>bnext<CR>", { desc = "Go to next Buffer" })
     vim.keymap.set("n", "<A-,>", "<cmd>bprev<CR>", { desc = "Go to previous Buffer" })
     vim.keymap.set("n", "<A-x>", "<cmd>bdelete<CR>", { desc = "Delete current buffer" })

lua/custom/plugins/cmp.lua

@@ -142,8 +142,8 @@ return {
         end,
       },
       window = {
-        completion = cmp.config.window.bordered({ winhighlight }),
+        completion = cmp.config.window.bordered(winhighlight),
-        documentation = cmp.config.window.bordered({ winhighlight }),
+        documentation = cmp.config.window.bordered(winhighlight),
       },
     }
 

lua/custom/plugins/emmet.lua

@@ -1,15 +1,12 @@
 return {
   "mattn/emmet-vim",
   config = function()
-    vim.g.user_emmet_leader_key = ","
-    vim.g.user_emmet_install_global = 0
-
     local autocmd = vim.api.nvim_create_autocmd
     autocmd("FileType", { pattern = "html", command = [[EmmetInstall]] })
     autocmd("FileType", { pattern = "css", command = [[EmmetInstall]] })
 
-    vim.keymap.set("n", "<leader>e", function()
+    vim.keymap.set("n", "<leader>le", function()
       vim.cmd(string.format("Emmet %s", vim.fn.input("Emmet: ")))
     end)
-  end
+  end,
 }

lua/custom/plugins/file-browser.lua

@@ -0,0 +1,4 @@
+return {
+  "nvim-telescope/telescope-file-browser.nvim",
+  dependencies = { "nvim-telescope/telescope.nvim", "nvim-lua/plenary.nvim" }
+}

lua/custom/plugins/live-server.lua

@@ -0,0 +1,13 @@
+return {
+  "aurum77/live-server.nvim",
+  opts = {},
+  cmd = {
+    "LiveServer",
+    "LiveServerStart",
+    "LiveServerStop",
+    "LiveServerInstall",
+  },
+  build = function()
+    require("live_server.util").install()
+  end,
+}

lua/custom/plugins/moonfly.lua

@@ -1,12 +1,13 @@
 return {
-  "bluz71/vim-nightfly-colors",
+  "bluz71/vim-moonfly-colors",
-  name = "nightfly",
+  name = "moonfly",
   lazy = false,
   priority = 1000,
   config = function()
     vim.o.termguicolors = true
-    vim.cmd [[colorscheme nightfly]]
+    vim.cmd [[colorscheme moonfly]]
-    vim.g.nightflyCursorColor = true
+    vim.g.moonflyCursorColor = true
-    vim.g.nightflyNormalFloat = true
+    vim.g.moonflyNormalFloat = true
+    vim.g.moonflyTransparent = true
   end
 }

lua/custom/plugins/neosolarized.lua

@@ -39,7 +39,7 @@ return {
   --   Group.new("DiagnosticUnderlineInfo", colors.none, colors.none, styles.undercurl, cInfo)
   --   Group.new("DiagnosticUnderlineHint", colors.none, colors.none, styles.undercurl, cHint)
   --   Group.new("Macro", groups.PreProc, colors.none, styles.italic + styles.bold)
-  --   Group.link("Function", groups.Function, colors.none, styles.italic)
+  --   Group.new("Function", groups.Function, colors.none, styles.italic)
   --   Group.new("Conditional", groups.Statement, colors.none, styles.italic)
   --   Group.new("Boolean", groups.Constant, colors.none, styles.bold)
   --   Group.new("HoverBorder", colors.yellow, colors.none, styles.NONE)

lua/custom/plugins/solarized.lua

@@ -3,10 +3,10 @@ return {
   -- lazy = false,
   -- priority = 1000,
   -- config = function()
-  --   vim.o.background = 'dark' -- or 'light'
+  --   vim.o.background = 'light' -- or 'light'
   --   require('solarized').setup({
   --     transparent = true,
-  --     theme = 'neo',
+  --     theme = 'default',
   --     styles = {
   --       functions = { bold = true, italic = false }
   --     },
@@ -14,5 +14,3 @@ return {
   --   vim.cmd.colorscheme 'solarized'
   -- end,
 }
-
--- vim: sw=2 ts=2 sts=2 et

lua/custom/plugins/surround.lua

@@ -0,0 +1,6 @@
+return {
+  "kylechui/nvim-surround",
+  version = "*",
+  event = "VeryLazy",
+  opts = {},
+}

lua/custom/plugins/transparent.lua

@@ -4,6 +4,7 @@ return {
   opts = {
     extra_groups = {
       "NormalFloat",   -- plugins which have float panel such as Lazy, Mason, LspInfo
+      "FloatBorder",
       "NvimTreeNormal" -- NvimTree
     },
   },

lua/custom/plugins/zen.lua

@@ -2,12 +2,26 @@ return {
   "folke/zen-mode.nvim",
   opts = {
     plugins = {
-      tmux = { enabled = true },
       kitty = {
         enabled = true,
-        font = "+5",
+        font = "+3",
-      }
       },
+      wezterm = {
+        enabled = true,
+        font = "+3"
+      },
+      tmux = { enabled = true },
+    },
+    on_open = function()
+      vim.fn.system("kitty @ set-font-size +5")
+      vim.fn.system("tmux set status off")
+      vim.fn.system("tmux set -w pane-border-status off")
+    end,
+    on_close = function()
+      vim.fn.system("kitty @ set-font-size +0")
+      vim.fn.system("tmux set status on")
+      vim.fn.system("tmux set -w pane-border-status on")
+    end,
   },
   config = function()
     vim.keymap.set("n", "<leader>z", "<cmd>ZenMode<CR>", { silent = true })

lua/jabuxas/set.lua

@@ -29,9 +29,9 @@ vim.opt.isfname:append("@-@")
 vim.opt.updatetime = 50
 
 vim.opt.colorcolumn = "80"
-vim.cmd[[highlight ColorColumn ctermbg=235 guibg=#262626]]
+vim.cmd [[highlight ColorColumn ctermbg=235 guibg=#262626]]
-vim.api.nvim_create_autocmd({"WinLeave"}, {pattern = "*", callback = function() vim.opt.colorcolumn = "0" end,})
+vim.api.nvim_create_autocmd({ "WinLeave" }, { pattern = "*", callback = function() vim.opt.colorcolumn = "0" end, })
-vim.api.nvim_create_autocmd({"WinEnter"}, {pattern = "*", callback = function() vim.opt.colorcolumn = "80" end,})
+vim.api.nvim_create_autocmd({ "WinEnter" }, { pattern = "*", callback = function() vim.opt.colorcolumn = "80" end, })
 
 vim.g.mapleader = " "