Merge commit 'd3a56ae05d0d91810f698d90405ff8d5d9d8ce4e'

9 files changed, 75 insertions, 9 deletions

diff --git a/.config/nvim/after/ftplugin/markdown.lua b/.config/nvim/after/ftplugin/markdown.lua
new file mode 100644
index 0000000..ec30702
--- /dev/null
+++ b/.config/nvim/after/ftplugin/markdown.lua
@@ -0,0 +1,2 @@
+vim.opt.softtabstop = 2 -- Tab key indents by 2 spaces.
+vim.opt.shiftwidth = 2  -- >> indents by 2 spaces.
diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua
index 21c2ba0..bd05b8a 100644
--- a/.config/nvim/init.lua
+++ b/.config/nvim/init.lua
@@ -7,7 +7,7 @@
               ╚═╝  ╚═══╝╚══════╝ ╚═════╝   ╚═══╝  ╚═╝╚═╝     ╚═╝
               " ------------------------------------------------
               Author: srdusr
-               Email: graytrevor98@gmail.com
+               Email: trevorgray@srdusr.com
                  Url: https://github.com/srdusr/nvim.git
               ------------------------------------------------ "
 --]]
@@ -73,7 +73,7 @@ local modules = {
   "plugins.web-devicons",
   "plugins.cmp",
   "plugins.quickfix",
-  "plugins.snippets",
+  --"plugins.snippets",
   --"plugins.colorizer",
   "plugins.prettier",
   --"plugins.git",
diff --git a/.config/nvim/lua/plugins/colorscheme.lua b/.config/nvim/lua/plugins/colorscheme.lua
index 6f9e9d2..bf588cf 100644
--- a/.config/nvim/lua/plugins/colorscheme.lua
+++ b/.config/nvim/lua/plugins/colorscheme.lua
@@ -1,7 +1,7 @@
 -- Colorscheme
 -- Available colorschemes:
 -- [[ nightfly ayu onedark doom-one nvimgelion github_dark ]]
-local colorscheme = "doom-one"
+local colorscheme = "nightfly"
 local status_ok, _ = pcall(vim.cmd, "colorscheme " .. colorscheme)
 if not status_ok then
   vim.notify("colorscheme " .. colorscheme .. " not found!")
diff --git a/.config/nvim/lua/plugins/nvim-tree.lua b/.config/nvim/lua/plugins/nvim-tree.lua
index a1731ff..e2298b5 100644
--- a/.config/nvim/lua/plugins/nvim-tree.lua
+++ b/.config/nvim/lua/plugins/nvim-tree.lua
@@ -77,8 +77,28 @@ nvim_tree.setup({
     --  },
     --},
   },
+  trash = {
+    cmd = "gio trash",
+    require_confirm = true,
+  },
 })
 
+vim.api.nvim_create_autocmd("QuitPre", {
+  callback = function()
+    local invalid_win = {}
+    local wins = vim.api.nvim_list_wins()
+    for _, w in ipairs(wins) do
+      local bufname = vim.api.nvim_buf_get_name(vim.api.nvim_win_get_buf(w))
+      if bufname:match("NvimTree_") ~= nil then
+        table.insert(invalid_win, w)
+      end
+    end
+    if #invalid_win == #wins - 1 then
+      -- Should quit, so we close all invalid windows.
+      for _, w in ipairs(invalid_win) do vim.api.nvim_win_close(w, true) end
+    end
+  end
+})
 -- Highlight Groups
 vim.api.nvim_command("highlight NvimTreeNormal guibg=none")
 --vim.api.nvim_command("highlight NvimTreeSymlink ")
diff --git a/.config/nvim/lua/plugins/telescope.lua b/.config/nvim/lua/plugins/telescope.lua
index 4428a02..e74f2e0 100644
--- a/.config/nvim/lua/plugins/telescope.lua
+++ b/.config/nvim/lua/plugins/telescope.lua
@@ -265,6 +265,7 @@ require('telescope').load_extension('media_files')
 --require('telescope').extensions.notify.notify()
 require('telescope').load_extension('notify')
 require('telescope').load_extension('dap')
+require("telescope").load_extension("session-lens")
 
 function M.find_configs()
   require("telescope.builtin").find_files {
@@ -284,6 +285,7 @@ function M.find_configs()
       "~/.config/bspwm",
       "~/.config/sxhkd",
       "~/.config/picom",
+      "~/.ssh",
       "~/.bashrc",
     },
     -- cwd = "~/.config/nvim/",
diff --git a/.config/nvim/lua/user/keys.lua b/.config/nvim/lua/user/keys.lua
index 12789a5..75df193 100644
--- a/.config/nvim/lua/user/keys.lua
+++ b/.config/nvim/lua/user/keys.lua
@@ -85,7 +85,7 @@ map("t", "<C-j>", "<C-\\><C-N><C-j>")
 map("t", "<C-k>", "<C-\\><C-N><C-k>")
 map("t", "<C-l>", "<C-\\><C-N><C-l>")
 map("t", "<C-x>", "<C-c>")
-map("n", "<C-x>", "<C-c>")
+--map("n", "<C-x>", "<C-c>")
 --map("n", "<C-r>", ":<C-u>call MyFunc(v:count)<CR>")
 
 -- Split window
@@ -223,9 +223,9 @@ end, { silent = true })
 --utils.map("n", "<Space>", "za")
 
 -- Make a copy of current file
-vim.cmd([[
-  map <leader>s :up \| saveas! %:p:r-<C-R>=strftime("%y.%m.%d-%H:%M")<CR>-bak.<C-R>=expand("%:e")<CR> \| 3sleep \| e #<CR>
-]])
+--vim.cmd([[
+--  map <leader>s :up \| saveas! %:p:r-<C-R>=strftime("%y.%m.%d-%H:%M")<CR>-bak.<C-R>=expand("%:e")<CR> \| 3sleep \| e #<CR>
+--]])
 
 -- Toggle transparency
 map('n', '<leader>tb', ':call utils#Toggle_transparent_background()<CR>')
diff --git a/.config/nvim/lua/user/mods.lua b/.config/nvim/lua/user/mods.lua
index e523eb7..08a3eb8 100644
--- a/.config/nvim/lua/user/mods.lua
+++ b/.config/nvim/lua/user/mods.lua
@@ -214,5 +214,39 @@ vim.cmd [[autocmd BufWritePre <buffer> lua vim.lsp.buf.format()]]
 
 --------------------------------------------------
 
+--- Update Tmux Status Vi-mode
+function M.update_tmux_status()
+  local mode = vim.api.nvim_eval('mode()')
+  -- Determine the mode name based on the mode value
+  local mode_name
+  if mode == 'n' then
+    mode_name = '-- NORMAL --'
+  elseif mode == 'i' or mode == 'ic' then
+    mode_name = '-- INSERT --'
+  else
+    mode_name = '-- NORMAL --' --'-- COMMAND --'
+  end
+
+  -- Write the mode name to the file
+  local file = io.open(os.getenv('HOME') .. '/.vi-mode', 'w')
+  file:write(mode_name)
+  file:close()
+  if nvim_running then
+    -- Neovim is running, update the mode file and refresh tmux
+    VI_MODE = ""  -- Clear VI_MODE to show Neovim mode
+    vim.cmd("silent !tmux refresh-client -S")
+  end
+  ---- Force tmux to update the status
+  vim.cmd("silent !tmux refresh-client -S")
+end
+vim.cmd([[
+  augroup TmuxStatus
+    autocmd!
+    autocmd CursorHold * lua require("user.mods").update_tmux_status()
+    autocmd VimEnter * lua require("user.mods").update_tmux_status()
+    autocmd ModeChanged * lua require("user.mods").update_tmux_status()
+  augroup END
+]])
 
+--------------------------------------------------
 return M
diff --git a/.config/nvim/lua/user/pack.lua b/.config/nvim/lua/user/pack.lua
index 256503e..b700226 100644
--- a/.config/nvim/lua/user/pack.lua
+++ b/.config/nvim/lua/user/pack.lua
@@ -29,7 +29,7 @@ vim.cmd([[
 
 --------------------------------------------------
 
--- Use a protected call so we don't error out on first use
+-- Use a protected call so don't error out on first use
 local status_ok, packer = pcall(require, "packer")
 if not status_ok then
 	return
@@ -224,6 +224,14 @@ return packer.startup(function(use)
       },
     }
   })
+  use({
+    'rmagatti/session-lens',
+    requires = {'rmagatti/auto-session', 'nvim-telescope/telescope.nvim'},
+    config = function()
+      require('session-lens').setup({--[[your custom config--]]})
+      vim.keymap.set('n', '<leader>s', require('session-lens').search_session) -- <-- this sets it to `Ctrl + s`
+    end
+  })
 
 	-- Colorschemes
 	use("bluz71/vim-nightfly-guicolors")
diff --git a/.config/nvim/snippets/lua.lua b/.config/nvim/snippets/lua.lua
index 523d2f4..eb46b67 100644
--- a/.config/nvim/snippets/lua.lua
+++ b/.config/nvim/snippets/lua.lua
@@ -194,7 +194,7 @@ local {} = {}
   ]],
 		{ i(1, ""), i(2, "") }
 	),
-	"jk"
+	"jj"
 ) --}}}
 -- Tutorial Snippets go here --
 local myFirstSnippet = s("myFirstSnippet", {