Merge branch 'main' into sway
This commit is contained in:
commit
44be4f3ffd
3 changed files with 9 additions and 0 deletions
|
|
@ -152,6 +152,9 @@
|
||||||
init = {
|
init = {
|
||||||
defaultBranch = "main";
|
defaultBranch = "main";
|
||||||
};
|
};
|
||||||
|
push = {
|
||||||
|
autoSetupRemote = true;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -864,6 +864,7 @@ require("lazy").setup({
|
||||||
},
|
},
|
||||||
{ -- Highlight, edit, and navigate code
|
{ -- Highlight, edit, and navigate code
|
||||||
"nvim-treesitter/nvim-treesitter",
|
"nvim-treesitter/nvim-treesitter",
|
||||||
|
branch = 'master',
|
||||||
build = ":TSUpdate",
|
build = ":TSUpdate",
|
||||||
opts = {
|
opts = {
|
||||||
ensure_installed = { "python", "bash", "c", "diff", "html", "lua", "luadoc", "markdown", "vim", "vimdoc" },
|
ensure_installed = { "python", "bash", "c", "diff", "html", "lua", "luadoc", "markdown", "vim", "vimdoc" },
|
||||||
|
|
|
||||||
|
|
@ -381,6 +381,11 @@ tmux_conf_urlscan_options="--compact --dedupe"
|
||||||
# start with mouse mode enabled
|
# start with mouse mode enabled
|
||||||
set -g mouse on
|
set -g mouse on
|
||||||
|
|
||||||
|
# allow passthrough for fancy stuff like images
|
||||||
|
set -g allow-passthrough on
|
||||||
|
set -g allow-rename off
|
||||||
|
|
||||||
|
|
||||||
# force Vi mode
|
# force Vi mode
|
||||||
# really you should export VISUAL or EDITOR environment variable, see manual
|
# really you should export VISUAL or EDITOR environment variable, see manual
|
||||||
#set -g status-keys vi
|
#set -g status-keys vi
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue