diff --git a/dconf/.config/dconf/user b/dconf/.config/dconf/user index 7decc2e0c..d36afe49e 100644 Binary files a/dconf/.config/dconf/user and b/dconf/.config/dconf/user differ diff --git a/emacs/.config/emacs/config.org b/emacs/.config/emacs/config.org index 21ebadc87..99bfe783b 100644 --- a/emacs/.config/emacs/config.org +++ b/emacs/.config/emacs/config.org @@ -36,7 +36,6 @@ - [[#source-code-block-tag-expansion][Source Code Block Tag Expansion]] - [[#projectile][PROJECTILE]] - [[#rainbow-mode][RAINBOW MODE]] -- [[#reload-emacs][RELOAD EMACS]] - [[#shells-and-terminals][SHELLS AND TERMINALS]] - [[#eshell][Eshell]] - [[#vterm][Vterm]] @@ -769,7 +768,6 @@ The first of the two lines below designates the directory where will place all o (setq doom-themes-enable-bold t ; if nil, bold is universally disabled doom-themes-enable-italic t)) ; if nil, italics is universally disabled - (load-theme 'minimal-mistakes t) #+end_src diff --git a/gtk-4.0/.config/gtk-4.0/settings.ini b/gtk-4.0/.config/gtk-4.0/settings.ini index 1e2e03631..fd35943ac 100644 --- a/gtk-4.0/.config/gtk-4.0/settings.ini +++ b/gtk-4.0/.config/gtk-4.0/settings.ini @@ -15,4 +15,3 @@ gtk-xft-antialias=true gtk-xft-hinting=true gtk-xft-hintstyle=hintmedium gtk-xft-rgba=rgb -gtk-modules=gail:atk-bridge diff --git a/nvim/.config/nvim/init.lua b/nvim/.config/nvim/init.lua index e9edd26cf..b6a832c92 100644 --- a/nvim/.config/nvim/init.lua +++ b/nvim/.config/nvim/init.lua @@ -10,6 +10,7 @@ require "user.treesitter" require "user.autopairs" require "user.comment" require "user.gitsigns" +require "user.nvim-tree" require "user.bufferline" require "user.lualine" require "user.toggleterm" diff --git a/nvim/.config/nvim/lua/user/nvim-tree.lua b/nvim/.config/nvim/lua/user/nvim-tree.lua new file mode 100644 index 000000000..82495a656 --- /dev/null +++ b/nvim/.config/nvim/lua/user/nvim-tree.lua @@ -0,0 +1,146 @@ +local status_ok, nvim_tree = pcall(require, "nvim-tree") +if not status_ok then return end + +local config_status_ok, nvim_tree_config = pcall(require, "nvim-tree.config") +if not config_status_ok then return end + +local tree_cb = nvim_tree_config.nvim_tree_callback + +local function on_attach(bufnr) + local api = require("nvim-tree.api") + + local function opts(desc) + return { desc = "nvim-tree: " .. desc, buffer = bufnr, noremap = true, silent = true, nowait = true } + end + + vim.keymap.set('n', '', api.tree.change_root_to_node, opts('CD')) + vim.keymap.set('n', '', api.node.open.replace_tree_buffer, opts('Open: In Place')) + vim.keymap.set('n', '', api.node.show_info_popup, opts('Info')) + vim.keymap.set('n', '', api.fs.rename_sub, opts('Rename: Omit Filename')) + vim.keymap.set('n', '', api.node.open.tab, opts('Open: New Tab')) + vim.keymap.set('n', '', api.node.open.vertical, opts('Open: Vertical Split')) + vim.keymap.set('n', '', api.node.open.horizontal, opts('Open: Horizontal Split')) + vim.keymap.set('n', '', api.node.navigate.parent_close, opts('Close Directory')) + vim.keymap.set('n', '', api.node.open.edit, opts('Open')) + vim.keymap.set('n', '', api.node.open.preview, opts('Open Preview')) + vim.keymap.set('n', '>', api.node.navigate.sibling.next, opts('Next Sibling')) + vim.keymap.set('n', '<', api.node.navigate.sibling.prev, opts('Previous Sibling')) + vim.keymap.set('n', '.', api.node.run.cmd, opts('Run Command')) + vim.keymap.set('n', '-', api.tree.change_root_to_parent, opts('Up')) + vim.keymap.set('n', 'a', api.fs.create, opts('Create')) + vim.keymap.set('n', 'bmv', api.marks.bulk.move, opts('Move Bookmarked')) + vim.keymap.set('n', 'B', api.tree.toggle_no_buffer_filter, opts('Toggle No Buffer')) + vim.keymap.set('n', 'c', api.fs.copy.node, opts('Copy')) + vim.keymap.set('n', 'C', api.tree.toggle_git_clean_filter, opts('Toggle Git Clean')) + vim.keymap.set('n', '[c', api.node.navigate.git.prev, opts('Prev Git')) + vim.keymap.set('n', ']c', api.node.navigate.git.next, opts('Next Git')) + vim.keymap.set('n', 'd', api.fs.remove, opts('Delete')) + vim.keymap.set('n', 'D', api.fs.trash, opts('Trash')) + vim.keymap.set('n', 'E', api.tree.expand_all, opts('Expand All')) + vim.keymap.set('n', 'e', api.fs.rename_basename, opts('Rename: Basename')) + vim.keymap.set('n', ']e', api.node.navigate.diagnostics.next, opts('Next Diagnostic')) + vim.keymap.set('n', '[e', api.node.navigate.diagnostics.prev, opts('Prev Diagnostic')) + vim.keymap.set('n', 'F', api.live_filter.clear, opts('Clean Filter')) + vim.keymap.set('n', 'f', api.live_filter.start, opts('Filter')) + vim.keymap.set('n', '?', api.tree.toggle_help, opts('Help')) + vim.keymap.set('n', 'gy', api.fs.copy.absolute_path, opts('Copy Absolute Path')) + vim.keymap.set('n', 'H', api.tree.toggle_hidden_filter, opts('Toggle Dotfiles')) + vim.keymap.set('n', 'I', api.tree.toggle_gitignore_filter, opts('Toggle Git Ignore')) + vim.keymap.set('n', 'J', api.node.navigate.sibling.last, opts('Last Sibling')) + vim.keymap.set('n', 'K', api.node.navigate.sibling.first, opts('First Sibling')) + vim.keymap.set('n', 'm', api.marks.toggle, opts('Toggle Bookmark')) + vim.keymap.set('n', 'o', api.node.open.edit, opts('Open')) + vim.keymap.set('n', 'O', api.node.open.no_window_picker, opts('Open: No Window Picker')) + vim.keymap.set('n', 'p', api.fs.paste, opts('Paste')) + vim.keymap.set('n', 'P', api.node.navigate.parent, opts('Parent Directory')) + vim.keymap.set('n', 'q', api.tree.close, opts('Close')) + vim.keymap.set('n', 'r', api.fs.rename, opts('Rename')) + vim.keymap.set('n', 'R', api.tree.reload, opts('Refresh')) + vim.keymap.set('n', 's', api.node.run.system, opts('Run System')) + vim.keymap.set('n', 'S', api.tree.search_node, opts('Search')) + vim.keymap.set('n', 'U', api.tree.toggle_custom_filter, opts('Toggle Hidden')) + vim.keymap.set('n', 'W', api.tree.collapse_all, opts('Collapse')) + vim.keymap.set('n', 'x', api.fs.cut, opts('Cut')) + vim.keymap.set('n', 'y', api.fs.copy.filename, opts('Copy Name')) + vim.keymap.set('n', 'Y', api.fs.copy.relative_path, opts('Copy Relative Path')) + vim.keymap.set('n', '<2-LeftMouse>', api.node.open.edit, opts('Open')) + vim.keymap.set('n', '<2-RightMouse>', api.tree.change_root_to_node, opts('CD')) + + vim.keymap.set("n", "l", api.node.open.edit, opts("Open")) + vim.keymap.set("n", "", api.node.open.edit, opts("Open")) + vim.keymap.set("n", "o", api.node.open.edit, opts("Open")) + vim.keymap.set("n", "h", api.node.navigate.parent_close, opts("Close Directory")) + vim.keymap.set("n", "v", api.node.open.vertical, opts("Open: Vertical Split")) +end + +nvim_tree.setup({ + on_attach = on_attach, + disable_netrw = true, + hijack_netrw = true, + open_on_tab = false, + hijack_cursor = false, + update_cwd = false, + diagnostics = { + enable = true, + icons = { + error = "", + hint = "", + info = "", + warning = "", + } + }, + update_focused_file = { + enable = true, + update_cwd = false, + ignore_list = {} + }, + system_open = { + cmd = nil, + args = {} + }, + filters = { + dotfiles = false, + custom = {} + }, + git = { + enable = true, + ignore = true, + timeout = 500, + }, + view = { + width = 65, + hide_root_folder = false, + side = "left", + number = true, + relativenumber = true, + signcolumn = "yes" + }, + trash = { + cmd = "trash", + require_confirm = true + }, + renderer = { + icons = { + glyphs = { + default = "", + symlink = "", + git = { + unstaged = "", + staged = "S", + unmerged = "", + renamed = "➜", + deleted = "", + untracked = "U", + ignored = "◌", + }, + folder = { + default = "", + open = "", + empty = "", + empty_open = "", + symlink = "", + }, + } + } + }, +}) \ No newline at end of file diff --git a/nvim/.config/nvim/lua/user/plugins.lua b/nvim/.config/nvim/lua/user/plugins.lua index 78c1a44c1..060b75a17 100644 --- a/nvim/.config/nvim/lua/user/plugins.lua +++ b/nvim/.config/nvim/lua/user/plugins.lua @@ -43,6 +43,7 @@ return packer.startup(function(use) use({"numToStr/Comment.nvim"}) use({"JoosepAlviste/nvim-ts-context-commentstring"}) use({"kyazdani42/nvim-web-devicons"}) + use({"kyazdani42/nvim-tree.lua"}) use({"akinsho/bufferline.nvim"}) use({"moll/vim-bbye"}) use({"nvim-lualine/lualine.nvim"}) @@ -81,10 +82,7 @@ return packer.startup(function(use) 'j-hui/fidget.nvim' } }) -- enable LSP - use { - 'j-hui/fidget.nvim', - tag = 'legacy', - } + use {'j-hui/fidget.nvim', tag = 'legacy'} use({"jose-elias-alvarez/null-ls.nvim"}) -- for formatters and linters -- Telescope Fuzzy Finder (files, lsp, etc) diff --git a/nvim/.config/nvim/lua/user/whichkey.lua b/nvim/.config/nvim/lua/user/whichkey.lua index ec95cc7d0..eec50be02 100644 --- a/nvim/.config/nvim/lua/user/whichkey.lua +++ b/nvim/.config/nvim/lua/user/whichkey.lua @@ -84,7 +84,7 @@ local mappings = { "lua require('telescope.builtin').buffers(require('telescope.themes').get_dropdown{previewer = false})", "Buffers", }, - -- ["e"] = { "NvimTreeToggle", "Explorer" }, + ["e"] = { "NvimTreeToggle", "Explorer" }, ["w"] = { "w!", "Save" }, ["q"] = { "q!", "Quit" }, ["c"] = { "Bdelete!", "Close Buffer" }, diff --git a/nvim/.config/nvim/plugin/packer_compiled.lua b/nvim/.config/nvim/plugin/packer_compiled.lua index c40cf3604..d1bd4f25e 100644 --- a/nvim/.config/nvim/plugin/packer_compiled.lua +++ b/nvim/.config/nvim/plugin/packer_compiled.lua @@ -209,6 +209,11 @@ _G.packer_plugins = { path = "/home/repo/.local/share/nvim/site/pack/packer/start/nvim-lspconfig", url = "https://github.com/neovim/nvim-lspconfig" }, + ["nvim-tree.lua"] = { + loaded = true, + path = "/home/repo/.local/share/nvim/site/pack/packer/start/nvim-tree.lua", + url = "https://github.com/kyazdani42/nvim-tree.lua" + }, ["nvim-treesitter"] = { loaded = true, path = "/home/repo/.local/share/nvim/site/pack/packer/start/nvim-treesitter",