Compare commits

..

No commits in common. "f965bc7b0c8846a71d0a4d866b1ad37d74f12be3" and "4999847b2885006b911054a9ebea3a895e5f55b2" have entirely different histories.

13 changed files with 150 additions and 136 deletions

View file

@ -1,3 +1,3 @@
theme = light:gruvboxlight,dark:gruvboxdark
font-size = 14
background-opacity = 0.9
background-opacity = 0.8

View file

@ -0,0 +1,121 @@
-- PLUGIN CONFIGURATION
--- bufdelete.nvim
vim.keymap.set("n", "<Leader>bd", function()
require("bufdelete").bufdelete(0, true)
end)
--- gitblame.nvim
vim.g.gitblame_use_blame_commit_file_urls = true
vim.g.gitblame_display_virtual_text = 0
require('gitblame').setup {enabled = true}
vim.api.nvim_set_keymap('n', '<leader>gbo', ':GitBlameOpenCommitURL<CR>', {
noremap = true,
silent = true,
})
--- gitlinker.nvim
require"gitlinker".setup({
router = {
browse = {
["^git%.atomaka%.com"] = "https://git.atomaka.com/"
.. "{_A.ORG}/"
.. "{_A.REPO}/commit/"
.. "{_A.REV}/"
},
blame = {
["^git%.atomaka%.com"] = "https://git.atomaka.com/"
.. "{_A.ORG}/"
.. "{_A.REPO}/blame/"
.. "branch/{_A.CURRENT_BRANCH}/"
.. "{_A.FILE}"
},
},
})
vim.keymap.set(
{"n", 'v'},
"<leader>gl",
function()
require("gitlinker").link({ action = require("gitlinker.actions").system })
end,
{ silent = true, noremap = true, desc = "GitLink!" }
)
vim.keymap.set(
{"n", 'v'},
"<leader>glb",
function()
require("gitlinker").link({
router_type = "blame",
action = require("gitlinker.actions").system,
})
end,
{ silent = true, noremap = true, desc = "GitLink! blame" }
)
--- gitsigns.nvim
require("gitsigns").setup()
vim.keymap.set("n", "<leader>gb", require("gitsigns").toggle_current_line_blame)
--- git-messanger.vim
vim.g["git_messenger_always_into_popup"] = 1
--- nvim-surround
require("nvim-surround").setup()
--- telescope.nvim
vim.api.nvim_set_keymap('n', '<leader>t', ':Telescope<CR>', {
noremap = true,
silent = true,
})
vim.keymap.set("n", "<C-p>", function()
require("telescope.builtin").find_files({
file_ignore_patterns = {".git/", "node_modules/"},
hidden = true,
previewer = false,
})
end)
vim.keymap.set('n', '<Leader>ff', function()
require("telescope.builtin").find_files({
file_ignore_patterns = {".git/", "node_modules/"},
hidden = true,
no_ignore = true,
previewer = false,
})
end)
vim.keymap.set('n', '<Leader>fg', function()
require("telescope.builtin").live_grep({
file_ignore_patterns = {".git/", "node_modules/"},
hidden = true,
previewer = false,
})
end)
vim.keymap.set('n', '<Leader>fb', function()
require("telescope.builtin").buffers()
end)
--- whitespace.nvim
require("whitespace-nvim").setup({
hightlight = "red"
})
vim.keymap.set("n", "<Leader>fw", function()
require("whitespace-nvim").trim()
end, { silent = true })
--- vim-zoom
-- let g:zoom#statustext='Z'
vim.api.nvim_tabpage_set_var(0, "zoomed", 0)
vim.keymap.set("n", "<C-w>", function()
local char = vim.fn.nr2char(vim.fn.getchar())
if vim.api.nvim_tabpage_get_var(0, "zoomed")== 1 then
if char == 'v' or char == 's' or char == '' or char == '' then
vim.notify("cannot split when zoomed", vim.log.levels.ERROR)
return ""
end
end
return "<C-w>"..char
end, {expr = true, replace_keycodes = true})
vim.keymap.set("n", "<C-w>z", "<Plug>(zoom-toggle)")
vim.keymap.set("n", "<C-w><C-z>", "<Plug>(zoom-toggle)")

View file

@ -4,19 +4,19 @@
"editorconfig.nvim": { "branch": "master", "commit": "5b9e303e1d6f7abfe616ce4cc8d3fffc554790bf" },
"git-blame.nvim": { "branch": "master", "commit": "2883a7460f611c2705b23f12d58d398d5ce6ec00" },
"git-messenger.vim": { "branch": "master", "commit": "edc603d4cda7894a743e383e16c638e206d03148" },
"gitlinker.nvim": { "branch": "master", "commit": "df0c4e342742812186f87e32caf82b3e5e288a84" },
"gitsigns.nvim": { "branch": "main", "commit": "5f808b5e4fef30bd8aca1b803b4e555da07fc412" },
"gitlinker.nvim": { "branch": "master", "commit": "a221c13fc3c7f5b8799933f4966ee8e618287292" },
"gitsigns.nvim": { "branch": "main", "commit": "ee7634ab4f0a6606438fe13e16cbf2065589a5ed" },
"gruvbox": { "branch": "master", "commit": "143a3b8babcfd2bce6c99d6ba496942647c3e30b" },
"lazy.nvim": { "branch": "main", "commit": "7e6c863bc7563efbdd757a310d17ebc95166cef3" },
"nvim-surround": { "branch": "main", "commit": "9f0cb495f25bff32c936062d85046fbda0c43517" },
"lazy.nvim": { "branch": "main", "commit": "cf8ecc2c5e4332760431a33534240b0cbc6680ab" },
"nvim-surround": { "branch": "main", "commit": "ec2dc7671067e0086cdf29c2f5df2dd909d5f71f" },
"plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" },
"telescope.nvim": { "branch": "master", "commit": "2eca9ba22002184ac05eddbe47a7fe2d5a384dfc" },
"telescope.nvim": { "branch": "master", "commit": "df534c3042572fb958586facd02841e10186707c" },
"typescript-vim": { "branch": "master", "commit": "8d169e16b5487771f6568125d4c63e6086e524d9" },
"vim-eunuch": { "branch": "master", "commit": "e86bb794a1c10a2edac130feb0ea590a00d03f1e" },
"vim-go": { "branch": "master", "commit": "6adc82bfef7f9a4b0db78065ae51b8ebb145c355" },
"vim-markdown": { "branch": "master", "commit": "f9f845f28f4da33a7655accb22f4ad21f7d9fb66" },
"vim-eunuch": { "branch": "master", "commit": "6c6af39aa0a25223389607338ae965c5dfc7c972" },
"vim-go": { "branch": "master", "commit": "ac1fb9611de435d80a6badcf8482cb1428449b10" },
"vim-markdown": { "branch": "master", "commit": "f405b47fd8774ecd5e808e6de9c85d9029da251c" },
"vim-rails": { "branch": "master", "commit": "d3954dfe3946c9330dc91b4fbf79ccacb2c626c0" },
"vim-ruby": { "branch": "master", "commit": "9139741a9d786144aae66755df030f8e5fab36df" },
"vim-ruby": { "branch": "master", "commit": "f06f069ce67bdda6f2cd408f8859cdf031e5b6b4" },
"vim-terraform": { "branch": "master", "commit": "24de93afb05078bac6a2e966402cc1f672277708" },
"vim-zoom": { "branch": "master", "commit": "01c737005312c09e0449d6518decf8cedfee32c7" },
"whitespace.nvim": { "branch": "master", "commit": "f7d14be0f23a9c1e8021aca70d280aea26649b68" }

View file

@ -33,6 +33,17 @@ vim.api.nvim_create_autocmd({"WinLeave"}, {
end
})
--- background matching terminal
function ChangeBackground()
local home = os.getenv("HOME")
local user = os.getenv("USER")
local file = io.open(home.."/.config/"..user.."/color.yml", "rb")
local background = file:read()
file:close()
vim.opt.background = background
end
ChangeBackground()
-- LEADER CONFIGURATION
vim.keymap.set("n", "<leader>sz", ":luafile ~/.config/nvim/init.lua<cr>")

View file

@ -1,6 +0,0 @@
return {
"famiu/bufdelete.nvim",
keys = {
{ "<Leader>bd", function() require("bufdelete").bufdelete(0, true) end }
},
}

View file

@ -1,12 +0,0 @@
return {
"f-person/git-blame.nvim",
event = "VeryLazy",
keys = {
{ "<leader>gbo", "<cmd>GitBlameOpenCommitURL<CR>", desc = "Open Commit" }
},
opts = {
enabled = true,
use_blame_commit_file_urls = true,
display_virtual_text = false
},
}

View file

@ -1,5 +0,0 @@
vim.g["git_messenger_always_into_popup"] = 1
return {
"rhysd/git-messenger.vim"
}

View file

@ -1,27 +0,0 @@
return {
{
"linrongbin16/gitlinker.nvim",
cmd = "GitLink",
opts = {
router = {
browse = {
["^git%.atomaka%.com"] = "https://git.atomaka.com/"
.. "{_A.ORG}/"
.. "{_A.REPO}/commit/"
.. "{_A.REV}/"
},
blame = {
["^git%.atomaka%.com"] = "https://git.atomaka.com/"
.. "{_A.ORG}/"
.. "{_A.REPO}/blame/"
.. "branch/{_A.CURRENT_BRANCH}/"
.. "{_A.FILE}"
},
},
},
keys = {
{ "<leader>gl", "<cmd>GitLink!<cr>", mode = { "n", "v" }, desc = "Gitlink!" },
{ "<leader>glb", "<cmd>GitLink! blame<cr>", mode = { "n", "v" }, desc = "Gitlink! blame" },
},
},
}

View file

@ -1,11 +0,0 @@
return {
"lewis6991/gitsigns.nvim",
keys = {
{
"<leader>gb",
function() require("gitsigns").toggle_current_line_blame() end,
desc = "Toggle line blame"
}
},
config = function() require("gitsigns").setup({}) end,
}

View file

@ -1,9 +1,16 @@
return {
"nvim-lua/plenary.nvim",
"nvim-telescope/telescope.nvim",
"famiu/bufdelete.nvim",
"dhruvasagar/vim-zoom",
"gpanders/editorconfig.nvim",
"johnfrankmorgan/whitespace.nvim", -- not working
"johnfrankmorgan/whitespace.nvim",
"kylechui/nvim-surround",
-- "FabijanZulj/blame.nvim",
"rhysd/git-messenger.vim",
"lewis6991/gitsigns.nvim",
"linrongbin16/gitlinker.nvim",
"f-person/git-blame.nvim",
"tpope/vim-eunuch",
"gruvbox-community/gruvbox",

View file

@ -1,7 +0,0 @@
return {
"kylechui/nvim-surround",
event = "VeryLazy",
config = function()
require("nvim-surround").setup({})
end
}

View file

@ -1,36 +0,0 @@
local builtin = require('telescope.builtin')
vim.api.nvim_set_keymap('n', '<leader>t', ':Telescope<CR>', {
noremap = true,
silent = true,
})
vim.keymap.set("n", "<C-p>", function()
builtin.find_files({
file_ignore_patterns = {".git/", "node_modules/"},
hidden = true,
previewer = false,
})
end)
vim.keymap.set('n', '<Leader>ff', function()
builtin.find_files({
file_ignore_patterns = {".git/", "node_modules/"},
hidden = true,
no_ignore = true,
previewer = false,
})
end)
vim.keymap.set('n', '<Leader>fg', function()
builtin.live_grep({
file_ignore_patterns = {".git/", "node_modules/"},
hidden = true,
previewer = false,
})
end)
vim.keymap.set('n', '<Leader>fb', function()
builtin.buffers()
end)
return {
'nvim-telescope/telescope.nvim',
dependencies = { 'nvim-lua/plenary.nvim' }
}

View file

@ -1,21 +0,0 @@
vim.api.nvim_tabpage_set_var(0, "zoomed", 0)
vim.keymap.set("n", "<C-w>", function()
local char = vim.fn.nr2char(vim.fn.getchar())
if vim.api.nvim_tabpage_get_var(0, "zoomed")== 1 then
if char == 'v' or char == 's' or char == '' or char == '' then
vim.notify("cannot split when zoomed", vim.log.levels.ERROR)
return ""
end
end
return "<C-w>"..char
end, {expr = true, replace_keycodes = true})
return {
"dhruvasagar/vim-zoom",
keys = {
{ "<C-w>z", "<Plug>(zoom-toggle)" },
{ "<C-w><C-z>", "<Plug>(zoom-toggle)" },
}
}