diff --git a/lazy-lock.json b/lazy-lock.json index 5fb470a..8c355da 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -10,6 +10,7 @@ "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, "code_runner.nvim": { "branch": "main", "commit": "6c5bfe44a6c7523350cd706e6b3b8101166eed99" }, "codeium.vim": { "branch": "main", "commit": "289eb724e5d6fab2263e94a1ad6e54afebefafb2" }, + "darcula-dark.nvim": { "branch": "main", "commit": "d78f0ca9800f953f1509e275e8de0d2aefb8ccb6" }, "dressing.nvim": { "branch": "master", "commit": "572314728cb1ce012e825fd66331f52c94acac12" }, "friendly-snippets": { "branch": "main", "commit": "d0610077b6129cf9f7f78afbe3a1425d60f6e2f1" }, "gitsigns.nvim": { "branch": "main", "commit": "76927d14d3fbd4ba06ccb5246e79d93b5442c188" }, @@ -30,14 +31,13 @@ "nvim-autopairs": { "branch": "master", "commit": "c15de7e7981f1111642e7e53799e1211d4606cb9" }, "nvim-cmp": { "branch": "main", "commit": "5260e5e8ecadaf13e6b82cf867a909f54e15fd07" }, "nvim-colorizer.lua": { "branch": "master", "commit": "85855b38011114929f4058efc97af1059ab3e41d" }, - "nvim-juliana": { "branch": "master", "commit": "a5da27b456f440e652e04e25a282800bee2ea1e9" }, "nvim-lspconfig": { "branch": "master", "commit": "0b8165cf95806bc4bb8f745bb0c92021b2ed4b98" }, "nvim-material-icon": { "branch": "main", "commit": "7a8893417c6947925d00946d16b81b56574796a9" }, "nvim-navic": { "branch": "master", "commit": "8649f694d3e76ee10c19255dece6411c29206a54" }, "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, "nvim-scrollview": { "branch": "main", "commit": "c29c5f69d37040a1fac88cbea7f5e6f06f0aff4d" }, "nvim-tree.lua": { "branch": "master", "commit": "2bc725a3ebc23f0172fb0ab4d1134b81bcc13812" }, - "nvim-treesitter": { "branch": "master", "commit": "5c924407cf110e9da4f3ba02ffed127b4198ad89" }, + "nvim-treesitter": { "branch": "master", "commit": "f770df9c8cd56c05b878cdf35115ad872c822bc0" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "3557e41418b4a6c5b85d5d64abe94c9c50fa9b14" }, "nvim-ts-autotag": { "branch": "main", "commit": "bcf3146864262ef2d3c877beba3e222b5c73780d" }, "nvim-ts-context-commentstring": { "branch": "main", "commit": "cb064386e667def1d241317deed9fd1b38f0dc2e" }, diff --git a/lua/custom/default.lua b/lua/custom/default.lua index 164b558..b6022a4 100644 --- a/lua/custom/default.lua +++ b/lua/custom/default.lua @@ -15,7 +15,7 @@ -- solarized-osaka -- darcula-dark -- juliana -vim.g.pcode_colorscheme = "juliana" +vim.g.pcode_colorscheme = "darcula-dark" -- 0 =off 1= on vim.g.pcode_transparent_mode = 0 diff --git a/lua/custom/plugins/nvim_tree.lua b/lua/custom/plugins/nvim_tree.lua index ee625e6..a04d910 100644 --- a/lua/custom/plugins/nvim_tree.lua +++ b/lua/custom/plugins/nvim_tree.lua @@ -1,279 +1,255 @@ +local icons = vim.g.pcode_icons +local HEIGHT_RATIO = 0.9 -- You can change this +local WIDTH_RATIO = 0.5 -- You can change this too return { - -- { - -- "kyazdani42/nvim-tree.lua", - -- lazy = true, - -- event = "VeryLazy", - -- cmd = { "NvimTree", "NvimTreeOpen", "NvimTreeToggle", "NvimTreeFocus", "NvimTreeClose" }, - -- -- dependencies = "kyazdani42/nvim-web-devicons", - -- config = function() - -- local data_exists, treeconfig = pcall(require, "core.config") - -- if data_exists then - -- if treeconfig.loadnvimtree_lazy then - -- vim.g.loaded_netrw = 1 - -- vim.g.loaded_netrwPlugin = 1 - -- - -- -- set termguicolors to enable highlight groups - -- vim.opt.termguicolors = true - -- local status_ok, nvim_tree = pcall(require, "nvim-tree") - -- if not status_ok then - -- return - -- end - -- - -- local HEIGHT_RATIO = 0.9 -- You can change this - -- local WIDTH_RATIO = 0.5 -- You can change this too - -- - -- local icons = require("user.icons") - -- nvim_tree.setup({ - -- auto_reload_on_write = false, - -- disable_netrw = false, - -- hijack_cursor = false, - -- hijack_netrw = true, - -- hijack_unnamed_buffer_when_opening = false, - -- sort_by = "name", - -- root_dirs = {}, - -- prefer_startup_root = false, - -- sync_root_with_cwd = true, - -- reload_on_bufenter = false, - -- respect_buf_cwd = false, - -- on_attach = "default", - -- select_prompts = false, - -- view = { - -- adaptive_size = false, - -- centralize_selection = true, - -- -- width = 30, - -- side = "left", - -- preserve_window_proportions = false, - -- number = false, - -- relativenumber = false, - -- signcolumn = "yes", - -- -- float = { - -- -- enable = true, - -- -- quit_on_focus_loss = true, - -- -- open_win_config = { - -- -- relative = "editor", - -- -- border = "rounded", - -- -- width = 30, - -- -- height = 30, - -- -- row = 1, - -- -- col = 1, - -- -- }, - -- -- }, - -- float = { - -- enable = true, - -- open_win_config = function() - -- local screen_w = vim.opt.columns:get() - -- local screen_h = vim.opt.lines:get() - vim.opt.cmdheight:get() - -- local window_w = screen_w * WIDTH_RATIO - -- local window_h = screen_h * HEIGHT_RATIO - -- local window_w_int = math.floor(window_w) - -- local window_h_int = math.floor(window_h) - -- local center_x = (screen_w - window_w) / 2 - -- local center_y = ((vim.opt.lines:get() - window_h) / 2) - vim.opt.cmdheight:get() - -- return { - -- border = "rounded", - -- relative = "editor", - -- row = center_y, - -- col = center_x, - -- width = window_w_int, - -- height = window_h_int, - -- } - -- end, - -- }, - -- width = function() - -- return math.floor(vim.opt.columns:get() * WIDTH_RATIO) - -- end, - -- }, - -- renderer = { - -- add_trailing = false, - -- group_empty = false, - -- highlight_git = true, - -- full_name = false, - -- highlight_opened_files = "none", - -- root_folder_label = ":t", - -- -- root_folder_label = false, - -- indent_width = 2, - -- indent_markers = { - -- enable = true, - -- inline_arrows = true, - -- icons = { - -- corner = "└", - -- edge = "│", - -- item = "│", - -- none = " ", - -- }, - -- }, - -- icons = { - -- webdev_colors = true, - -- git_placement = "before", - -- padding = " ", - -- symlink_arrow = " ➛ ", - -- show = { - -- file = true, - -- folder = true, - -- folder_arrow = true, - -- git = true, - -- }, - -- glyphs = { - -- default = icons.ui.Text, - -- symlink = icons.ui.FileSymlink, - -- bookmark = icons.ui.BookMark, - -- folder = { - -- -- arrow_closed = icons.ui.TriangleShortArrowRight, - -- arrow_closed = icons.ui.ChevronShortRight, - -- -- arrow_open = icons.ui.TriangleShortArrowDown, - -- arrow_open = icons.ui.ChevronShortDown, - -- default = icons.ui.Folder, - -- open = icons.ui.FolderOpen, - -- empty = icons.ui.EmptyFolder, - -- empty_open = icons.ui.EmptyFolderOpen, - -- symlink = icons.ui.FolderSymlink, - -- symlink_open = icons.ui.FolderOpen, - -- }, - -- git = { - -- unstaged = icons.git.FileUnstaged, - -- staged = icons.git.FileStaged, - -- unmerged = icons.git.FileUnmerged, - -- renamed = icons.git.FileRenamed, - -- untracked = icons.git.FileUntracked, - -- deleted = icons.git.FileDeleted, - -- ignored = icons.git.FileIgnored, - -- }, - -- }, - -- }, - -- special_files = { "Cargo.toml", "Makefile", "README.md", "readme.md" }, - -- symlink_destination = true, - -- }, - -- hijack_directories = { - -- enable = false, - -- auto_open = true, - -- }, - -- update_focused_file = { - -- enable = true, - -- debounce_delay = 15, - -- update_root = true, - -- ignore_list = {}, - -- }, - -- diagnostics = { - -- enable = true, - -- show_on_dirs = false, - -- show_on_open_dirs = true, - -- debounce_delay = 50, - -- severity = { - -- min = vim.diagnostic.severity.HINT, - -- max = vim.diagnostic.severity.ERROR, - -- }, - -- icons = { - -- hint = icons.diagnostics.BoldHint, - -- info = icons.diagnostics.BoldInformation, - -- warning = icons.diagnostics.BoldWarning, - -- error = icons.diagnostics.BoldError, - -- }, - -- }, - -- filters = { - -- dotfiles = false, - -- git_clean = false, - -- no_buffer = false, - -- custom = { "node_modules", "\\.cache", "\\.git" }, - -- exclude = { - -- ".gitignore", - -- ".prettierignore", - -- }, - -- }, - -- filesystem_watchers = { - -- enable = true, - -- debounce_delay = 50, - -- ignore_dirs = {}, - -- }, - -- git = { - -- enable = true, - -- ignore = false, - -- show_on_dirs = true, - -- show_on_open_dirs = true, - -- disable_for_dirs = {}, - -- timeout = 400, - -- }, - -- actions = { - -- use_system_clipboard = true, - -- change_dir = { - -- enable = true, - -- global = false, - -- restrict_above_cwd = false, - -- }, - -- expand_all = { - -- max_folder_discovery = 300, - -- exclude = {}, - -- }, - -- file_popup = { - -- open_win_config = { - -- col = 1, - -- row = 1, - -- relative = "cursor", - -- border = "shadow", - -- style = "minimal", - -- }, - -- }, - -- open_file = { - -- quit_on_open = false, - -- resize_window = false, - -- window_picker = { - -- enable = true, - -- picker = "default", - -- chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890", - -- exclude = { - -- filetype = { "notify", "lazy", "qf", "diff", "fugitive", "fugitiveblame" }, - -- buftype = { "nofile", "terminal", "help" }, - -- }, - -- }, - -- }, - -- remove_file = { - -- close_window = true, - -- }, - -- }, - -- trash = { - -- cmd = "trash", - -- require_confirm = true, - -- }, - -- live_filter = { - -- prefix = "[FILTER]: ", - -- always_show_folders = true, - -- }, - -- tab = { - -- sync = { - -- open = false, - -- close = false, - -- ignore = {}, - -- }, - -- }, - -- notify = { - -- threshold = vim.log.levels.INFO, - -- -- threshold = vim.log.levels.ERROR, - -- }, - -- log = { - -- enable = false, - -- truncate = false, - -- types = { - -- all = false, - -- config = false, - -- copy_paste = false, - -- dev = false, - -- diagnostics = false, - -- git = false, - -- profile = false, - -- watcher = false, - -- }, - -- }, - -- system_open = { - -- cmd = nil, - -- args = {}, - -- }, - -- }) - -- end - -- end - -- -- auto open file if creation - -- local api = require("nvim-tree.api") - -- api.events.subscribe(api.events.Event.FileCreated, function(file) - -- vim.cmd("edit " .. file.fname) - -- end) - -- end, - -- }, + -- "kyazdani42/nvim-tree.lua", + -- lazy = true, + -- cmd = { "NvimTreeFindFileToggle","NvimTree", "NvimTreeOpen", "NvimTreeToggle", "NvimTreeFocus", "NvimTreeClose" }, + -- opts = { + -- auto_reload_on_write = false, + -- disable_netrw = false, + -- hijack_cursor = false, + -- hijack_netrw = true, + -- hijack_unnamed_buffer_when_opening = false, + -- sort_by = "name", + -- root_dirs = {}, + -- prefer_startup_root = false, + -- sync_root_with_cwd = true, + -- reload_on_bufenter = false, + -- respect_buf_cwd = false, + -- on_attach = "default", + -- select_prompts = false, + -- view = { + -- adaptive_size = false, + -- centralize_selection = true, + -- -- width = 30, + -- side = "left", + -- preserve_window_proportions = false, + -- number = false, + -- relativenumber = false, + -- signcolumn = "yes", + -- -- float = { + -- -- enable = false, + -- -- quit_on_focus_loss = true, + -- -- open_win_config = { + -- -- relative = "editor", + -- -- border = "rounded", + -- -- width = 30, + -- -- height = 30, + -- -- row = 1, + -- -- col = 1, + -- -- }, + -- -- }, + -- float = { + -- enable = true, + -- open_win_config = function() + -- local screen_w = vim.opt.columns:get() + -- local screen_h = vim.opt.lines:get() - vim.opt.cmdheight:get() + -- local window_w = screen_w * WIDTH_RATIO + -- local window_h = screen_h * HEIGHT_RATIO + -- local window_w_int = math.floor(window_w) + -- local window_h_int = math.floor(window_h) + -- local center_x = (screen_w - window_w) / 2 + -- local center_y = ((vim.opt.lines:get() - window_h) / 2) - vim.opt.cmdheight:get() + -- return { + -- border = "rounded", + -- relative = "editor", + -- row = center_y, + -- col = center_x, + -- width = window_w_int, + -- height = window_h_int, + -- } + -- end, + -- }, + -- width = function() + -- return math.floor(vim.opt.columns:get() * WIDTH_RATIO) + -- end, + -- }, + -- renderer = { + -- add_trailing = false, + -- group_empty = false, + -- highlight_git = true, + -- full_name = false, + -- highlight_opened_files = "none", + -- -- root_folder_label = ":t", + -- root_folder_label = false, + -- indent_width = 2, + -- indent_markers = { + -- enable = true, + -- inline_arrows = true, + -- icons = { + -- corner = "└", + -- edge = "│", + -- item = "│", + -- none = " ", + -- }, + -- }, + -- icons = { + -- webdev_colors = true, + -- git_placement = "before", + -- padding = " ", + -- symlink_arrow = " ➛ ", + -- show = { + -- file = true, + -- folder = true, + -- folder_arrow = true, + -- git = true, + -- }, + -- glyphs = { + -- default = icons.ui.Text, + -- symlink = icons.ui.FileSymlink, + -- bookmark = icons.ui.BookMark, + -- folder = { + -- -- arrow_closed = icons.ui.TriangleShortArrowRight, + -- arrow_closed = icons.ui.ChevronShortRight, + -- -- arrow_open = icons.ui.TriangleShortArrowDown, + -- arrow_open = icons.ui.ChevronShortDown, + -- default = icons.ui.Folder, + -- open = icons.ui.FolderOpen, + -- empty = icons.ui.EmptyFolder, + -- empty_open = icons.ui.EmptyFolderOpen, + -- symlink = icons.ui.FolderSymlink, + -- symlink_open = icons.ui.FolderOpen, + -- }, + -- git = { + -- unstaged = icons.git.FileUnstaged, + -- staged = icons.git.FileStaged, + -- unmerged = icons.git.FileUnmerged, + -- renamed = icons.git.FileRenamed, + -- untracked = icons.git.FileUntracked, + -- deleted = icons.git.FileDeleted, + -- ignored = icons.git.FileIgnored, + -- }, + -- }, + -- }, + -- special_files = { "Cargo.toml", "Makefile", "README.md", "readme.md" }, + -- symlink_destination = true, + -- }, + -- hijack_directories = { + -- enable = false, + -- auto_open = true, + -- }, + -- update_focused_file = { + -- enable = true, + -- debounce_delay = 15, + -- update_root = true, + -- ignore_list = {}, + -- }, + -- diagnostics = { + -- enable = true, + -- show_on_dirs = false, + -- show_on_open_dirs = true, + -- debounce_delay = 50, + -- severity = { + -- min = vim.diagnostic.severity.HINT, + -- max = vim.diagnostic.severity.ERROR, + -- }, + -- icons = { + -- hint = icons.diagnostics.BoldHint, + -- info = icons.diagnostics.BoldInformation, + -- warning = icons.diagnostics.BoldWarning, + -- error = icons.diagnostics.BoldError, + -- }, + -- }, + -- filters = { + -- dotfiles = false, + -- git_clean = false, + -- no_buffer = false, + -- custom = { "node_modules", "\\.cache", "\\.git" }, + -- exclude = { + -- ".gitignore", + -- ".prettierignore", + -- }, + -- }, + -- filesystem_watchers = { + -- enable = true, + -- debounce_delay = 50, + -- ignore_dirs = {}, + -- }, + -- git = { + -- enable = true, + -- ignore = false, + -- show_on_dirs = true, + -- show_on_open_dirs = true, + -- disable_for_dirs = {}, + -- timeout = 400, + -- }, + -- actions = { + -- use_system_clipboard = true, + -- change_dir = { + -- enable = true, + -- global = false, + -- restrict_above_cwd = false, + -- }, + -- expand_all = { + -- max_folder_discovery = 300, + -- exclude = {}, + -- }, + -- file_popup = { + -- open_win_config = { + -- col = 1, + -- row = 1, + -- relative = "cursor", + -- border = "shadow", + -- style = "minimal", + -- }, + -- }, + -- open_file = { + -- quit_on_open = false, + -- resize_window = false, + -- window_picker = { + -- enable = true, + -- picker = "default", + -- chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890", + -- exclude = { + -- filetype = { "notify", "lazy", "qf", "diff", "fugitive", "fugitiveblame" }, + -- buftype = { "nofile", "terminal", "help" }, + -- }, + -- }, + -- }, + -- remove_file = { + -- close_window = true, + -- }, + -- }, + -- trash = { + -- cmd = "trash", + -- require_confirm = true, + -- }, + -- live_filter = { + -- prefix = "[FILTER]: ", + -- always_show_folders = true, + -- }, + -- tab = { + -- sync = { + -- open = false, + -- close = false, + -- ignore = {}, + -- }, + -- }, + -- notify = { + -- threshold = vim.log.levels.INFO, + -- -- threshold = vim.log.levels.ERROR, + -- }, + -- log = { + -- enable = false, + -- truncate = false, + -- types = { + -- all = false, + -- config = false, + -- copy_paste = false, + -- dev = false, + -- diagnostics = false, + -- git = false, + -- profile = false, + -- watcher = false, + -- }, + -- }, + -- system_open = { + -- cmd = nil, + -- args = {}, + -- }, + -- }, + -- config = function(_, opts) + -- require("nvim-tree").setup(opts) + -- end, }