bring up to date with remote

This commit is contained in:
Gilad Sher 2023-12-17 18:24:28 -05:00
parent 56d28f8f75
commit 4952447714
15 changed files with 253 additions and 106 deletions

View file

@ -0,0 +1,6 @@
vim.cmd([[
augroup filetypedetect
autocmd! BufRead,BufNewFile .swcrc setfiletype json
autocmd! BufRead,BufNewFile .prettierrc setfiletype json
augroup END
]])

8
after/plugin/harpoon.lua Normal file
View file

@ -0,0 +1,8 @@
-- local mark = require("harpoon.mark")
-- local ui = require("harpoon.ui")
-- vim.keymap.set("n", "<leader>ah", mark.add_file)
-- vim.keymap.set("n", "<C-e>", ui.toggle_quick_menu)
-- vim.keymap.set("n", "<C-h>", function() ui.nav_file(1) end)
-- vim.keymap.set("n", "<C-j>", function() ui.nav_file(2) end)
-- vim.keymap.set("n", "<C-k>", function() ui.nav_file(3) end)
-- vim.keymap.set("n", "<C-l>", function() ui.nav_file(4) end)

12
after/plugin/init.lua Normal file
View file

@ -0,0 +1,12 @@
vim.opt.relativenumber = true
vim.keymap.set("n", "<leader>pv", "<cmd>Ex<CR>")
vim.opt.ignorecase = true
vim.opt.smartcase = true
vim.opt.smartindent = true
vim.opt.tabstop = 2
vim.keymap.set("n", "<leader>y", '"+y')
vim.keymap.set("n", "<leader>gs", ':Git<CR>')
vim.keymap.set("n", "<leader>gp", ':Git pull<CR>')
vim.keymap.set("n", "<leader>gpsh", ':Git push<CR>')
vim.keymap.set("n", "gh", '<cmd>diffget //2<CR>')
vim.keymap.set("n", "gl", '<cmd>diffget //3<CR>')

View file

@ -0,0 +1,6 @@
vim.cmd([[
augroup FormatAutogroup
autocmd!
autocmd BufWritePre *.js,*.jsx,*.ts,*.tsx,*.cjs,*.mjs,*.cts,*.mts Prettier
augroup END
]])