sankalp/keycodex
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
sankalp committed 2024-06-25 17:37:22 +05:45
1 parent 535e695d51
commit 389d5aa992
11 files changed
+63 -115
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

.gitignore
-5
View File
@@ -1,5 +0,0 @@
# Packer compiled output
plugin/packer_compiled.lua
# Custom user configs
lua/user/
lua/core/autocmd.lua
+2
View File
@@ -103,3 +103,5 @@ vim.api.nvim_create_autocmd('FileType', {
vim.opt_local.formatoptions:remove({ 'c', 'r', 'o' })
end,
})
lua/core/keys.lua
+1 -25
View File
@@ -207,7 +207,7 @@ map('i', '<M-c>', function() return vim.fn['codeium#Clear']() end, { expr = true
-- Oil Explorer
map('n', '<leader>E', function()
require("oil").toggle_float()
require("oil").toggle_float()
end, { desc = icons.documents.OpenFolder .. 'Oil File Explorer' })
@@ -222,27 +222,3 @@ map('n', '<leader>mu', function()
--keymap.set("n", "<leader>tn", ":tabn<CR>") -- next tab
--keymap.set("n", "<leader>tp", ":tabp<CR>") -- previous tab
map("n", '<leader>jo', function()
if vim.bo.filetype == 'java' then
require('jdtls').organize_imports();
end
end)
map("n", '<leader>ju', function()
if vim.bo.filetype == 'java' then
require('jdtls').update_projects_config();
end
end)
map("n", '<leader>jc', function()
if vim.bo.filetype == 'java' then
require('jdtls').test_class();
end
end)
map("n", '<leader>jm', function()
if vim.bo.filetype == 'java' then
require('jdtls').test_nearest_method();
end
end)
lua/lib/icons.lua
+4
View File
@@ -99,8 +99,10 @@ return {
Download = '',
Edge = '│ ',
Electric = '',
Eye = '',
Fire = '',
Firefox = '',
Flag = '',
Game = '',
Gear = '',
GitHub = '',
@@ -142,6 +144,7 @@ return {
Search = '',
Separator = '▊ ',
SeparatorLight = '▍',
SeparatorDashed = '┆',
SignIn = '',
SignOut = '',
Sleep = '󰒲 ',
@@ -151,6 +154,7 @@ return {
Terminal = '',
Test = '',
Time = '',
Topline = '‾',
Trash = '',
User = '',
Vim = '',
lua/plugins/list.lua
+1 -1
View File
@@ -400,7 +400,7 @@ local plugins = {
-- Telescope
{
'nvim-telescope/telescope.nvim',
branch = 'master',
branch = '0.1.x',
dependencies = {
'nvim-lua/plenary.nvim',
{
lua/plugins/lock.json
+25 -24
View File
@@ -2,7 +2,7 @@
"LuaSnip": { "branch": "master", "commit": "50fcf17db7c75af80e6b6109acfbfb4504768780" },
"Navigator.nvim": { "branch": "master", "commit": "91d86506ac2a039504d5205d32a1d4bc7aa57072" },
"auto-save.nvim": { "branch": "main", "commit": "5fe9ab0c42f0457f2a973e814a6352b8eeb04730" },
"ccc.nvim": { "branch": "main", "commit": "22924b7bde685e1816140f17a897950ef82b969a" },
"ccc.nvim": { "branch": "main", "commit": "4fb5abaef2f2e0540fe22d4d74a9841205fff9e4" },
"cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
"cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" },
"cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
@@ -10,21 +10,22 @@
"cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
"cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
"co-author.nvim": { "branch": "main", "commit": "3beddbbd5fdf3121921fc7b28fd731cffc70f952" },
"codeium.vim": { "branch": "main", "commit": "8d4e845f125731d2de7c3036ea83f4be031c4340" },
"codeium.vim": { "branch": "main", "commit": "7a01ffb1e6538fe634f294908a50a7b680039284" },
"compiler.nvim": { "branch": "main", "commit": "520ca6e0bd924e3ca8bd26e036a3b830955cf52f" },
"conform.nvim": { "branch": "master", "commit": "6e5d476e97dbd251cc2233d42fd238c810404701" },
"dashboard-nvim": { "branch": "master", "commit": "b88c997f468a1bacb1e9b13ff3b567638caa06e6" },
"dressing.nvim": { "branch": "master", "commit": "e3714c8049b2243e792492c4149e4cc395c68eb9" },
"conform.nvim": { "branch": "master", "commit": "c26dadf8a47a547768d1048a0d698ecec33494ce" },
"dashboard-nvim": { "branch": "master", "commit": "69a4c935cc43d3d725ed0600c6d00593bc23d132" },
"dressing.nvim": { "branch": "master", "commit": "6741f1062d3dc6e4755367a7e9b347b553623f04" },
"flash.nvim": { "branch": "main", "commit": "43f67935d388fbb540f8b40e8cbfd80de54f978a" },
"flutter-tools.nvim": { "branch": "main", "commit": "990a1349c29f7d474a0cd51355aba773ccc9deea" },
"fortune.nvim": { "branch": "master", "commit": "57ac0b96f58180eab8c0293b7bd0bb5f834433fc" },
"flutter-tools.nvim": { "branch": "main", "commit": "0fbb3ee9056236d907b4b5680fcaa1da23cddc29" },
"fortune.nvim": { "branch": "master", "commit": "470bcb2292f4fba68724cddc39b07c96e5e3e732" },
"friendly-snippets": { "branch": "main", "commit": "682157939e57bd6a2c86277dfd4d6fbfce63dbac" },
"gitlinker.nvim": { "branch": "master", "commit": "cc59f732f3d043b626c8702cb725c82e54d35c25" },
"gitsigns.nvim": { "branch": "main", "commit": "47c8e3e571376b24de62408fd0c9d12f0a9fc0a3" },
"gitsigns.nvim": { "branch": "main", "commit": "d0db8ef6a0489ed6af0baacb101a7b733c5d5de1" },
"hardtime.nvim": { "branch": "main", "commit": "9a4e24fb40482dc85a93bf6cf344a030b9bf9a39" },
"harpoon": { "branch": "harpoon2", "commit": "0378a6c428a0bed6a2781d459d7943843f374bce" },
"indent-blankline.nvim": { "branch": "master", "commit": "d98f537c3492e87b6dc6c2e3f66ac517528f406f" },
"lazy.nvim": { "branch": "main", "commit": "c501b429cf995c645454539b924aaefae45bb9eb" },
"hererocks": { "branch": "master", "commit": "ec640f26e25f4a8e16f236d78bf35ab72b197b29" },
"indent-blankline.nvim": { "branch": "master", "commit": "4036c8ae9cc29faf8e6443fa5b23e679db055d24" },
"lazy.nvim": { "branch": "main", "commit": "9005e8ede7ff9e6434818c32d99860d7154d0432" },
"lazydev.nvim": { "branch": "main", "commit": "6184ebbbc8045d70077659b7d30c705a588dc62f" },
"live-server.nvim": { "branch": "main", "commit": "f6f00a3f541251f0320910bb0d03c4ae14ee6d10" },
"lsp_lines.nvim": { "branch": "main", "commit": "dbfd8e96ec2696e1ceedcd23fd70e842256e3dea" },
@@ -38,37 +39,37 @@
"mini.ai": { "branch": "main", "commit": "a7e90f110e6274262616311b93cef12cd2667a2d" },
"mini.comment": { "branch": "main", "commit": "c8406379987c321ecdef9f53e1ca741a55002104" },
"mini.surround": { "branch": "main", "commit": "3cb5b509ad34f2402df4b977be607a614c8c7524" },
"neotest": { "branch": "master", "commit": "f30bab1faef13d47f3905e065215c96a42d075ad" },
"neotest": { "branch": "master", "commit": "26ed90509c377d10dbdebd25b7094a886323b32b" },
"neotest-jest": { "branch": "main", "commit": "514fd4eae7da15fd409133086bb8e029b65ac43f" },
"neotest-rspec": { "branch": "main", "commit": "48573d5882cbe8d8bcd3b735d9ee7705168b1b87" },
"nerdy.nvim": { "branch": "main", "commit": "b467d6609b78d6a5f1e12cbc08fcc1ac87af20f5" },
"noice.nvim": { "branch": "main", "commit": "8bccd26e912a439f45829bd1fe83e77c4dc263ad" },
"none-ls.nvim": { "branch": "main", "commit": "cc0a3c45047e3daf85d07c1571d65476cfce6480" },
"nui.nvim": { "branch": "main", "commit": "322978c734866996274467de084a95e4f9b5e0b1" },
"noice.nvim": { "branch": "main", "commit": "cade1f972ba226e7753a7a113f3f1a942908e73c" },
"none-ls.nvim": { "branch": "main", "commit": "f1b438ab1709cf9d8875843559d20265013ac755" },
"nui.nvim": { "branch": "main", "commit": "a2bc1e9d0359caa5d11ad967cd1e30e8d4676226" },
"nvim-autopairs": { "branch": "master", "commit": "c15de7e7981f1111642e7e53799e1211d4606cb9" },
"nvim-cmp": { "branch": "main", "commit": "a110e12d0b58eefcf5b771f533fc2cf3050680ac" },
"nvim-dap": { "branch": "master", "commit": "6f79b822997f2e8a789c6034e147d42bc6706770" },
"nvim-dap-ui": { "branch": "master", "commit": "b7267003ba4dd860350be86f75b9d9ea287cedca" },
"nvim-lspconfig": { "branch": "master", "commit": "bd7c76375a511994c9ca8d69441f134dc10ae3bd" },
"nvim-lspconfig": { "branch": "master", "commit": "9c9eb07fecc578e25e28db8dc9002b43fff2ed79" },
"nvim-nio": { "branch": "master", "commit": "7969e0a8ffabdf210edd7978ec954a47a737bbcc" },
"nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" },
"nvim-spectre": { "branch": "master", "commit": "ec67d4b5370094b923dfcf6b09b39142f2964861" },
"nvim-spider": { "branch": "main", "commit": "b17d85c086d963852b7e3f543e0cd187b5112bc5" },
"nvim-tree.lua": { "branch": "master", "commit": "2086e564c4d23fea714e8a6d63b881e551af2f41" },
"nvim-treesitter": { "branch": "master", "commit": "f7edd3f5f636dceebc874a59bdcf9de6a41dbc68" },
"nvim-tree.lua": { "branch": "master", "commit": "8b2c5c678be4b49dff6a2df794877000113fd77b" },
"nvim-treesitter": { "branch": "master", "commit": "09700b88b41ed96391de3d2010d74dc54fd5c210" },
"nvim-treesitter-endwise": { "branch": "master", "commit": "8b34305ffc28bd75a22f5a0a9928ee726a85c9a6" },
"nvim-treesitter-refactor": { "branch": "master", "commit": "65ad2eca822dfaec2a3603119ec3cc8826a7859e" },
"nvim-treesitter-textobjects": { "branch": "master", "commit": "34867c69838078df7d6919b130c0541c0b400c47" },
"nvim-treesitter-textsubjects": { "branch": "master", "commit": "1428108f18ce9d8cc4481dcedebeeb490eabf395" },
"nvim-ts-autotag": { "branch": "main", "commit": "06fe07d7523ba8c755fac7c913fceba43b1720ee" },
"nvim-treesitter-textsubjects": { "branch": "master", "commit": "a8d2844bba925d9450ef7ab215f3b054028288ca" },
"nvim-ts-autotag": { "branch": "main", "commit": "ddfccbf0df1b9349c2b9e9b17f4afa8f9b6c1ed1" },
"nvim-ts-context-commentstring": { "branch": "main", "commit": "cb064386e667def1d241317deed9fd1b38f0dc2e" },
"nvim-web-devicons": { "branch": "master", "commit": "c0cfc1738361b5da1cd0a962dd6f774cc444f856" },
"oil.nvim": { "branch": "master", "commit": "64a3a555b40d96faae488ed6cf5d0f8b38520891" },
"oil.nvim": { "branch": "master", "commit": "65c53dbe4f2140236590a7568a5f22a77d16be39" },
"onedark.nvim": { "branch": "master", "commit": "8e4b79b0e6495ddf29552178eceba1e147e6cecf" },
"overseer.nvim": { "branch": "master", "commit": "d78fa84c06d37b1eb3bd42b4b5467c7476e74589" },
"plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" },
"rainbow-delimiters.nvim": { "branch": "master", "commit": "5c9660801ce345cd3835e1947c12b54290ab7e71" },
"refactoring.nvim": { "branch": "master", "commit": "e6b10b2346bd7e469a5f17099775ad906da153ae" },
"refactoring.nvim": { "branch": "master", "commit": "c9c1a0995b7d9a534f3b9a4df7fd55240127eeb4" },
"ror.nvim": { "branch": "main", "commit": "9d31ad3953be83ac8dd542725ca4881c861f64a5" },
"sniprun": { "branch": "master", "commit": "1420cff041a0582636f63960d7160f7832463c10" },
"tabout.nvim": { "branch": "master", "commit": "3d7fbc7f5e91ef0f96b4d787c78ad9f8820de3ec" },
@@ -78,13 +79,13 @@
"telescope-menufacture": { "branch": "main", "commit": "8c547e82a703fe90c7f69af04d0b4e47a59cc971" },
"telescope-symbols.nvim": { "branch": "master", "commit": "a6d0127a53d39b9fc2af75bd169d288166118aec" },
"telescope-undo.nvim": { "branch": "main", "commit": "95b61c01ea3a4c9e8747731148e905bbcf0ccaee" },
"telescope.nvim": { "branch": "master", "commit": "c392f1b78eaaf870ca584bd698e78076ed301b26" },
"termim.nvim": { "branch": "main", "commit": "1f88c66449c832445399c414fc4313dba5174b1b" },
"telescope.nvim": { "branch": "0.1.x", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" },
"termim.nvim": { "branch": "main", "commit": "f57cd13af0e3ff90a4fab6a0c9787a33ded537e4" },
"ts-node-action": { "branch": "master", "commit": "6d3b60754fd87963d70eadaa2f77873b447eac26" },
"twilight.nvim": { "branch": "main", "commit": "8b7b50c0cb2dc781b2f4262a5ddd57571556d1e4" },
"url-open": { "branch": "main", "commit": "9f8f4a56ac709f26aa17d8ef921b272bf2262a30" },
"vim-fugitive": { "branch": "master", "commit": "64d6cafb9dcbacce18c26d7daf617ebb96b273f3" },
"vim-rails": { "branch": "master", "commit": "8972461e64c7c4bf049f2f86ea1bc571e8077b55" },
"vim-rails": { "branch": "master", "commit": "2fba7907f585819a8653f0bc7dd7f437a822d9c6" },
"which-key.nvim": { "branch": "main", "commit": "0099511294f16b81c696004fa6a403b0ae61f7a0" },
"zen-mode.nvim": { "branch": "main", "commit": "78557d972b4bfbb7488e17b5703d25164ae64e6a" }
}
lua/plugins/tools/gitsigns.lua
+8 -36
View File
@@ -1,37 +1,14 @@
local gitsigns = require('gitsigns')
local icons = require('lib.icons')
gitsigns.setup({
signs = {
add = {
hl = 'GitSignsAdd',
text = '│',
numhl = 'GitSignsAddNr',
linehl = 'GitSignsAddLn',
},
change = {
hl = 'GitSignsChange',
text = '│',
numhl = 'GitSignsChangeNr',
linehl = 'GitSignsChangeLn',
},
delete = {
hl = 'GitSignsDelete',
text = '_',
numhl = 'GitSignsDeleteNr',
linehl = 'GitSignsDeleteLn',
},
topdelete = {
hl = 'GitSignsDelete',
text = '‾',
numhl = 'GitSignsDeleteNr',
linehl = 'GitSignsDeleteLn',
},
changedelete = {
hl = 'GitSignsChange',
text = '~',
numhl = 'GitSignsChangeNr',
linehl = 'GitSignsChangeLn',
},
add = { text = icons.ui.SeparatorLight },
change = { text = icons.ui.SeparatorLight },
delete = { text = icons.ui.SeparatorLight },
topdelete = { text = icons.ui.Topline },
changedelete = { text = icons.ui.SeparatorLight },
untracked = { text = icons.ui.SeparatorDashed },
},
signcolumn = true,
numhl = false,
@@ -51,8 +28,7 @@ gitsigns.setup({
update_debounce = 100,
status_formatter = nil,
max_file_length = 40000,
preview_config = { border = 'single', style = 'minimal', relative = 'cursor', row = 0, col = 1 },
yadm = { enable = false },
preview_config = { border = 'rounded', style = 'minimal', relative = 'cursor', row = 0, col = 1 },
on_attach = function(bufnr)
local gs = package.loaded.gitsigns
@@ -82,10 +58,6 @@ gitsigns.setup({
return '<Ignore>'
end, { expr = true, desc = 'Previous Change' })
map('n', '<leader>gB', function()
gs.blame_line({ full = true })
end, { desc = 'Blame With Preview' })
map({ 'o', 'x' }, 'ih', ':<C-U>Gitsigns select_hunk<CR>')
end,
})
lua/plugins/tools/oil.lua
+7
View File
@@ -1,4 +1,7 @@
require("oil").setup({
default_file_explorer = true,
delete_to_trash = true,
skip_confirm_for_simple_edits = true,
use_default_keymaps = false,
keymaps = {
["q"] = "actions.close",
@@ -19,6 +22,10 @@
["h"] = "actions.toggle_hidden",
},
view_options = {
natural_order = true,
show_hidden = false,
},
win_options = {
wrap = true,
},
})
lua/plugins/tools/telescope.lua
+2 -11
View File
@@ -1,6 +1,5 @@
local telescope = require('telescope')
local actions = require('telescope.actions')
local multi_open_mappings = require('plugins.tools.telescope-multiopen')
local icons = require('lib.icons')
local function flash(prompt_bufnr)
@@ -52,11 +51,8 @@ telescope.setup({
prompt_prefix = icons.ui.Telescope .. icons.ui.ChevronRight,
selection_caret = icons.ui.Play,
multi_icon = icons.ui.Check,
path_display = {
filename_first = {
reverse_directories = false,
},
},
path_display = { 'smart' },
-- path_display = { filename_first = { reverse_directories = false } },
sorting_strategy = 'ascending',
mappings = {
@@ -129,11 +125,6 @@ telescope.setup({
},
},
},
pickers = {
find_files = { mappings = multi_open_mappings },
git_files = { mappings = multi_open_mappings },
oldfiles = { mappings = multi_open_mappings },
},
extensions = {
fzf = {
fuzzy = true,
lua/plugins/tools/which-key.lua
+12 -11
View File
@@ -175,11 +175,12 @@ local mappings = {
f = { '<cmd>lua require("telescope").extensions.menufacture.git_files()<cr>', 'Find files' },
g = { '<cmd>lua require("telescope").extensions.menufacture.live_grep()<cr>', 'Find Text' },
l = { '<cmd>Telescope loclist<cr>', 'Location List' },
r = { '<cmd>Telescope oldfiles<cr>', 'Recent Files' },
m = { '<cmd>Telescope git_status<cr>', 'Modified files' },
o = { '<cmd>Telescope live_grep grep_open_files=true<cr>', 'Find in Open Files' },
p = { '<cmd>Telescope resume<cr>', 'Last Search' },
q = { '<cmd>Telescope quickfix<cr>', 'Quickfix' },
r = { '<cmd>Telescope oldfiles<cr>', 'Recent Files' },
s = { '<cmd>Telescope current_buffer_fuzzy_find<cr>', 'Fuzzy Find in File' },
S = { '<cmd>Telescope live_grep grep_open_files=true<cr>', 'Find in Open Files' },
t = { '<cmd>Telescope<cr>', 'Panel' },
u = { '<cmd>Telescope undo<cr>', 'Undo History' },
w = { '<cmd>lua require("telescope").extensions.menufacture.grep_string()<cr>', 'Find Word' },
@@ -189,23 +190,23 @@ local mappings = {
a = { '<cmd>Gitsigns stage_hunk<cr>', 'Stage Hunk' },
A = { '<cmd>Gitsigns stage_buffer<cr>', 'Stage Buffer' },
b = { "<cmd>lua require('gitsigns').blame_line({full = true})<cr>", 'Blame' },
B = { '<cmd>Telescope git_branches<cr>', 'Branches' },
c = { '<cmd>Git<cr>', 'Git Console' },
c = { '<cmd>Telescope git_commits<cr>', 'Find Commits' },
C = { '<cmd>CoAuthor<cr>', 'Co-Authors' },
d = { '<cmd>Gitsigns preview_hunk<cr>', 'Preview Hunk' },
D = { '<cmd>Gitsigns diffthis HEAD<cr>', 'Diff' },
f = { '<cmd>Telescope git_commits<cr>', 'Find Commits' },
d = { '<cmd>Gitsigns diffthis HEAD<cr>', 'Diff' },
f = { '<cmd>Git<cr>', 'Fugitive Panel' },
g = { '<cmd>Fterm lazygit<cr>', 'Lazygit' },
i = { '<cmd>Gitsigns preview_hunk<cr>', 'Hunk Info' },
j = { '<cmd>Gitsigns next_hunk<cr>', 'Next Hunk' },
k = { '<cmd>Gitsigns prev_hunk<cr>', 'Prev Hunk' },
l = { '<cmd>Git pull<cr>', 'Pull' },
p = { '<cmd>Git push<cr>', 'Push' },
l = { '<cmd>Git log<cr>', 'Log' },
p = { '<cmd>Git pull<cr>', 'Pull' },
P = { '<cmd>Git push<cr>', 'Push' },
r = { '<cmd>Gitsigns reset_hunk<cr>', 'Reset Hunk' },
R = { '<cmd>Gitsigns reset_buffer<cr>', 'Reset Buffer' },
s = { '<cmd>Telescope git_status<cr>', 'Changed files' },
s = { '<cmd>Telescope git_branches<cr>', 'Switch Branch' },
S = { '<cmd>Telescope git_stash<cr>', 'Stashed Changes' },
t = {
name = 'Git Toggle',
name = 'Toggle',
b = { '<cmd>Gitsigns toggle_current_line_blame<cr>', 'Blame' },
d = { '<cmd>Gitsigns toggle_deleted<cr>', 'Deleted' },
l = { '<cmd>Gitsigns toggle_linehl<cr>', 'Line HL' },
lua/plugins/ui/onedark.lua
+1 -2
View File
@@ -2,7 +2,7 @@ local onedark = require('onedark')
local util = require('lib.util')
onedark.setup({
style = 'darker',
style = 'deep',
transparent = true,
term_colors = false,
ending_tildes = false,
@@ -24,4 +24,3 @@ onedark.setup({
diagnostics = { darker = true, undercurl = true, background = false },
})
onedark.load()