Compare commits

...

2 Commits

Author SHA1 Message Date
Pavle Portic e0be240488
Add git diff prod alias 2023-12-14 14:59:21 +01:00
Pavle Portic 466f52599a
Fix git blame toggle mapping 2023-12-14 14:59:15 +01:00
5 changed files with 24 additions and 13 deletions

View File

@ -46,6 +46,9 @@ alias virtualenv='python -m venv'
alias wgdown='sudo wg-quick down wg0'
alias wgup='sudo wg-quick up wg0'
# Git aliases
alias gdp='g lg $(gtv T -n1)..main | grep -v "<Flux>"'
# Systemctl aliases
alias sctl='sudo systemctl'
alias sstatus='sudo systemctl status'
@ -66,14 +69,6 @@ alias sustop='systemctl --user stop'
alias suenable='systemctl --user enable'
alias sudisable='systemctl --user disable'
# Pass aliases
alias psh='pass show'
alias psc='pass show --clip'
alias psi='pass insert'
alias pse='pass edit'
alias pgp='pass git push'
alias pgl='pass git pull'
# Terraform aliases
alias tf='terraform'
alias tfa='terraform apply'

View File

@ -28,6 +28,7 @@ vim.cmd([[colorscheme gruvbox]])
require("sets")
require("mappings")
require("autocmd")
require("git")
require("lsp")
require("line")

View File

@ -1,4 +1,11 @@
vim.api.nvim_create_autocmd({ "FocusGained" }, {
pattern = { "*" },
command = "checktime",
})
-- vim.api.nvim_create_autocmd({ "BufNewFile", "BufRead" }, {
-- pattern = { "*.yaml", "*.yml" },
-- callback = function()
-- local fname = vim.fn.expand("%:p")
-- if require("lspconfig.util").root_pattern("Chart.yaml")(fname) then
-- vim.opt_local.filetype = "helm"
-- else
-- vim.opt_local.filetype = "yaml"
-- end
-- end,
-- })

View File

@ -127,6 +127,14 @@ lspconfig.terraformls.setup({})
-- json & yaml
lspconfig.jsonls.setup({})
lspconfig.yamlls.setup({})
-- helm
-- lspconfig.helm_ls.setup({
-- filetypes = { "helm" },
-- cmd = { "helm_ls", "serve" },
-- root_dir = function(fname)
-- return require("lspconfig.util").root_pattern("Chart.yaml")(fname)
-- end,
-- })
-- Install LSP servers automatically
require("mason-lspconfig").setup({ automatic_installation = true })

View File

@ -51,7 +51,7 @@ vim.keymap.set("", "\\", ':let @/ = ""<CR>', opts)
-- Git
vim.keymap.set("n", "<leader>gd", vim.cmd.Gvdiff, opts)
-- vim.keymap.set("n", "<leader>gb", vim.cmd('Gitsigns toggle_current_line_blame'))
vim.keymap.set("n", "<leader>gb", function() vim.cmd("Gitsigns toggle_current_line_blame") end, opts)
-- window movement
vim.keymap.set("n", "<leader>wn", "<C-W>j", opts)