diff --git a/README.md b/README.md index be2f1e4..58c626f 100644 --- a/README.md +++ b/README.md @@ -67,12 +67,12 @@ ## Basic Requirement 2. Install Neovim 9.0+ https://github.com/neovim/neovim/releases/tag/stable -3. C++ (windows) Compiler https://www.msys2.org/ +3. C++ https://www.mingw-w64.org/downloads/ 4. GIT https://git-scm.com/download/win 5. NodeJs https://nodejs.org/en/ 6. Ripgrep https://github.com/BurntSushi/ripgrep 7. Lazygit https://github.com/jesseduffield/lazygit -8. Nerd Font https://github.com/ryanoasis/nerd-fonts +8. Nerd Font https://www.nerdfonts.com/ or https://github.com/ryanoasis/nerd-fonts 9. Windows Terminal (Windows) https://apps.microsoft.com/store/detail/windows-terminal/9N0DX20HK701?hl=en-id&gl=id 10. Powershell (windows) https://apps.microsoft.com/store/detail/powershell/9MZ1SNWT0N5D?hl=en-id&gl=id diff --git a/lazy-lock.json b/lazy-lock.json index fc81893..c93bed5 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -49,7 +49,6 @@ "telescope.nvim": { "branch": "master", "commit": "aa83606299c5beeaf80e656efbf07bde258db7be" }, "toggleterm.nvim": { "branch": "main", "commit": "193786e0371e3286d3bc9aa0079da1cd41beaa62" }, "tokyonight.nvim": { "branch": "main", "commit": "67c6050e1ca41260c919236a098ba278472c7520" }, - "transparent.nvim": { "branch": "main", "commit": "fd35a46f4b7c1b244249266bdcb2da3814f01724" }, "vim-illuminate": { "branch": "master", "commit": "305bf07b919ac526deb5193280379e2f8b599926" }, "vim-startuptime": { "branch": "master", "commit": "97a88e688482a09c3c4b777d07b509b328a5ec29" }, "vim-visual-multi": { "branch": "master", "commit": "1c9207b28c8898ab01b54e6d6b61b0b820a814bc" }, diff --git a/lua/custom/default.lua b/lua/custom/default.lua index 1e75e65..fc70499 100644 --- a/lua/custom/default.lua +++ b/lua/custom/default.lua @@ -26,7 +26,7 @@ vim.g.pcode_colorscheme = "tokyonight" -- dracula -- nightfox -- 0 =off 1= on -vim.g.pcode_transparent_mode = 1 +vim.g.pcode_transparent_mode = 0 vim.g.pcode_clear_lualine = 0 -- 0 disable progress -- 1 lualine lsp progress diff --git a/lua/custom/plugins/tokyonight.lua b/lua/custom/plugins/tokyonight.lua new file mode 100644 index 0000000..2ba0106 --- /dev/null +++ b/lua/custom/plugins/tokyonight.lua @@ -0,0 +1,62 @@ +return { + { + "folke/tokyonight.nvim", + lazy = false, + priority = 1000, + opts = {}, + config = function() + local status_ok, tokyonight = pcall(require, "tokyonight") + if not status_ok then + return + end + local transp = true + local sidebar = "transparent" --"dark , transparent, normal" + tokyonight.setup({ + -- your configuration comes here + -- or leave it empty to use the default settings + style = "night", -- The theme comes in three styles, `storm`, `moon`, a darker variant `night` and `day` + light_style = "day", -- The theme is used when the background is set to light + transparent = transp, -- Enable this to disable setting the background color + terminal_colors = true, -- Configure the colors used when opening a `:terminal` in Neovim + styles = { + -- Style to be applied to different syntax groups + -- Value is any valid attr-list value for `:help nvim_set_hl` + -- comments = { italic = true }, + comments = { italic = true }, + keywords = { italic = true }, + functions = {}, + variables = {}, + -- Background styles. Can be "dark", "transparent" or "normal" + sidebars = sidebar, -- style for sidebars, see below + floats = sidebar, -- style for floating windows + }, + sidebars = { "qf", "help" }, -- Set a darker background on sidebar-like windows. For example: `["qf", "vista_kind", "terminal", "packer"]` + day_brightness = 0.2, -- Adjusts the brightness of the colors of the **Day** style. Number between 0 and 1, from dull to vibrant colors + hide_inactive_statusline = false, -- Enabling this option, will hide inactive statuslines and replace them with a thin border instead. Should work with the standard **StatusLine** and **LuaLine**. + dim_inactive = false, -- dims inactive windows + lualine_bold = false, -- When `true`, section headers in the lualine theme will be bold + + --- You can override specific color groups to use other groups or a hex color + --- function will be called with a ColorScheme table + -- @param colors ColorScheme + on_colors = function(colors) + colors.bg_statusline = colors.none + end, + + --- You can override specific highlights to use other groups or a hex color + --- function will be called with a Highlights and ColorScheme table + --@param highlights Highlights + -- @param colors ColorScheme + on_highlights = function(highlights, colors) + highlights.NvimTreeFolderIcon = { + bg = colors.none, + fg = "#e0af68", + } + highlights.Underlined = { + underline = false, + } + end, + }) + end, + }, +} diff --git a/lua/plugins/lspprogress.lua b/lua/plugins/lspprogress.lua index fedf0d3..d2a7959 100644 --- a/lua/plugins/lspprogress.lua +++ b/lua/plugins/lspprogress.lua @@ -1,3 +1,23 @@ +local function ambilKataDariKiri(kalimat, jumlahKata) + local hasil = "" + local posisiAwal = 1 + local kataKe = 0 + + while kataKe < jumlahKata do + local posisiSpasi = string.find(kalimat, " ", posisiAwal) + if posisiSpasi then + hasil = hasil .. string.sub(kalimat, posisiAwal, posisiSpasi - 1) .. " " + posisiAwal = posisiSpasi + 1 + else + hasil = hasil .. string.sub(kalimat, posisiAwal) + break + end + kataKe = kataKe + 1 + end + + return hasil +end + local fidget = true local lualine = false local data_exists, custom_ui = pcall(require, "core.config") @@ -45,13 +65,13 @@ return { require("lsp-progress").setup({ client_format = function(client_name, spinner, series_messages) return #series_messages > 0 - and (spinner .. " " .. string.sub(table.concat(series_messages, ", "), 1, 25) .. " ...") + and (spinner .. " " .. ambilKataDariKiri(table.concat(series_messages, ", "), 4) .. "...") or nil end, format = function(client_messages) local sign = "" return #client_messages > 0 - and (sign .. " " .. string.sub(table.concat(client_messages, " "), 1, 25) .. " ...") + and (sign .. " " .. ambilKataDariKiri(table.concat(client_messages, " "), 4) .. "...") or sign end, }) diff --git a/lua/user/whichkey.lua b/lua/user/whichkey.lua index 93d79bf..1212b07 100644 --- a/lua/user/whichkey.lua +++ b/lua/user/whichkey.lua @@ -53,7 +53,7 @@ function _NEWTAB_TOGGLE() pwsh:toggle() end -function _open_explorer() +function _OPEN_EXPLORER() local Terminal = require("toggleterm.terminal").Terminal local pwsh = Terminal:new({ cmd = "explorer .", hidden = true, direction = "tab" }) pwsh:toggle() @@ -179,10 +179,10 @@ local opts2 = { nowait = true, -- use `nowait` when creating keymaps } -local trn = "" -if vim.fn.has("win32") == 1 then - trn = "pwsh" -end +-- local trn = "" +-- if vim.fn.has("win32") == 1 then +-- trn = "pwsh" +-- end -- for debug local debug_key = {} -- local trasparant = {} @@ -236,7 +236,7 @@ local mappings = { -- ["c"] = { "Bdelete!", "󰅗 Close Buffer" }, ["k"] = { "lua _close_buffer()", "󰅗 Close Buffer" }, -- open exloler and close toggleterm - ["o"] = { "lua _open_explorer()lua require('toggleterm').toggle()", "󱏒 Open Explorer" }, + ["o"] = { "lua _OPEN_EXPLORER()lua require('toggleterm').toggle()", "󱏒 Open Explorer" }, ["h"] = { "nohlsearch", "󱪿 No Highlight" }, ["f"] = { "Telescope find_files ",