diff --git a/lazy-lock.json b/lazy-lock.json index 066f3b1..ec4a4c3 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -49,6 +49,7 @@ "telescope.nvim": { "branch": "master", "commit": "a486ac3e8fb2198f3636da1927ed57a28836fbd8" }, "todo-comments.nvim": { "branch": "main", "commit": "077c59586d9d0726b0696dc5680eb863f4e04bc5" }, "toggleterm.nvim": { "branch": "main", "commit": "a5638b2206c3930a16a24e5c184dddd572f8cd34" }, + "trouble.nvim": { "branch": "main", "commit": "c82530083dd248ffa72d7087199ea5c8efe81820" }, "vim": { "branch": "master", "commit": "a4f6b0abe6cad85330867a54893864e0d5c59359" }, "vim-bbye": { "branch": "master", "commit": "903f5eb17f72ebf7b0b1524bbb792c0b36761af6" }, "vim-illuminate": { "branch": "master", "commit": "49062ab1dd8fec91833a69f0a1344223dd59d643" }, diff --git a/lua/custom/plugins/init.lua b/lua/custom/plugins/init.lua index 7e26c5f..26af86b 100644 --- a/lua/custom/plugins/init.lua +++ b/lua/custom/plugins/init.lua @@ -1,7 +1,65 @@ return { --- masukan plugin tambahan disini - { "folke/trouble.nvim", enabled = false }, -- ini untuk disable plugin - -- { + { + "folke/trouble.nvim", + event = "BufRead", + cmd = { "TroubleToggle", "Trouble" }, + opts = { use_diagnostic_signs = true }, + keys = { + { "xx", "TroubleToggle document_diagnostics", desc = "Document Diagnostics (Trouble)" }, + { "xX", "TroubleToggle workspace_diagnostics", desc = "Workspace Diagnostics (Trouble)" }, + }, + }, + { + "echasnovski/mini.indentscope", + version = false, -- wait till new 0.7.0 release to put it back on semver + event = "BufReadPre", + opts = { + -- symbol = "▏", + symbol = "│", + options = { try_as_border = true }, + }, + config = function(_, opts) + vim.api.nvim_create_autocmd("FileType", { + pattern = { "help", "alpha", "dashboard", "NvimTree", "Trouble", "lazy", "mason" }, + callback = function() + vim.b.miniindentscope_disable = true + end, + }) + require("mini.indentscope").setup(opts) + end, + }, + { + "gbprod/yanky.nvim", + event = "BufRead", + config = function() + require("user.yanky") + end, + }, + { + "is0n/jaq-nvim", + event = "BufRead", + config = function() + require("user.jaq") + end, + }, + -- better todo coloring and icon + { + "folke/todo-comments.nvim", + event = "BufRead", + config = function() + require("todo-comments").setup() + end, + }, + -- mini scrollview + { + "karb94/neoscroll.nvim", + event = "BufRead", + config = function() + require("user.neoscroll") + end, + }, + -- { "ahmedkhalf/project.nvim", commit = "628de7e433dd503e782831fe150bb750e56e55d6", event = "VeryLazy" }, -- { -- "linrongbin16/lsp-progress.nvim", -- branch = "main", -- event = { "VimEnter" }, @@ -16,4 +74,69 @@ return { -- -- }, -- { "arkav/lualine-lsp-progress", event = "BufRead" }, -- { "j-hui/fidget.nvim", enabled = false }, + -- + -- additional plugins + -- active indent guide and indent text objects + -- makes some plugins dot-repeatable like leap + -- { "tpope/vim-repeat", event = "VeryLazy" }, + -- better diagnostics list and others + -- for markdown preview + -- make sure already install npm and yarn + -- { + -- "iamcco/markdown-preview.nvim", + -- event = "VeryLazy", + -- build = "cd app && npm install", + -- init = function() + -- vim.g.mkdp_filetypes = { "markdown" } + -- end, + -- ft = { "markdown" }, + -- cmd = { "MarkdownPreview", "MarkdownPreviewStop", "MarkdownPreviewToggle" }, + -- }, + -- for codeGPT + -- { + -- "jackMort/ChatGPT.nvim", + -- dependencies = { "MunifTanjim/nui.nvim", "nvim-lua/plenary.nvim", "nvim-telescope/telescope.nvim" }, + -- lazy = true, + -- event = "VeryLazy", + -- -- opts = function() + -- -- require("user.chat_gpt") + -- -- end, + -- }, + -- indent detection + -- { + -- "Darazaki/indent-o-matic", + -- event = "VeryLazy", + -- opt = true, + -- cmd = { "IndentOMatic" }, + -- config = function() + -- require("user.indent-o-matic") + -- end, + -- }, + -- Lsp Saga + -- { + -- "glepnir/lspsaga.nvim", + -- event = "BufRead", + -- config = function() + -- require("lspsaga").setup({}) + -- end, + -- dependencies = { { "kyazdani42/nvim-web-devicons" } }, + -- init = function() + -- require("user.lspsaga_config") + -- end, + -- }, + -- Khusus Projek laravel baru di buka + -- { + -- "adalessa/laravel.nvim", + -- dependencies = { + -- "nvim-telescope/telescope.nvim", + -- }, + -- cmd = { "Sail", "Artisan", "Composer" }, + -- keys = { + -- { "pa", ":Artisan" }, + -- }, + -- config = function() + -- require("laravel").setup() + -- require("telescope").load_extension("laravel") + -- end, + -- }, } diff --git a/lua/custom/plugins/theme.lua b/lua/custom/plugins/theme.lua deleted file mode 100644 index 46d7c85..0000000 --- a/lua/custom/plugins/theme.lua +++ /dev/null @@ -1,27 +0,0 @@ -return { - { "dracula/vim" }, - -- { "folke/tokyonight.nvim" }, - -- { "arcticicestudio/nord-vim" }, - -- { "sainnhe/sonokai" }, - -- { "RRethy/nvim-base16" }, - -- { - -- "navarasu/onedark.nvim", - -- priority = 1000, - -- config = function() - -- -- Lua - -- require("onedark").setup({ - -- style = "darker", - -- }) - -- require("onedark").load() - -- end, - -- }, - { - "marko-cerovac/material.nvim", - config = function() - vim.g.material_style = "palenight" - require("material").setup({ - lualine_style = "stealth", - }) - end, - }, -} diff --git a/lua/custom/plugins/ui.lua b/lua/custom/plugins/ui.lua new file mode 100644 index 0000000..edc6c0d --- /dev/null +++ b/lua/custom/plugins/ui.lua @@ -0,0 +1,139 @@ +return { + { "dracula/vim" }, + -- { "folke/tokyonight.nvim" }, + -- { "arcticicestudio/nord-vim" }, + -- { "sainnhe/sonokai" }, + -- { "RRethy/nvim-base16" }, + -- { + -- "navarasu/onedark.nvim", + -- priority = 1000, + -- config = function() + -- -- Lua + -- require("onedark").setup({ + -- style = "darker", + -- }) + -- require("onedark").load() + -- end, + -- }, + { + "marko-cerovac/material.nvim", + config = function() + vim.g.material_style = "palenight" + require("material").setup({ + lualine_style = "stealth", + }) + end, + }, + -- simbol outline + { + "simrat39/symbols-outline.nvim", + event = "BufRead", + config = function() + require("symbols-outline").setup() + end, + }, + -- { + -- "folke/tokyonight.nvim", + -- -- commit = "66bfc2e8f754869c7b651f3f47a2ee56ae557764", + -- lazy = false, -- make sure we load this during startup if it is your main colorscheme + -- priority = 1000, -- make sure to load this before all the other start plugins + -- config = function() + -- local is_transparant = false + -- if is_transparant then + -- require("user.tokyonight_transparant") + -- else + -- require("user.tokyonight") + -- end + -- -- require("core") + -- require("user.colorscheme") + -- end, + -- }, + -- { + -- "navarasu/onedark.nvim", + -- init = function() + -- require("user.onedark") + -- require("onedark").load() + -- end, + -- }, + -- { "lunarvim/lunar.nvim" }, + -- -- { "arcticicestudio/nord-vim" }, + -- { + -- "catppuccin/nvim", + -- name = "catppuccin", + -- init = function() + -- require("user.catppuccin") + -- end, + -- }, + -- { + -- "ellisonleao/gruvbox.nvim", + -- init = function() + -- require("gruvbox").setup({ + -- undercurl = true, + -- underline = true, + -- bold = true, + -- italic = true, + -- strikethrough = true, + -- invert_selection = false, + -- invert_signs = false, + -- invert_tabline = false, + -- invert_intend_guides = false, + -- inverse = true, -- invert background for search, diffs, statuslines and errors + -- contrast = "", -- can be "hard", "soft" or empty string + -- palette_overrides = {}, + -- overrides = {}, + -- dim_inactive = false, + -- transparent_mode = false, + -- }) + -- vim.o.background = "dark" -- or "light" for light mode + -- end, + -- }, + -- { "sainnhe/sonokai" }, + -- -- { "EdenEast/nightfox.nvim" }, + -- { + -- "marko-cerovac/material.nvim", + -- init = function() + -- vim.g.material_style = "darker" + -- end, + -- }, + + -- include treesitter + -- require("plugins.treesitter"), + -- { + -- "nvim-treesitter/nvim-treesitter", + -- commit = "8e763332b7bf7b3a426fd8707b7f5aa85823a5ac", + -- run = ":TSUpdate", + -- event = "BufWinEnter", + -- opts = function() + -- require("user.treesitter") + -- end, + -- }, + -- -- ui components + -- { "MunifTanjim/nui.nvim", lazy = true }, + -- -- noicer ui + -- { + -- "folke/noice.nvim", + -- event = "VeryLazy", + -- opts = { + -- lsp = { + -- override = { + -- ["vim.lsp.util.convert_input_to_markdown_lines"] = true, + -- ["vim.lsp.util.stylize_markdown"] = true, + -- }, + -- }, + -- presets = { + -- bottom_search = true, + -- command_palette = true, + -- long_message_to_split = true, + -- }, + -- }, + -- -- stylua: ignore + -- keys = { + -- { "", function() require("noice").redirect(vim.fn.getcmdline()) end, mode = "c", desc = "Redirect Cmdline" }, + -- { "snl", function() require("noice").cmd("last") end, desc = "Noice Last Message" }, + -- { "snh", function() require("noice").cmd("history") end, desc = "Noice History" }, + -- { "sna", function() require("noice").cmd("all") end, desc = "Noice All" }, + -- { "", function() if not require("noice.lsp").scroll(4) then return "" end end, silent = true, expr = true, desc = "Scroll forward", mode = {"i", "n", "s"} }, + -- { "", function() if not require("noice.lsp").scroll(-4) then return "" end end, silent = true, expr = true, desc = "Scroll backward", mode = {"i", "n", "s"}}, + -- }, + -- }, +} diff --git a/lua/custom/whichkey.lua b/lua/custom/whichkey.lua index 01e41c5..c331246 100644 --- a/lua/custom/whichkey.lua +++ b/lua/custom/whichkey.lua @@ -4,4 +4,9 @@ return { -- name = "Example", -- k = { 'lua print("Testing")', "Example" }, -- }, + ["r"] = { + name = "Run", + j = { "Jaq float", "Run With Jaq" }, + }, + ["o"] = { "SymbolsOutline", "Symbol Outline" }, } diff --git a/lua/plugins/init.lua b/lua/plugins/init.lua index 7db0f5a..aadf310 100644 --- a/lua/plugins/init.lua +++ b/lua/plugins/init.lua @@ -1,7 +1,3 @@ --- local build = "powershell ./install.ps1" --- if vim.fn.has("win32") == 0 then --- build = "./install.sh" --- end return { -- plugin ini merupakan penyedia library neovim lua { @@ -248,14 +244,6 @@ return { require("user.comment") end, }, - -- better todo coloring and icon - { - "folke/todo-comments.nvim", - event = "BufRead", - config = function() - require("todo-comments").setup() - end, - }, -- styleing indent { "lukas-reineke/indent-blankline.nvim", @@ -264,7 +252,6 @@ return { require("user.indentline") end, }, - -- { "ahmedkhalf/project.nvim", commit = "628de7e433dd503e782831fe150bb750e56e55d6", event = "VeryLazy" }, -- for Speed up loading Lua modules in Neovim to improve startup time. { "lewis6991/impatient.nvim", @@ -301,13 +288,6 @@ return { require("user.coderunner") end, }, - { - "is0n/jaq-nvim", - event = "BufRead", - config = function() - require("user.jaq") - end, - }, -- for color view { "NvChad/nvim-colorizer.lua", @@ -369,14 +349,6 @@ return { require("user.nvimscroll") end, }, - -- for manage and coloring copy - { - "gbprod/yanky.nvim", - event = "BufRead", - config = function() - require("user.yanky") - end, - }, -- for check startuptime { "dstein64/vim-startuptime", cmd = "StartupTime", event = "BufRead" }, -- for coloring pairs @@ -395,101 +367,6 @@ return { require("user.gitsigns") end, }, - - -- additional plugins - -- active indent guide and indent text objects - { - "echasnovski/mini.indentscope", - version = false, -- wait till new 0.7.0 release to put it back on semver - event = "BufReadPre", - opts = { - -- symbol = "▏", - symbol = "│", - options = { try_as_border = true }, - }, - config = function(_, opts) - vim.api.nvim_create_autocmd("FileType", { - pattern = { "help", "alpha", "dashboard", "NvimTree", "Trouble", "lazy", "mason" }, - callback = function() - vim.b.miniindentscope_disable = true - end, - }) - require("mini.indentscope").setup(opts) - end, - }, - -- makes some plugins dot-repeatable like leap - -- { "tpope/vim-repeat", event = "VeryLazy" }, - -- better diagnostics list and others - { - "folke/trouble.nvim", - event = "BufRead", - cmd = { "TroubleToggle", "Trouble" }, - opts = { use_diagnostic_signs = true }, - keys = { - { "xx", "TroubleToggle document_diagnostics", desc = "Document Diagnostics (Trouble)" }, - { "xX", "TroubleToggle workspace_diagnostics", desc = "Workspace Diagnostics (Trouble)" }, - }, - }, - -- for markdown preview - -- make sure already install npm and yarn - -- { - -- "iamcco/markdown-preview.nvim", - -- event = "VeryLazy", - -- build = "cd app && npm install", - -- init = function() - -- vim.g.mkdp_filetypes = { "markdown" } - -- end, - -- ft = { "markdown" }, - -- cmd = { "MarkdownPreview", "MarkdownPreviewStop", "MarkdownPreviewToggle" }, - -- }, - -- for codeGPT - -- { - -- "jackMort/ChatGPT.nvim", - -- dependencies = { "MunifTanjim/nui.nvim", "nvim-lua/plenary.nvim", "nvim-telescope/telescope.nvim" }, - -- lazy = true, - -- event = "VeryLazy", - -- -- opts = function() - -- -- require("user.chat_gpt") - -- -- end, - -- }, - -- indent detection - -- { - -- "Darazaki/indent-o-matic", - -- event = "VeryLazy", - -- opt = true, - -- cmd = { "IndentOMatic" }, - -- config = function() - -- require("user.indent-o-matic") - -- end, - -- }, - -- Lsp Saga - -- { - -- "glepnir/lspsaga.nvim", - -- event = "BufRead", - -- config = function() - -- require("lspsaga").setup({}) - -- end, - -- dependencies = { { "kyazdani42/nvim-web-devicons" } }, - -- init = function() - -- require("user.lspsaga_config") - -- end, - -- }, - -- Khusus Projek laravel baru di buka - -- { - -- "adalessa/laravel.nvim", - -- dependencies = { - -- "nvim-telescope/telescope.nvim", - -- }, - -- cmd = { "Sail", "Artisan", "Composer" }, - -- keys = { - -- { "pa", ":Artisan" }, - -- }, - -- config = function() - -- require("laravel").setup() - -- require("telescope").load_extension("laravel") - -- end, - -- }, - -- for loading info { "j-hui/fidget.nvim", @@ -498,20 +375,4 @@ return { require("fidget").setup() end, }, - { - "gelguy/wilder.nvim", - event = "BufWinEnter", - config = function() - local wilder = require("wilder") - wilder.setup({ modes = { ":", "/", "?" } }) - wilder.set_option( - "renderer", - wilder.popupmenu_renderer({ - highlighter = wilder.basic_highlighter(), - left = { " ", wilder.popupmenu_devicons() }, - right = { " ", wilder.popupmenu_scrollbar() }, - }) - ) - end, - }, } diff --git a/lua/plugins/ui.lua b/lua/plugins/ui.lua index f4c2c95..7e89f85 100644 --- a/lua/plugins/ui.lua +++ b/lua/plugins/ui.lua @@ -1,81 +1,6 @@ return { -- color scheme - -- { - -- "folke/tokyonight.nvim", - -- -- commit = "66bfc2e8f754869c7b651f3f47a2ee56ae557764", - -- lazy = false, -- make sure we load this during startup if it is your main colorscheme - -- priority = 1000, -- make sure to load this before all the other start plugins - -- config = function() - -- local is_transparant = false - -- if is_transparant then - -- require("user.tokyonight_transparant") - -- else - -- require("user.tokyonight") - -- end - -- -- require("core") - -- require("user.colorscheme") - -- end, - -- }, - -- { - -- "navarasu/onedark.nvim", - -- init = function() - -- require("user.onedark") - -- require("onedark").load() - -- end, - -- }, - -- { "lunarvim/lunar.nvim" }, - -- -- { "arcticicestudio/nord-vim" }, - -- { - -- "catppuccin/nvim", - -- name = "catppuccin", - -- init = function() - -- require("user.catppuccin") - -- end, - -- }, { "luisiacc/gruvbox-baby", lazy = true }, - -- { - -- "ellisonleao/gruvbox.nvim", - -- init = function() - -- require("gruvbox").setup({ - -- undercurl = true, - -- underline = true, - -- bold = true, - -- italic = true, - -- strikethrough = true, - -- invert_selection = false, - -- invert_signs = false, - -- invert_tabline = false, - -- invert_intend_guides = false, - -- inverse = true, -- invert background for search, diffs, statuslines and errors - -- contrast = "", -- can be "hard", "soft" or empty string - -- palette_overrides = {}, - -- overrides = {}, - -- dim_inactive = false, - -- transparent_mode = false, - -- }) - -- vim.o.background = "dark" -- or "light" for light mode - -- end, - -- }, - -- { "sainnhe/sonokai" }, - -- -- { "EdenEast/nightfox.nvim" }, - -- { - -- "marko-cerovac/material.nvim", - -- init = function() - -- vim.g.material_style = "darker" - -- end, - -- }, - - -- include treesitter - -- require("plugins.treesitter"), - -- { - -- "nvim-treesitter/nvim-treesitter", - -- commit = "8e763332b7bf7b3a426fd8707b7f5aa85823a5ac", - -- run = ":TSUpdate", - -- event = "BufWinEnter", - -- opts = function() - -- require("user.treesitter") - -- end, - -- }, -- dashboard { "goolord/alpha-nvim", @@ -161,42 +86,4 @@ return { require("user.telescope") end, }, - -- -- ui components - -- { "MunifTanjim/nui.nvim", lazy = true }, - -- -- noicer ui - -- { - -- "folke/noice.nvim", - -- event = "VeryLazy", - -- opts = { - -- lsp = { - -- override = { - -- ["vim.lsp.util.convert_input_to_markdown_lines"] = true, - -- ["vim.lsp.util.stylize_markdown"] = true, - -- }, - -- }, - -- presets = { - -- bottom_search = true, - -- command_palette = true, - -- long_message_to_split = true, - -- }, - -- }, - -- -- stylua: ignore - -- keys = { - -- { "", function() require("noice").redirect(vim.fn.getcmdline()) end, mode = "c", desc = "Redirect Cmdline" }, - -- { "snl", function() require("noice").cmd("last") end, desc = "Noice Last Message" }, - -- { "snh", function() require("noice").cmd("history") end, desc = "Noice History" }, - -- { "sna", function() require("noice").cmd("all") end, desc = "Noice All" }, - -- { "", function() if not require("noice.lsp").scroll(4) then return "" end end, silent = true, expr = true, desc = "Scroll forward", mode = {"i", "n", "s"} }, - -- { "", function() if not require("noice.lsp").scroll(-4) then return "" end end, silent = true, expr = true, desc = "Scroll backward", mode = {"i", "n", "s"}}, - -- }, - -- }, - - -- simbol outline - { - "simrat39/symbols-outline.nvim", - event = "BufRead", - config = function() - require("symbols-outline").setup() - end, - }, } diff --git a/lua/user/whichkey.lua b/lua/user/whichkey.lua index 1c4ae6a..9115c3a 100644 --- a/lua/user/whichkey.lua +++ b/lua/user/whichkey.lua @@ -243,7 +243,6 @@ local mappings = { }, r = { "RunCode", "Run Code" }, f = { "RunFile", "Run File" }, - j = { "Jaq float", "Run With Jaq" }, p = { "RunProject", "Run Project" }, g = { "ToggleTerm size=70 direction=floatcleargradle run" .. trn, "Run Gradle" }, m = { @@ -393,7 +392,6 @@ local mappings = { l = { "Lazy log", "Log" }, d = { "Lazy debug", "Debug" }, }, - ["o"] = { "SymbolsOutline", "Symbol Outline" }, } local wkey = {}