Adds git method
This commit is contained in:
parent
b7da3ade1c
commit
d34742c3bd
7 changed files with 87 additions and 10 deletions
|
|
@ -7,5 +7,7 @@ require("commands.optolith")
|
|||
require("commands.open")
|
||||
require("commands.CopyToPlayers")
|
||||
require("commands.RandomFile")
|
||||
require("commands.Git")
|
||||
|
||||
vim.o.hidden = false
|
||||
vim.o.mouse = ""
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"LazyVim": { "branch": "main", "commit": "3f034d0a7f58031123300309f2efd3bb0356ee21" },
|
||||
"blink.cmp": { "branch": "main", "commit": "cc2f10e9d8b6420324d4743a4d9a428de427e2cf" },
|
||||
"blink.cmp": { "branch": "main", "commit": "4780af2dc6dfef6eb2a0fbf27574ae88dcf83e83" },
|
||||
"buffer-closer.nvim": { "branch": "main", "commit": "edb2fa2c188a6914ba922ac46f98047c148bc5ed" },
|
||||
"bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" },
|
||||
"bullets.vim": { "branch": "master", "commit": "af7e7adfd0d9b349cd48eb730e337fe3628b12b2" },
|
||||
|
|
@ -21,19 +21,19 @@
|
|||
"mini.icons": { "branch": "main", "commit": "ec61af6e606fc89ee3b1d8f2f20166a3ca917a36" },
|
||||
"mini.nvim": { "branch": "main", "commit": "4dd209e4f03bacd46d6d87408b2529a8823112fb" },
|
||||
"mini.pairs": { "branch": "main", "commit": "1a3e73649c0eaef2f6c48ce1e761c6f0a7c11918" },
|
||||
"neo-tree.nvim": { "branch": "main", "commit": "0ead8aaa301347b3555a1453ba3d36231cfff749" },
|
||||
"no-neck-pain.nvim": { "branch": "main", "commit": "860462dd8b3d36861a81724a7b473db279f673f2" },
|
||||
"noice.nvim": { "branch": "main", "commit": "0427460c2d7f673ad60eb02b35f5e9926cf67c59" },
|
||||
"nui.nvim": { "branch": "main", "commit": "53e907ffe5eedebdca1cd503b00aa8692068ca46" },
|
||||
"nvim-lint": { "branch": "master", "commit": "6e9dd545a1af204c4022a8fcd99727ea41ffdcc8" },
|
||||
"nvim-lspconfig": { "branch": "master", "commit": "7af2c37192deae28d1305ae9e68544f7fb5408e1" },
|
||||
"nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" },
|
||||
"nvim-treesitter": { "branch": "master", "commit": "2cade9e3d105732b794bc37e7cb2dc53b1cf99dc" },
|
||||
"nvim-treesitter": { "branch": "master", "commit": "00a513f87ee3c339c2024b08db3eb63ba7736ed6" },
|
||||
"nvim-treesitter-textobjects": { "branch": "master", "commit": "ad8f0a472148c3e0ae9851e26a722ee4e29b1595" },
|
||||
"nvim-ts-autotag": { "branch": "main", "commit": "4c00b86bd1246ba9c4cd50a823d8296cd2eb9663" },
|
||||
"persistence.nvim": { "branch": "main", "commit": "f6aad7dde7fcf54148ccfc5f622c6d5badd0cc3d" },
|
||||
"plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
|
||||
"render-markdown.nvim": { "branch": "main", "commit": "e05a9f22f31c088ece3fa5928daf546a015b66ee" },
|
||||
"snacks.nvim": { "branch": "main", "commit": "95878ad32aaf310f465a004ef12e9edddf939287" },
|
||||
"snacks.nvim": { "branch": "main", "commit": "b02cb5e8826179b385b870edbda1631213391cf1" },
|
||||
"todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" },
|
||||
"tokyonight.nvim": { "branch": "main", "commit": "c8ea87cd34b0267c44a67e90ff8f6e7d6af46ff9" },
|
||||
"trouble.nvim": { "branch": "main", "commit": "85bedb7eb7fa331a2ccbecb9202d8abba64d37b3" },
|
||||
|
|
|
|||
46
.config/nvim/lazy-lock.json.bak
Normal file
46
.config/nvim/lazy-lock.json.bak
Normal file
|
|
@ -0,0 +1,46 @@
|
|||
{
|
||||
"LazyVim": { "branch": "main", "commit": "45d94b3197eaf3f35754b8ecb7adebfcebe5160d" },
|
||||
"blink.cmp": { "branch": "main", "commit": "426a605518f81ea7ba335ecca8df565637e7e259" },
|
||||
"buffer-closer.nvim": { "branch": "main", "commit": "edb2fa2c188a6914ba922ac46f98047c148bc5ed" },
|
||||
"bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" },
|
||||
"bullets.vim": { "branch": "master", "commit": "af7e7adfd0d9b349cd48eb730e337fe3628b12b2" },
|
||||
"catppuccin": { "branch": "main", "commit": "0b2437bcc12b4021614dc41fcea9d0f136d94063" },
|
||||
"conform.nvim": { "branch": "master", "commit": "a6f5bdb78caa305496357d17e962bbc4c0b392e2" },
|
||||
"edgy.nvim": { "branch": "main", "commit": "7e8dedc39abebe40c289b8012cc89b11c69aa7a0" },
|
||||
"flash.nvim": { "branch": "main", "commit": "3c942666f115e2811e959eabbdd361a025db8b63" },
|
||||
"friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" },
|
||||
"fzf-lua": { "branch": "main", "commit": "0a3b70feb05879a8001c51f7a2a42fa52a9e552c" },
|
||||
"git-conflict.nvim": { "branch": "main", "commit": "4bbfdd92d547d2862a75b4e80afaf30e73f7bbb4" },
|
||||
"gitsigns.nvim": { "branch": "main", "commit": "8b00147519d6f8353867d5d0b55f587306b0cfb6" },
|
||||
"grug-far.nvim": { "branch": "main", "commit": "3a8690461afac34c0e5bacb0f7b4bc3066aab665" },
|
||||
"gruvbox.nvim": { "branch": "main", "commit": "089b60e92aa0a1c6fa76ff527837cd35b6f5ac81" },
|
||||
"lazy.nvim": { "branch": "main", "commit": "7e6c863bc7563efbdd757a310d17ebc95166cef3" },
|
||||
"lazydev.nvim": { "branch": "main", "commit": "a1b78b2ac6f978c72e76ea90ae92a94edf380cfc" },
|
||||
"lualine.nvim": { "branch": "master", "commit": "f4f791f67e70d378a754d02da068231d2352e5bc" },
|
||||
"mason-lspconfig.nvim": { "branch": "main", "commit": "1a31f824b9cd5bc6f342fc29e9a53b60d74af245" },
|
||||
"mason.nvim": { "branch": "main", "commit": "fc98833b6da5de5a9c5b1446ac541577059555be" },
|
||||
"mini.ai": { "branch": "main", "commit": "6e01c0e5a15554852546fac9853960780ac52ed4" },
|
||||
"mini.icons": { "branch": "main", "commit": "ec61af6e606fc89ee3b1d8f2f20166a3ca917a36" },
|
||||
"mini.nvim": { "branch": "main", "commit": "4dd209e4f03bacd46d6d87408b2529a8823112fb" },
|
||||
"mini.pairs": { "branch": "main", "commit": "1a3e73649c0eaef2f6c48ce1e761c6f0a7c11918" },
|
||||
"neo-tree.nvim": { "branch": "main", "commit": "e96fd85bf18bc345dab332b345098fa5460dffac" },
|
||||
"noice.nvim": { "branch": "main", "commit": "0427460c2d7f673ad60eb02b35f5e9926cf67c59" },
|
||||
"nui.nvim": { "branch": "main", "commit": "53e907ffe5eedebdca1cd503b00aa8692068ca46" },
|
||||
"nvim-lint": { "branch": "master", "commit": "6e9dd545a1af204c4022a8fcd99727ea41ffdcc8" },
|
||||
"nvim-lspconfig": { "branch": "master", "commit": "7af2c37192deae28d1305ae9e68544f7fb5408e1" },
|
||||
"nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" },
|
||||
"nvim-treesitter": { "branch": "master", "commit": "00a513f87ee3c339c2024b08db3eb63ba7736ed6" },
|
||||
"nvim-treesitter-textobjects": { "branch": "master", "commit": "ad8f0a472148c3e0ae9851e26a722ee4e29b1595" },
|
||||
"nvim-ts-autotag": { "branch": "main", "commit": "4c00b86bd1246ba9c4cd50a823d8296cd2eb9663" },
|
||||
"persistence.nvim": { "branch": "main", "commit": "f6aad7dde7fcf54148ccfc5f622c6d5badd0cc3d" },
|
||||
"plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
|
||||
"render-markdown.nvim": { "branch": "main", "commit": "e05a9f22f31c088ece3fa5928daf546a015b66ee" },
|
||||
"snacks.nvim": { "branch": "main", "commit": "b02cb5e8826179b385b870edbda1631213391cf1" },
|
||||
"todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" },
|
||||
"tokyonight.nvim": { "branch": "main", "commit": "c8ea87cd34b0267c44a67e90ff8f6e7d6af46ff9" },
|
||||
"trouble.nvim": { "branch": "main", "commit": "85bedb7eb7fa331a2ccbecb9202d8abba64d37b3" },
|
||||
"ts-comments.nvim": { "branch": "main", "commit": "872dcfa0418f4a33b7437fb4d9f4e89f2f000d74" },
|
||||
"which-key.nvim": { "branch": "main", "commit": "5bf7a73fe851896d5ac26d313db849bf00f45b78" },
|
||||
"wilder.nvim": { "branch": "master", "commit": "679f348dc90d80ff9ba0e7c470c40a4d038dcecf" },
|
||||
"yanky.nvim": { "branch": "main", "commit": "d2696b30e389dced94d5acab728f524a25f308d2" }
|
||||
}
|
||||
13
.config/nvim/lua/commands/Git.lua
Normal file
13
.config/nvim/lua/commands/Git.lua
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
local git = require("functions.git")
|
||||
local enabledGit = os.getenv("ENABLE_GIT_SETUP") or false
|
||||
if not enabledGit then
|
||||
return
|
||||
end
|
||||
|
||||
vim.api.nvim_create_user_command("GitPush", function()
|
||||
git.push()
|
||||
end, {})
|
||||
|
||||
vim.api.nvim_create_user_command("GitPull", function()
|
||||
git.pull()
|
||||
end, {})
|
||||
|
|
@ -23,6 +23,7 @@ vim.api.nvim_create_autocmd("VimLeavePre", {
|
|||
return
|
||||
end
|
||||
|
||||
git.commitRest()
|
||||
git.push()
|
||||
end,
|
||||
})
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ function git.commitFile(filepath)
|
|||
return vim.fn.fnamemodify(file, ":t:r")
|
||||
end
|
||||
|
||||
local commitMessage = get_file_name(filepath) .. "-" .. os.date("%m_%B_%Y")
|
||||
local commitMessage = get_file_name(filepath) .. "-" .. os.date("%d_%B_%Y")
|
||||
|
||||
os.execute('git add "' .. filepath .. '"')
|
||||
local commitCommand = 'git commit -m "' .. commitMessage .. '" &> /dev/null'
|
||||
|
|
@ -25,6 +25,26 @@ function git.commitFile(filepath)
|
|||
end
|
||||
end
|
||||
|
||||
function git.commitRest()
|
||||
local commitMessage = "Files changed since last commit-" .. os.date("%d_%B_%Y")
|
||||
os.execute("git add .")
|
||||
|
||||
local commitCommand = 'git commit -m "' .. commitMessage .. '" &> /dev/null'
|
||||
local commitResult = os.execute(commitCommand)
|
||||
|
||||
print("Commiting... " .. commitMessage)
|
||||
if commitResult == 256 then
|
||||
print("Nothing to commit")
|
||||
return
|
||||
elseif commitResult == 0 then
|
||||
print("Commit complete")
|
||||
else
|
||||
print("Unknown Error " .. commitResult)
|
||||
print(commitCommand)
|
||||
return
|
||||
end
|
||||
end
|
||||
|
||||
function git.push()
|
||||
print("Pushing changes...")
|
||||
-- Push twice, in case the credentials expired. Ugly hack, but it works
|
||||
|
|
|
|||
|
|
@ -1,7 +1,3 @@
|
|||
if true then
|
||||
return {}
|
||||
end
|
||||
|
||||
return {
|
||||
"shortcuts/no-neck-pain.nvim",
|
||||
version = "*",
|
||||
|
|
@ -9,7 +5,6 @@ return {
|
|||
require("no-neck-pain").setup({
|
||||
width = 125,
|
||||
autocmds = {
|
||||
enableOnVimEnter = true,
|
||||
skipEnteringNoNeckPainBuffer = true,
|
||||
},
|
||||
})
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue