Merge branch 'master' of https://github.com/mightypanders/dotfiles

nvim/lua/nvimtree.lua

@@ -1,66 +1,65 @@
-require'nvim-tree'.setup {
-	renderer ={
-		icons = {
-			padding = ' ',
-			symlink_arrow = ' >> ',
-			show = {  
-				git=true,  
-				folder=true,  
-				file=true,  
-				folder_arrow= false
-			},
-			glyphs = {
-     default= "",
-     symlink= "",
-     git= {
-       unstaged= "✗",
-       staged= "✓",
-       unmerged= "",
-       renamed= "➜",
-       untracked= "★",
-       deleted= "",
-       ignored= "◌"
-       },
-     folder= {
-       arrow_open= "",
-       arrow_closed= "",
-       default= "",
-       open= "",
-       empty= "",
-       empty_open= "",
-       symlink= "",
-       symlink_open= "",
-       }
-     },
-		},
-		add_trailing = true,
-		highlight_opened_files = "all",
-		root_folder_modifier = ':~',
-		special_files = { 
-			'README.md', 
-			'Makefile', 
-			'MAKEFILE' 
-		},
-		highlight_git = true,
-		indent_markers = {
-			enable = true,
-			icons = {
-				corner = "└",
+require 'nvim-tree'.setup {
+  renderer                           = {
+    icons = {
+      padding = ' ',
+      symlink_arrow = ' >> ',
+      show = {
+        git = true,
+        folder = true,
+        file = true,
+        folder_arrow = false
+      },
+      glyphs = {
+        default = "",
+        symlink = "",
+        git = {
+          unstaged = "✗",
+          staged = "✓",
+          unmerged = "",
+          renamed = "➜",
+          untracked = "★",
+          deleted = "",
+          ignored = "◌"
+        },
+        folder = {
+          arrow_open = "",
+          arrow_closed = "",
+          default = "",
+          open = "",
+          empty = "",
+          empty_open = "",
+          symlink = "",
+          symlink_open = "",
+        }
+      },
+    },
+    add_trailing = true,
+    highlight_opened_files = "all",
+    root_folder_modifier = ':~',
+    special_files = {
+      'README.md',
+      'Makefile',
+      'MAKEFILE'
+    },
+    highlight_git = true,
+    indent_markers = {
+      enable = true,
+      icons = {
+        corner = "└",
         edge = "│  ",
         none = "  ",
-			}
-		}
-	},
-	respect_buf_cwd 		= true,
-  disable_netrw       = true,
-  hijack_netrw        = true,
-  open_on_setup       = false,
-  ignore_ft_on_setup  = {},
-  open_on_tab         = false,
-  hijack_cursor       = true,
-  auto_reload_on_write = true,
-  update_cwd          = false,
-  diagnostics = {
+      }
+    }
+  },
+  respect_buf_cwd                    = true,
+  disable_netrw                      = true,
+  hijack_netrw                       = true,
+  ignore_ft_on_setup                 = {},
+  open_on_tab                        = false,
+  hijack_cursor                      = true,
+  auto_reload_on_write               = true,
+  hijack_unnamed_buffer_when_opening = true,
+  diagnostics                        = {
     enable = true,
     icons = {
       hint = "",
@@ -69,36 +68,36 @@ require'nvim-tree'.setup {
       error = "",
     }
   },
-  update_focused_file = {
+  update_focused_file                = {
     enable      = true,
     update_cwd  = true,
     ignore_list = {}
   },
-  system_open = {
+  system_open                        = {
     cmd  = nil,
     args = {}
   },
-  filters = {
+  filters                            = {
     dotfiles = false,
     custom = {}
   },
-	git={
-		ignore = false,
-		enable= true,
-		timeout=500,
-	},
-	actions = {
-		open_file = {
+  git                                = {
+    ignore = false,
+    enable = true,
+    timeout = 500,
+  },
+  actions                            = {
+    open_file = {
       resize_window = false,
-			window_picker = {
-				exclude = {
-					filetype = { "notify", "packer", "qf", "diff", "fugitive", "fugitiveblame" },
-					buftype = { "nofile","terminal","help" }
-				}
-			}
-		}
-	},
-  view = {
+      window_picker = {
+        exclude = {
+          filetype = { "notify", "packer", "qf", "diff", "fugitive", "fugitiveblame" },
+          buftype = { "nofile", "terminal", "help" }
+        }
+      }
+    }
+  },
+  view                               = {
     width = 35,
     hide_root_folder = false,
     side = 'left',
@@ -108,3 +107,17 @@ require'nvim-tree'.setup {
     }
   }
 }
+local function open_nvim_tree(data)
+  local directory = vim.fn.isdirectory(data.file) == 1
+  if not directory then
+    return
+  end
+
+  vim.cmd.enew()
+  vim.cmd.bw(data.buf)
+
+  vim.cmd.cd(data.file)
+  require('nvim-tree.api').tree.open()
+end
+
+vim.api.nvim_create_autocmd({ 'VimEnter' }, { callback = open_nvim_tree })

nvim/lua/plugins.lua

@@ -23,7 +23,7 @@ require("packer").startup(function(use)
     requires = { { "nvim-lua/plenary.nvim" } },
   })
   use("nvim-lua/lsp-status.nvim")
-  use("jiangmiao/auto-pairs")
+  --use("jiangmiao/auto-pairs")
   use("machakann/vim-sandwich")
   use("machakann/vim-highlightedyank")
   use("bling/vim-airline")
@@ -55,7 +55,6 @@ require("packer").startup(function(use)
       require("nvim-treesitter.install").update({ with_sync = true })
     end,
   })
-  use("folke/tokyonight.nvim")
   use("ayu-theme/ayu-vim")
   use("morhetz/gruvbox")
   use("simrat39/rust-tools.nvim")
@@ -110,4 +109,9 @@ require("packer").startup(function(use)
   }
   use 'simrat39/symbols-outline.nvim'
   use 'j-hui/fidget.nvim'
+  use {
+	'ThyW/todotxt.nvim',
+  branch = "vim-ui-input",
+	requires = {'MunifTanjim/nui.nvim'},
+}
 end)

nvim/lua/todotxt_config.lua

@@ -1,5 +1,4 @@
-todo = require('todotxt-nvim')
-todo.setup({
+require('todotxt-nvim').setup({
     todo_file = '~/todotxt/todo.txt',
     sidebar = {
       width = 40,

nvim/lua/trouble_config.lua

@@ -62,7 +62,6 @@ vim.keymap.set("n", "<leader>tq", "<cmd>TroubleToggle quickfix<cr>",
 )
 
 local trouble = require("trouble.providers.telescope")
-
 local telescope = require("telescope")
 
 telescope.setup {