Merge branch 'main' into sway

alex/home.nix

@@ -152,6 +152,9 @@
       init = {
         defaultBranch = "main";
       };
+      push = {
+        autoSetupRemote = true;
+      };
     };
   };
 

alex/nvim/init.lua

@@ -864,6 +864,7 @@ require("lazy").setup({
 	},
 	{ -- Highlight, edit, and navigate code
 		"nvim-treesitter/nvim-treesitter",
+		branch = 'master',
 		build = ":TSUpdate",
 		opts = {
 			ensure_installed = { "python", "bash", "c", "diff", "html", "lua", "luadoc", "markdown", "vim", "vimdoc" },

alex/tmux/tmux.conf.local

@@ -381,6 +381,11 @@ tmux_conf_urlscan_options="--compact --dedupe"
 # start with mouse mode enabled
 set -g mouse on
 
+# allow passthrough for fancy stuff like images
+set -g allow-passthrough on
+set -g allow-rename off
+
+
 # force Vi mode
 #   really you should export VISUAL or EDITOR environment variable, see manual
 #set -g status-keys vi