Compare commits

...

4 Commits

9 changed files with 33 additions and 19 deletions

3
.gitmodules vendored
View File

@ -7,3 +7,6 @@
[submodule "tmux/tpm"]
path = tmux/tpm
url = https://github.com/tmux-plugins/tpm
[submodule "zsh/custom/plugins/zsh-autopair"]
path = zsh/custom/plugins/zsh-autopair
url = https://github.com/hlissner/zsh-autopair

View File

@ -2,7 +2,6 @@
"Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" },
"blink.cmp": { "branch": "main", "commit": "022521a8910a5543b0251b21c9e1a1e989745796" },
"bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" },
"bufresize.nvim": { "branch": "master", "commit": "3b19527ab936d6910484dcc20fb59bdb12322d8b" },
"conform.nvim": { "branch": "master", "commit": "6feb2f28f9a9385e401857b21eeac3c1b66dd628" },
"fidget.nvim": { "branch": "main", "commit": "d9ba6b7bfe29b3119a610892af67602641da778e" },
"friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" },
@ -22,7 +21,6 @@
"mason.nvim": { "branch": "main", "commit": "8024d64e1330b86044fed4c8494ef3dcd483a67c" },
"neo-tree.nvim": { "branch": "main", "commit": "f481de16a0eb59c985abac8985e3f2e2f75b4875" },
"nui.nvim": { "branch": "main", "commit": "f535005e6ad1016383f24e39559833759453564e" },
"nvim-autopairs": { "branch": "master", "commit": "4d74e75913832866aa7de35e4202463ddf6efd1b" },
"nvim-bufdel": { "branch": "main", "commit": "523d58e94e7212fff3e05c247b962dc8f93bcfde" },
"nvim-colorizer.lua": { "branch": "master", "commit": "517df88cf2afb36652830df2c655df2da416a0ae" },
"nvim-dap": { "branch": "master", "commit": "b0f983507e3702f073bfe1516846e58b56d4e42f" },
@ -42,6 +40,7 @@
"telescope.nvim": { "branch": "master", "commit": "b4da76be54691e854d3e0e02c36b0245f945c2c7" },
"todo-comments.nvim": { "branch": "main", "commit": "f8bd47e4bc15e3aa7c784b12e68b6dd6e97caea2" },
"trouble.nvim": { "branch": "main", "commit": "85bedb7eb7fa331a2ccbecb9202d8abba64d37b3" },
"ultimate-autopair.nvim": { "branch": "v0.6", "commit": "b24b97c538b71b6de0ce9d84e47df27b6ecafd76" },
"undotree": { "branch": "master", "commit": "b951b87b46c34356d44aa71886aecf9dd7f5788a" },
"which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" },
"yaml-companion.nvim": { "branch": "main", "commit": "131b0d67bd2e0f1a02e0daf2f3460482221ce3c0" }

View File

@ -7,12 +7,6 @@ vim.keymap.set({ "n", "v" }, "<Space>", "<Nop>", { noremap = true, silent = true
vim.keymap.set("n", "k", "v:count == 0 ? 'gk' : 'k'", { expr = true, silent = true })
vim.keymap.set("n", "j", "v:count == 0 ? 'gj' : 'j'", { expr = true, silent = true })
-- Keybinds for resizing windows
vim.keymap.set("n", "<S-Up>", "<cmd>resize +2<CR>")
vim.keymap.set("n", "<S-Down>", "<cmd>resize -2<CR>")
vim.keymap.set("n", "<S-Left>", "<cmd>vertical resize -2<CR>")
vim.keymap.set("n", "<S-Right>", "<cmd>vertical resize +2<CR>")
-- Some nice adjustments
vim.keymap.set("n", "<C-d>", "<C-d>zz")
vim.keymap.set("n", "<C-u>", "<C-u>zz")

View File

@ -1,6 +1,27 @@
-- https://github.com/windwp/nvim-autopairs
-- https://github.com/altermo/ultimate-autopair.nvim
return {
"windwp/nvim-autopairs",
event = "InsertEnter",
config = true,
"altermo/ultimate-autopair.nvim",
event = { "InsertEnter", "CmdlineEnter" },
branch = "v0.6",
opts = {
fastwarp = {
faster = true,
},
-- Fix single quotes in rust
config_internal_pairs = {
{
"'",
"'",
multiline = false,
nft = {},
suround = true,
cond = function(fn)
if fn.get_ft() ~= "rust" then
return true
end
return not fn.in_node({ "bounded_type", "reference_type", "type_arguments", "type_parameters" })
end,
},
},
},
}

View File

@ -1,5 +0,0 @@
-- https://github.com/kwkarlwang/bufresize.nvim
return {
"kwkarlwang/bufresize.nvim",
opts = {},
}

@ -0,0 +1 @@
Subproject commit 449a7c3d095bc8f3d78cf37b9549f8bb4c383f3d

@ -1 +1 @@
Subproject commit c3d4e576c9c86eac62884bd47c01f6faed043fc5
Subproject commit 0e810e5afa27acbd074398eefbe28d13005dbc15

View File

@ -26,6 +26,7 @@ plugins=(
colored-man-pages
command-not-found
dirhistory
zsh-autopair
)
bindkey -M vicmd "k" up-line-or-beginning-search

@ -1 +1 @@
Subproject commit 0c9b42a863778d67aee22bbd43f296110fe1f047
Subproject commit 6ef47526f852114209e36af87938075b4caa28e1