From 7d66dea176692ad84e7cdef648b3e6806992de95 Mon Sep 17 00:00:00 2001
From: Rahsheen Porter <rahsheen.porter@thirtymadison.com>
Date: Tue, 29 Aug 2023 19:26:16 -0400
Subject: [PATCH] minor updates and such

---
 .config/nvim/after/plugin/lualine.lua |  2 +-
 .config/nvim/after/plugin/null-ls.lua |  1 +
 .config/nvim/init.lua                 | 13 +++++++++----
 .config/nvim/lua/custom/plugins.lua   | 25 +++++++++++++++++++++++++
 .config/nvim/lua/rahcodes/sets.lua    | 11 +----------
 .local/bin/tmux-sessionizer           |  4 ++--
 6 files changed, 39 insertions(+), 17 deletions(-)

diff --git a/.config/nvim/after/plugin/lualine.lua b/.config/nvim/after/plugin/lualine.lua
index fb4e7e9e..1e3a426e 100644
--- a/.config/nvim/after/plugin/lualine.lua
+++ b/.config/nvim/after/plugin/lualine.lua
@@ -1,6 +1,6 @@
 require("lualine").setup({
 	options = {
-		theme = "onedark",
+		theme = "tokyonight",
 		tabline = {
 			lualine_a = { "buffers" },
 			lualine_b = { "branch" },
diff --git a/.config/nvim/after/plugin/null-ls.lua b/.config/nvim/after/plugin/null-ls.lua
index 3950a500..39621b3a 100644
--- a/.config/nvim/after/plugin/null-ls.lua
+++ b/.config/nvim/after/plugin/null-ls.lua
@@ -30,6 +30,7 @@ null_ls.setup({
 	sources = {
 		formatting.prettier,
 		formatting.stylua,
+		null_ls.builtins.code_actions.gitsigns,
 
 		-- Here we set a conditional to call the rubocop formatter. If we have a Gemfile in the project, we call "bundle exec rubocop", if not we only call "rubocop".
 		conditional(function(utils)
diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua
index aa40268c..d40f9779 100644
--- a/.config/nvim/init.lua
+++ b/.config/nvim/init.lua
@@ -46,7 +46,7 @@ require("lazy").setup({
 
       -- Useful status updates for LSP
       -- NOTE: `opts = {}` is the same as calling `require('fidget').setup({})`
-      { "j-hui/fidget.nvim", opts = {} },
+      { "j-hui/fidget.nvim",       opts = {} },
 
       -- Additional lua configuration, makes nvim stuff amazing!
       "folke/neodev.nvim",
@@ -55,11 +55,16 @@ require("lazy").setup({
 
   { -- Autocompletion
     "hrsh7th/nvim-cmp",
-    dependencies = { "hrsh7th/cmp-nvim-lsp", "L3MON4D3/LuaSnip", "saadparwaiz1/cmp_luasnip" },
+    dependencies = {
+      "hrsh7th/cmp-nvim-lsp",
+      "L3MON4D3/LuaSnip",
+      "saadparwaiz1/cmp_luasnip",
+      "rafamadriz/friendly-snippets",
+    },
   },
 
   -- Useful plugin to show you pending keybinds.
-  { "folke/which-key.nvim", opts = {} },
+  { "folke/which-key.nvim",          opts = {} },
   { -- Adds git releated signs to the gutter, as well as utilities for managing changes
     "lewis6991/gitsigns.nvim",
     opts = {
@@ -114,7 +119,7 @@ require("lazy").setup({
   },
 
   -- "gc" to comment visual regions/lines
-  { "numToStr/Comment.nvim", opts = {} },
+  { "numToStr/Comment.nvim",         opts = {} },
 
   -- Fuzzy Finder (files, lsp, etc)
   { "nvim-telescope/telescope.nvim", version = "*", dependencies = { "nvim-lua/plenary.nvim" } },
diff --git a/.config/nvim/lua/custom/plugins.lua b/.config/nvim/lua/custom/plugins.lua
index 0cd73de5..cd467962 100644
--- a/.config/nvim/lua/custom/plugins.lua
+++ b/.config/nvim/lua/custom/plugins.lua
@@ -1,4 +1,23 @@
 return {
+	{
+		"ThePrimeagen/refactoring.nvim",
+		requires = {
+			{ "nvim-lua/plenary.nvim" },
+			{ "nvim-treesitter/nvim-treesitter" },
+		},
+		config = function()
+			require("refactoring").setup({})
+		end,
+	},
+	{
+		"folke/tokyonight.nvim",
+		lazy = false, -- make sure we load this during startup if it is your main colorscheme
+		priority = 1000, -- make sure to load this before all the other start plugins
+		config = function()
+			-- load the colorscheme here
+			vim.cmd([[colorscheme tokyonight]])
+		end,
+	},
 	-- formatting & linting
 	"jose-elias-alvarez/null-ls.nvim",
 	--	use("jayp0521/mason-null-ls.nvim")
@@ -23,4 +42,10 @@ return {
 			})
 		end,
 	},
+	{
+		"rafamadriz/friendly-snippets",
+		config = function()
+			require("luasnip.loaders.from_vscode").lazy_load()
+		end,
+	},
 }
diff --git a/.config/nvim/lua/rahcodes/sets.lua b/.config/nvim/lua/rahcodes/sets.lua
index af0a6633..2cf4c156 100644
--- a/.config/nvim/lua/rahcodes/sets.lua
+++ b/.config/nvim/lua/rahcodes/sets.lua
@@ -15,21 +15,12 @@ vim.opt.wrap = false
 vim.opt.swapfile = false
 vim.opt.backup = false
 vim.opt.undodir = os.getenv("HOME") .. "/.vim/undodir"
-vim.opt.undofile = true
 
-vim.opt.hlsearch = false
 vim.opt.incsearch = true
 
-vim.opt.termguicolors = true
-
 vim.opt.scrolloff = 8
-vim.opt.signcolumn = "yes"
 vim.opt.isfname:append("@-@")
 
-vim.opt.updatetime = 50
-
 vim.opt.colorcolumn = "80"
 
-vim.opt.mouse = ""
-
-vim.g.mapleader = " "
+vim.opt.mouse = "v"
diff --git a/.local/bin/tmux-sessionizer b/.local/bin/tmux-sessionizer
index abbb2c14..f0a96d93 100755
--- a/.local/bin/tmux-sessionizer
+++ b/.local/bin/tmux-sessionizer
@@ -3,8 +3,8 @@
 if [[ $# -eq 1 ]]; then
     selected=$1
 else
-    selected=$(find ~/.config ~/Development/nurx ~/Development ~/Development/keeps-next ~/Development/keeps-frontend -mindepth 1 -maxdepth 1 -type d | fzf)
-    #selected=$(find ~/.config ~/Development -mindepth 1 -maxdepth 1 -type d | fzf)
+    #selected=$(find ~/.config ~/Development ~/Development/keeps-next ~/Development/keeps-frontend ~/Development/keeps-frontend/bug/**/ -mindepth 1 -maxdepth 1 -type d | fzf)
+    selected=$(find ~/Development/* -mindepth 1 -maxdepth 10 -type d -prune -a ! -name "node_modules" | fzf)
 fi
 
 if [[ -z $selected ]]; then