From ebd9aac40f5ccd56582e6cc80383902025348c1a Mon Sep 17 00:00:00 2001 From: Christian Nieves Date: Mon, 27 Mar 2023 11:31:22 -0500 Subject: [PATCH] stuff lol --- tmux/.tmux.conf | 1 + vim/.vim/lua/config/lualine.lua | 6 +-- vim/.vim/lua/config/nerdtree.lua | 4 ++ vim/.vim/lua/config/nvim-tree.lua | 72 ++++++++++++++++++++++++- vim/.vim/lua/config/symbols-outline.lua | 1 - vim/.vim/lua/config/telescope.lua | 7 --- vim/.vim/lua/plugins.lua | 8 +-- vim/.vim/prefs/mappings.vim | 5 +- 8 files changed, 86 insertions(+), 18 deletions(-) create mode 100644 vim/.vim/lua/config/nerdtree.lua diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf index 4406be2..5044acc 100644 --- a/tmux/.tmux.conf +++ b/tmux/.tmux.conf @@ -28,6 +28,7 @@ set-window-option -g pane-base-index 1 # enable OSC 52 clipboard set -s set-clipboard external +set-option -ag terminal-overrides ",xterm-256color:Ms=\\E]52;c;%p2%s\\7" # tmux-256color instead of screen-256color enables italics set -g default-terminal "tmux-256color" diff --git a/vim/.vim/lua/config/lualine.lua b/vim/.vim/lua/config/lualine.lua index a784593..9e8adfb 100644 --- a/vim/.vim/lua/config/lualine.lua +++ b/vim/.vim/lua/config/lualine.lua @@ -69,9 +69,9 @@ require('lualine').setup { lualine_a = {{'tabs', mode = 1}}, -- lualine_b = {'branch'}, -- lualine_c = {'filename'}, - lualine_c = { - { 'diagnostics', sources = {"nvim_lsp", "nvim_workspace_diagnostic"}, symbols = {error = ' ', warn = ' ', info = ' ', hint = ' '} }, - }, + -- lualine_c = { + -- { 'diagnostics', sources = {"nvim_lsp", "nvim_workspace_diagnostic"}, symbols = {error = ' ', warn = ' ', info = ' ', hint = ' '} }, + -- }, -- lualine_y = { getLGTMs } }, -- default diff --git a/vim/.vim/lua/config/nerdtree.lua b/vim/.vim/lua/config/nerdtree.lua new file mode 100644 index 0000000..41197ba --- /dev/null +++ b/vim/.vim/lua/config/nerdtree.lua @@ -0,0 +1,4 @@ +local map = require("utils").map + +map('n', '', ':NERDTreeToggle') +map('n', '', ':NERDTreeFind') diff --git a/vim/.vim/lua/config/nvim-tree.lua b/vim/.vim/lua/config/nvim-tree.lua index 2147273..10d7816 100644 --- a/vim/.vim/lua/config/nvim-tree.lua +++ b/vim/.vim/lua/config/nvim-tree.lua @@ -1,5 +1,75 @@ local map = require("utils").map -require("nvim-tree").setup() +local api = require("nvim-tree.api") + +local function opts(desc) + return { desc = 'nvim-tree: ' .. desc, buffer = bufnr, noremap = true, silent = true, nowait = true } +end + +function on_attach(bufnr) + vim.keymap.set('n', 'O', api.tree.change_root_to_node, opts('CD')) + vim.keymap.set('n', '?', api.tree.toggle_help, opts('Help')) + + -- put some default mappings here + 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', 'g?', 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')) +end + +require("nvim-tree").setup({ + on_attach = on_attach, + update_focused_file = { + enable = true, + update_root = false, + ignore_list = {}, + }, +}) map("n", "", ":NvimTreeToggle") +map("n", "", ":NvimTreeFindFileToggle") diff --git a/vim/.vim/lua/config/symbols-outline.lua b/vim/.vim/lua/config/symbols-outline.lua index 7c8ee1d..b207bb0 100644 --- a/vim/.vim/lua/config/symbols-outline.lua +++ b/vim/.vim/lua/config/symbols-outline.lua @@ -20,5 +20,4 @@ require("symbols-outline").setup( local map = require("utils").map - map('n', 'so', ':SymbolsOutline') diff --git a/vim/.vim/lua/config/telescope.lua b/vim/.vim/lua/config/telescope.lua index 9edb419..5a10bc1 100644 --- a/vim/.vim/lua/config/telescope.lua +++ b/vim/.vim/lua/config/telescope.lua @@ -42,9 +42,6 @@ require('telescope').setup { local map = require("utils").map -map('n', '', [[ lua require('telescope.builtin').buffers ]], { desc = '[ ] Find existing buffers' }) - - if use_google() then -- These custom mappings let you open telescope-codesearch quickly: map('n', '', @@ -75,8 +72,4 @@ if use_google() then [[lua require('telescope').extensions.codesearch.find_query{}]], { noremap = true, silent = true } ) - - -- map("n", - -- "ps", - -- [[:Telescope find_files find_command=hg,pstatus,-ma,-n,--template=]]) end diff --git a/vim/.vim/lua/plugins.lua b/vim/.vim/lua/plugins.lua index 32fc4c5..8ccd6b8 100644 --- a/vim/.vim/lua/plugins.lua +++ b/vim/.vim/lua/plugins.lua @@ -54,10 +54,10 @@ require('packer').startup(function(use) config =[[ require("config.nvim-treesitter") ]] } - use { - 'nvim-tree/nvim-tree.lua', - config =[[ require("config.nvim-tree") ]] - } + -- use { + -- 'nvim-tree/nvim-tree.lua', + -- config =[[ require("config.nvim-tree") ]] + -- } -- Undo tree use { diff --git a/vim/.vim/prefs/mappings.vim b/vim/.vim/prefs/mappings.vim index 724fbd7..d4e0b7f 100644 --- a/vim/.vim/prefs/mappings.vim +++ b/vim/.vim/prefs/mappings.vim @@ -44,8 +44,9 @@ nnoremap vv v nnoremap ss s " always use very magic mode when searching -"nnoremap / /\v -"vnoremap / /\v +nnoremap / /\v +vnoremap / /\v + nnoremap ww :call WindowSwap#EasyWindowSwap() function! s:createHabitsMappings(keys, message) abort