fix: Fix merge conflicts

nvim/m-housh/ftplugin/swift.lua

@@ -0,0 +1,2 @@
+vim.opt.tabstop = 2
+vim.opt.shiftwidth = 2

nvim/m-housh/lua/user/plugin/swift.lua

@@ -1,15 +1,16 @@
 return {
-    'm-housh/swift.nvim',
+	"m-housh/swift.nvim",
-    dependencies = {
+	dependencies = {
-      'akinsho/toggleterm.nvim'
+		"akinsho/toggleterm.nvim",
-    },
+	},
-    ft = { 'swift' },
+	ft = { "swift" },
-    config = function()
+	config = function()
-      require('swift').setup()
+		require("swift").setup()
-      local default_options = { noremap = true, silent = true }
+		local default_options = { noremap = true, silent = true }
-      local actions = require('swift.actions')
+		local actions = require("swift.actions")
-
+		vim.opt.tabstop = 2
-      vim.keymap.set('n', '<C-b>', actions.build, default_options)
+		vim.opt.shiftwidth = 2
-      vim.keymap.set('n', '<C-S-U>', actions.test, default_options)
+		vim.keymap.set("n", "<C-b>", actions.build, default_options)
-    end
+		vim.keymap.set("n", "<C-S-U>", actions.test, default_options)
-  }
+	end,
+}

nvim/m-housh/lua/user/plugin/trouble.lua

@@ -3,7 +3,9 @@ return {
 	dependencies = { "nvim-tree/nvim-web-devicons" },
 	event = { "BufReadPre", "BufNewFile" },
 	keys = {
-		{ "<leader>tt", "<cmd>Trouble quickfix toggle<cr>", { desc = "Open a quickfix" } },
+		{ "<leader>t", "<cmd>Trouble diagnostics toggle<cr>", { desc = "[T]rouble diagnostics" } },
+		{ "<leader>tq", "<cmd>Trouble quickfix toggle<cr>", { desc = "Open a quickfix" } },
+		{ "<leader>tl", "<cmd>Trouble loclist toggle<cr>", { desc = "[T]rouble [L]ocation list" } },
 	},
 
 	opts = {},

nvim/m-housh/lua/user/settings.lua

@@ -2,7 +2,7 @@ local o = vim.opt
 local wo = vim.wo
 local fn = vim.fn
 
-vim.cmd.set('inccommand=split')
+vim.cmd.set("inccommand=split")
 o.updatetime = 500 -- faster completion
 o.timeoutlen = 800 -- time to wait for a mapped sequence to complete (in milliseconds)
 o.ttimeoutlen = 300 -- Time in milliseconds to wait for a key code sequence to complete
@@ -47,7 +47,7 @@ wo.colorcolumn = "99999"
 o.wildmode = "full"
 o.lazyredraw = false -- do not redraw screen while running macros
 o.grepprg = "rg --hidden --vimgrep --smart-case --"
-o.completeopt = {"menu", "menuone", "noselect", "noinsert"} -- A comma separated list of options for Insert mode completion
+o.completeopt = { "menu", "menuone", "noselect", "noinsert" } -- A comma separated list of options for Insert mode completion
 o.wildignorecase = true -- When set case is ignored when completing file names and directories
 o.wildignore = [[
 .git,.hg,.svn
@@ -62,4 +62,4 @@ o.wildignore = [[
 *.swp,.lock,.DS_Store,._*
 */tmp/*,*.so,*.swp,*.zip,**/node_modules/**,**/target/**,**.terraform/**"
 ]]
-o.viminfo="" -- disable viminfo from copying information from current session, for security.
+o.viminfo = "" -- disable viminfo from copying information from current session, for security.

tmux/tmux.conf

@@ -73,9 +73,16 @@ bind -n M-h previous-window
 bind -n M-L next-window
 bind C-l send-keys 'C-l'
 
+<<<<<<< HEAD
 bind f run-shell "tmux display-popup -E -w 80% -h 80% ${SCRIPTS}/tmux-sessionator"
 bind-key -r C run-shell -b "${SCRIPTS}/tmux-sessionator ~/.dotfiles"
 bind S run-shell -b "~/.config/tmux/plugins/tmux-fzf/scripts/session.sh switch"
+=======
+bind f run-shell "tmux display-popup -E -w 80% -h 80% ~/.local/scripts/tmux-sessionator"
+bind-key -r C run-shell -b "~/.local/scripts/tmux-sessionator ~/.dotfiles"
+unbind s
+bind s run-shell -b "~/.config/tmux/plugins/tmux-fzf/scripts/session.sh switch"
+>>>>>>> 4771d35 (feat: Nvim config updates)
 
 # reload new changes
 bind-key r source-file ~/.config/tmux/tmux.conf\; \display-message "source-file done"
@@ -151,6 +158,5 @@ set -gF window-status-separator "#[bg=#{@thm_bg},fg=#{@thm_overlay_0}]│"
 set -g window-status-current-format " #I#{?#{!=:#{window_name},Window},: #W,} "
 set -g window-status-current-style "bg=#{@thm_peach},fg=#{@thm_bg},bold"
 
-
 # Initialize TMUX plugin manager (keep this line at the very bottom of tmux.conf)
 run '~/.tmux/plugins/tpm/tpm'