Skip to content

Commit 2416f7a

Browse files
Akash6222Akash6222
committed
Updated nvim with latest version and Fixed major bugs
1 parent d77a422 commit 2416f7a

File tree

188 files changed

+945
-7596
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

188 files changed

+945
-7596
lines changed

‎ftplugin/js.lua

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
vim.opt.shiftwidth = 4
2+
vim.opt.tabstop = 4

‎ftplugin/python.lua

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
local status_ok, _ = pcall(require, "swenv")
2+
if not status_ok then
3+
return "Swenv not found"
4+
else
5+
require("swenv.api").auto_venv()
6+
end
7+
8+
local status, wk = pcall(require, "which-key")
9+
if not status then
10+
return "Whick-key not found"
11+
end
12+
13+
local keymaps = {
14+
{ "<leader>lps", function() require("swenv.api").pick_venv() end, desc = "Pick venv", },
15+
{ "<leader>lpc", function() vim.notify(require("swenv.api").get_current_venv().name) end, desc = "Current venv", },
16+
{ "<leader>lpr", function() vim.cmd("LspRestart") end, desc = "Restart LSP", },
17+
}
18+
19+
wk.add(keymaps)

‎init.lua

+5-9
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,10 @@
11
vim.loader.enable()
22

3-
require("rj.options")
4-
require("rj.lazy")
5-
require("rj.autocommands")
6-
require("rj.keymaps")
3+
require("ad.options")
4+
require("ad.lazy")
5+
require("ad.autocommands")
6+
require("ad.keymaps")
7+
78

89
-- Bufferline
910
require("bufferline").setup{}
10-
11-
-- Discord
12-
require("presence").setup{}
13-
14-

‎lazy-lock.json

+56-47
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
{
2+
"2048.nvim": { "branch": "main", "commit": "aee7c41a9a9473117465132768ae4b4da97435c3" },
23
"Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" },
34
"FixCursorHold.nvim": { "branch": "master", "commit": "1900f89dc17c603eec29960f57c00bd9ae696495" },
4-
"LuaSnip": { "branch": "master", "commit": "ce0a05ab4e2839e1c48d072c5236cce846a387bc" },
5-
"alpha-nvim": { "branch": "main", "commit": "41283fb402713fc8b327e60907f74e46166f4cfd" },
5+
"LuaSnip": { "branch": "master", "commit": "7ad2eaeaca56d6ed63acacbfc114b99f1f67b982" },
6+
"alpha-nvim": { "branch": "main", "commit": "b6f4129302db197a7249e67a90de3f2b676de13e" },
67
"auto-save.nvim": { "branch": "main", "commit": "5fe9ab0c42f0457f2a973e814a6352b8eeb04730" },
7-
"barbecue.nvim": { "branch": "main", "commit": "d38a2a023dfb1073dd0e8fee0c9be08855d3688f" },
8-
"better-escape.nvim": { "branch": "master", "commit": "7e86edafb8c7e73699e0320f225464a298b96d12" },
9-
"bufferline.nvim": { "branch": "main", "commit": "81820cac7c85e51e4cf179f8a66d13dbf7b032d9" },
10-
"catppuccin": { "branch": "main", "commit": "31fcfb02c47952d5c75aec893b93b2878abe5fbb" },
8+
"barbecue.nvim": { "branch": "main", "commit": "3e31404f0b93a2c30d151abf0648650ac811c664" },
9+
"better-escape.nvim": { "branch": "master", "commit": "d337e02b140d909345441392de47a42d283747c1" },
10+
"bufferline.nvim": { "branch": "main", "commit": "0b2fd861eee7595015b6561dade52fb060be10c4" },
11+
"catppuccin": { "branch": "main", "commit": "4fd72a9ab64b393c2c22b168508fd244877fec96" },
1112
"clangd_extensions.nvim": { "branch": "main", "commit": "a8500531c4ed3a207e744a374ea038744a0f93eb" },
1213
"cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
1314
"cmp-calc": { "branch": "main", "commit": "5947b412da67306c5b68698a02a846760059be2e" },
@@ -16,71 +17,79 @@
1617
"cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" },
1718
"cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
1819
"cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
19-
"conform.nvim": { "branch": "master", "commit": "c26dadf8a47a547768d1048a0d698ecec33494ce" },
20+
"conform.nvim": { "branch": "master", "commit": "62eba813b7501b39612146cbf29cd07f1d4ac29c" },
2021
"cppman.nvim": { "branch": "main", "commit": "89a2a7c3ad0ae434ff5c920fd406fcc884559883" },
2122
"cybu.nvim": { "branch": "main", "commit": "c0866ef6735a85f85d4cf77ed6d9bc92046b5a99" },
23+
"dressing.nvim": { "branch": "master", "commit": "c5775a888adbc50652cb370073fcfec963eca93e" },
2224
"flatten.nvim": { "branch": "main", "commit": "e420e531d2ab24aebcf7b3c9fca28e6c5c34964d" },
23-
"friendly-snippets": { "branch": "main", "commit": "682157939e57bd6a2c86277dfd4d6fbfce63dbac" },
25+
"friendly-snippets": { "branch": "main", "commit": "00ebcaa159e817150bd83bfe2d51fa3b3377d5c4" },
2426
"fsread.nvim": { "branch": "main", "commit": "a637bf048f733def7c5c46f5bf482f93a8311b29" },
2527
"garbage-day.nvim": { "branch": "main", "commit": "4a1160bfffb2f499fb55a54333f29d160ab3c8a1" },
2628
"gist.nvim": { "branch": "main", "commit": "92b13e486dd9fd083750450e0d262fcc68a62b91" },
2729
"gitignore.nvim": { "branch": "master", "commit": "2455191ec94da8ed222806a4fe3aa358eac1e558" },
28-
"gitsigns.nvim": { "branch": "main", "commit": "6b1a14eabcebbcca1b9e9163a26b2f8371364cb7" },
30+
"gitsigns.nvim": { "branch": "main", "commit": "562dc47189ad3c8696dbf460d38603a74d544849" },
2931
"harpoon": { "branch": "master", "commit": "ccae1b9bec717ae284906b0bf83d720e59d12b91" },
3032
"hop.nvim": { "branch": "v2", "commit": "90db1b2c61b820e230599a04fedcd2679e64bd07" },
31-
"img-clip.nvim": { "branch": "main", "commit": "1924e20ab19afec9779109d083b6e5f8bee8fb17" },
33+
"img-clip.nvim": { "branch": "main", "commit": "0e047d80bb08753e8899b5101e88624e54c5d4ad" },
3234
"indent-blankline.nvim": { "branch": "master", "commit": "9637670896b68805430e2f72cf5d16be5b97a22a" },
3335
"indent-o-matic": { "branch": "master", "commit": "4d11e98f523d3c4500b1dc33f0d1a248a4f69719" },
3436
"jaq-nvim": { "branch": "master", "commit": "236296aae555657487d1bb4d066cbde9d79d8cd4" },
35-
"lazy.nvim": { "branch": "main", "commit": "1fad61712bd3937dda925775a7736b8efbcbf1a7" },
36-
"live-server.nvim": { "branch": "main", "commit": "f34ae262bf046981d9e5f7cd4f41a353a9647a22" },
37+
"jupytext.nvim": { "branch": "main", "commit": "c8baf3ad344c59b3abd461ecc17fc16ec44d0f7b" },
38+
"lazy.nvim": { "branch": "main", "commit": "077102c5bfc578693f12377846d427f49bc50076" },
39+
"leetcode.nvim": { "branch": "master", "commit": "02fb2c855658ad6b60e43671f6b040c812181a1d" },
40+
"live-server.nvim": { "branch": "main", "commit": "5fc8abb727827a09d0ce1b7757d0a4c7b5802b09" },
3741
"lua-async-await": { "branch": "main", "commit": "652d94df34e97abe2d4a689edbc4270e7ead1a98" },
38-
"lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" },
39-
"luatab.nvim": { "branch": "master", "commit": "93504f3eda13fc925834429d4caa419d65bc6a01" },
42+
"lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" },
43+
"luatab.nvim": { "branch": "master", "commit": "7bc6e0f6957fbaa93c98529f2cf28052329002e0" },
4044
"markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" },
41-
"mason-lspconfig.nvim": { "branch": "main", "commit": "37a336b653f8594df75c827ed589f1c91d91ff6c" },
45+
"markview.nvim": { "branch": "dev", "commit": "57d35eef8ef75c083560ad7eadbf405f740c93d0" },
46+
"mason-lspconfig.nvim": { "branch": "main", "commit": "1c55991321d1a861537e32446affc5de5d9a6eaf" },
4247
"mason-tool-installer.nvim": { "branch": "main", "commit": "c5e07b8ff54187716334d585db34282e46fa2932" },
43-
"mason.nvim": { "branch": "main", "commit": "0950b15060067f752fde13a779a994f59516ce3d" },
48+
"mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
4449
"neo-tree.nvim": { "branch": "v2.x", "commit": "80dc74d081823649809f78370fa5b204aa9a853a" },
45-
"noice.nvim": { "branch": "main", "commit": "03c6a75661e68012e30b0ed81f050358b1e2233c" },
50+
"noice.nvim": { "branch": "main", "commit": "448bb9c524a7601035449210838e374a30153172" },
4651
"nui.nvim": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" },
47-
"nvim-autopairs": { "branch": "master", "commit": "c15de7e7981f1111642e7e53799e1211d4606cb9" },
48-
"nvim-cmp": { "branch": "main", "commit": "a110e12d0b58eefcf5b771f533fc2cf3050680ac" },
49-
"nvim-colorizer.lua": { "branch": "master", "commit": "85855b38011114929f4058efc97af1059ab3e41d" },
50-
"nvim-dap": { "branch": "master", "commit": "6f79b822997f2e8a789c6034e147d42bc6706770" },
51-
"nvim-dap-ui": { "branch": "master", "commit": "b7267003ba4dd860350be86f75b9d9ea287cedca" },
52-
"nvim-early-retirement": { "branch": "main", "commit": "4c41425a2eca38f5b2ebc9dbac1b217fb1f86b9d" },
52+
"nvim-autopairs": { "branch": "master", "commit": "19606af7c039271d5aa96bceff101e7523af3136" },
53+
"nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" },
54+
"nvim-colorizer.lua": { "branch": "master", "commit": "194ec600488f7c7229668d0e80bd197f3a2b84ff" },
55+
"nvim-dap": { "branch": "master", "commit": "281a2e4cd1e7a17cea7ecb1745d84a8ab1249925" },
56+
"nvim-dap-ui": { "branch": "master", "commit": "a5606bc5958db86f8d92803bea7400ee26a8d7e4" },
57+
"nvim-early-retirement": { "branch": "main", "commit": "2c36a5671b9d8f0d9e11b77c5a55de802bc45e34" },
5358
"nvim-fundo": { "branch": "main", "commit": "ac9c9372c4bf677721e24f144ef29d3a05c2b589" },
54-
"nvim-java": { "branch": "main", "commit": "96472bf5b7a2fdbfa49c58b056bfc8606f4b7275" },
55-
"nvim-java-core": { "branch": "main", "commit": "469aabd3e88cfa3a4d131f81de8b8caed14cb585" },
56-
"nvim-java-dap": { "branch": "main", "commit": "55c90c5d2414f6e66f843f38e111bee284d71e61" },
57-
"nvim-java-refactor": { "branch": "main", "commit": "7b841d53ed0ba55857debd0e32ce069b2c17e745" },
58-
"nvim-java-test": { "branch": "main", "commit": "a3fe70c48936e1c143ed366e127e9c3db4791716" },
59+
"nvim-java": { "branch": "main", "commit": "b3174e41ab51867123d8663eced53b33f1548522" },
60+
"nvim-java-core": { "branch": "main", "commit": "5b03dca22fee76524a89e1c2dc1d73a9f0b1a3bb" },
61+
"nvim-java-dap": { "branch": "main", "commit": "55f239532f7a3789d21ea68d1e795abc77484974" },
62+
"nvim-java-refactor": { "branch": "main", "commit": "ea1420fed5463c9cc976c2b4175f434b3646f0f7" },
63+
"nvim-java-test": { "branch": "main", "commit": "7f0f40e9c5b7eab5096d8bec6ac04251c6e81468" },
5964
"nvim-lastplace": { "branch": "main", "commit": "0bb6103c506315044872e0f84b1f736c4172bb20" },
60-
"nvim-lint": { "branch": "master", "commit": "efc6fc83f0772283e064c53a8f9fb5645bde0bc0" },
61-
"nvim-lspconfig": { "branch": "master", "commit": "7edfd6692ba17f8d4fe08d84142781898ab0a672" },
65+
"nvim-lint": { "branch": "master", "commit": "debabca63c0905b59ce596a55a8e33eafdf66342" },
66+
"nvim-lspconfig": { "branch": "master", "commit": "20906fce8587c85266b26d0b35d1bc0df2d49d58" },
6267
"nvim-navic": { "branch": "master", "commit": "8649f694d3e76ee10c19255dece6411c29206a54" },
63-
"nvim-treesitter": { "branch": "master", "commit": "7ff0b8d3d21b15eb7231fcbd2acfded8987f5efd" },
64-
"nvim-ts-context-commentstring": { "branch": "main", "commit": "cb064386e667def1d241317deed9fd1b38f0dc2e" },
65-
"nvim-web-devicons": { "branch": "master", "commit": "c0cfc1738361b5da1cd0a962dd6f774cc444f856" },
66-
"octo.nvim": { "branch": "master", "commit": "7731ca4e31b32c176a383642ffcd7d593ac17774" },
67-
"oil.nvim": { "branch": "master", "commit": "65c53dbe4f2140236590a7568a5f22a77d16be39" },
68+
"nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" },
69+
"nvim-treesitter": { "branch": "master", "commit": "0b8b78f9d08dc338a146eb4cd4bcbed8dd36a783" },
70+
"nvim-ts-autotag": { "branch": "main", "commit": "0cb76eea80e9c73b88880f0ca78fbd04c5bdcac7" },
71+
"nvim-ts-context-commentstring": { "branch": "main", "commit": "375c2d86cee6674afd75b4f727ce3a80065552f7" },
72+
"nvim-web-devicons": { "branch": "master", "commit": "3722e3d1fb5fe1896a104eb489e8f8651260b520" },
73+
"octo.nvim": { "branch": "master", "commit": "0134169886958f3874f16eed7fe73d906a3e7e17" },
74+
"oil.nvim": { "branch": "master", "commit": "a632c898fbe0e363ef89b9577f1a7714ab67d682" },
6875
"playground": { "branch": "master", "commit": "ba48c6a62a280eefb7c85725b0915e021a1a0749" },
69-
"plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" },
76+
"plenary.nvim": { "branch": "master", "commit": "ec289423a1693aeae6cd0d503bac2856af74edaa" },
7077
"presence.nvim": { "branch": "main", "commit": "87c857a56b7703f976d3a5ef15967d80508df6e6" },
7178
"project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" },
72-
"promise-async": { "branch": "main", "commit": "28c1d5a295eb5310afa2523d4ae9aa41ec5a9de2" },
73-
"rustaceanvim": { "branch": "master", "commit": "bc8c4b8f7606d5b7c067cd8369e25c1a7ff77bd0" },
74-
"stickybuf.nvim": { "branch": "master", "commit": "709da3b895a99bbfedd5b59a1a91930026288c15" },
79+
"promise-async": { "branch": "main", "commit": "119e8961014c9bfaf1487bf3c2a393d254f337e2" },
80+
"rustaceanvim": { "branch": "master", "commit": "047f9c9d8cd2861745eb9de6c1570ee0875aa795" },
81+
"spring-boot.nvim": { "branch": "main", "commit": "218c0c26c14d99feca778e4d13f5ec3e8b1b60f0" },
82+
"stickybuf.nvim": { "branch": "master", "commit": "183b9569bef78f44b17c078214f7d731f19cbefe" },
83+
"swenv.nvim": { "branch": "main", "commit": "d760a8f956b0058ffef1434df7ba7a6e2dc3a782" },
7584
"tailwindcss-colorizer-cmp.nvim": { "branch": "main", "commit": "3d3cd95e4a4135c250faf83dd5ed61b8e5502b86" },
76-
"telescope-file-browser.nvim": { "branch": "master", "commit": "a7ab9a957b17199183388c6f357d614fcaa508e5" },
77-
"telescope.nvim": { "branch": "master", "commit": "7bd2f9b72f8449780b79bcf351534e2cd36ec43a" },
78-
"toggleterm.nvim": { "branch": "main", "commit": "cd55bf6aab3f88c259fa29ea86bbdcb1a325687d" },
79-
"trouble.nvim": { "branch": "main", "commit": "e5d0e04121c662ce29190a57dd03655d43c59d44" },
85+
"telescope-file-browser.nvim": { "branch": "master", "commit": "a46780830b576049c675680650f773bedfa8677a" },
86+
"telescope.nvim": { "branch": "master", "commit": "5972437de807c3bc101565175da66a1aa4f8707a" },
87+
"thanks.nvim": { "branch": "main", "commit": "6daefdf73e8555755fed89fe6e2c64568e34f836" },
88+
"toggleterm.nvim": { "branch": "main", "commit": "137d06fb103952a0fb567882bb8527e2f92d327d" },
89+
"trouble.nvim": { "branch": "main", "commit": "6efc446226679fda0547c0fd6a7892fd5f5b15d8" },
8090
"url-open": { "branch": "main", "commit": "9f8f4a56ac709f26aa17d8ef921b272bf2262a30" },
8191
"vim-be-good": { "branch": "master", "commit": "4fa57b7957715c91326fcead58c1fa898b9b3625" },
82-
"vim-closetag": { "branch": "master", "commit": "d0a562f8bdb107a50595aefe53b1a690460c3822" },
8392
"vim-illuminate": { "branch": "master", "commit": "5eeb7951fc630682c322e88a9bbdae5c224ff0aa" },
84-
"which-key.nvim": { "branch": "main", "commit": "0099511294f16b81c696004fa6a403b0ae61f7a0" },
85-
"zen-mode.nvim": { "branch": "main", "commit": "78557d972b4bfbb7488e17b5703d25164ae64e6a" }
86-
}
93+
"which-key.nvim": { "branch": "main", "commit": "6c1584eb76b55629702716995cca4ae2798a9cca" },
94+
"zen-mode.nvim": { "branch": "main", "commit": "29b292bdc58b76a6c8f294c961a8bf92c5a6ebd6" }
95+
}

‎lua/rj/autocommands.lua renamed to ‎lua/ad/autocommands.lua

+47-30
Original file line numberDiff line numberDiff line change
@@ -1,64 +1,79 @@
1-
local autocommand = vim.api.nvim_create_autocmd
1+
local autocmd = vim.api.nvim_create_autocmd
22

3-
autocommand({ "FileType" }, {
3+
autocmd({ "FileType" }, {
44
pattern = { "c", "go", "java", "cpp", "py", "sh" },
55
callback = function()
66
vim.opt_local.shiftwidth = 4
77
vim.opt_local.tabstop = 4
88
end,
99
})
1010

11-
autocommand({ "FileType" }, {
11+
autocmd({ "FileType" }, {
1212
pattern = { "qf", "help", "lspinfo", "spectre_panel", "oil", "Jaq" },
1313
callback = function()
1414
vim.keymap.set("n", "q", "<cmd>close<CR>", { silent = true, buffer = true })
1515
vim.api.nvim_set_option_value("buflisted", false, { buf = 0 })
1616
end,
1717
})
1818

19-
autocommand({ "FileType" }, {
19+
autocmd({ "FileType" }, {
2020
pattern = { "gitcommit", "markdown" },
2121
callback = function()
2222
vim.opt_local.wrap = true
2323
vim.opt_local.spell = true
2424
end,
2525
})
2626

27-
autocommand({ "FileType" }, {
27+
autocmd({ "FileType" }, {
2828
pattern = { "TelescopePrompt", "neo-tree-popup", "oil" },
2929
callback = function()
3030
require("cmp").setup.buffer({
3131
completion = { autocomplete = false },
3232
})
3333
end,
3434
})
35+
--
36+
-- vim.cmd [[
37+
-- au BufEnter,BufWinEnter,WinEnter,CmdwinEnter *
38+
-- \ call s:disable_statusline('NvimTree')
39+
-- fun! s:disable_statusline(bn)
40+
-- if a:bn == bufname('%')
41+
-- set laststatus=0
42+
-- else
43+
-- set laststatus=2
44+
-- endif
45+
-- endfunction ]]
3546

36-
autocommand({ "VimResized" }, {
47+
autocmd({ "FileType" }, {
48+
pattern = { "cpp" },
3749
callback = function()
38-
vim.cmd("tabdo wincmd =")
50+
require("cmp").setup.buffer({
51+
experimental = {
52+
ghost_text = true,
53+
},
54+
})
3955
end,
4056
})
4157

42-
autocommand({ "TextYankPost" }, {
58+
autocmd({ "VimResized" }, {
4359
callback = function()
44-
vim.highlight.on_yank({ higroup = "Visual", timeout = 200 })
60+
vim.cmd("tabdo wincmd =")
4561
end,
4662
})
4763

48-
autocommand({ "BufWritePost" }, {
49-
pattern = { "*.java" },
64+
autocmd({ "TextYankPost" }, {
5065
callback = function()
51-
vim.lsp.codelens.refresh()
66+
vim.highlight.on_yank({ higroup = "Visual", timeout = 200 })
5267
end,
5368
})
5469

55-
autocommand({ "VimEnter" }, {
70+
autocmd({ "VimEnter" }, {
5671
callback = function()
5772
vim.cmd("hi link illuminatedWord LspReferenceText")
5873
end,
5974
})
6075

61-
autocommand({ "BufWinEnter" }, {
76+
autocmd({ "BufWinEnter" }, {
6277
callback = function()
6378
local line_count = vim.api.nvim_buf_line_count(0)
6479
if line_count >= 10000 then
@@ -67,15 +82,15 @@ autocommand({ "BufWinEnter" }, {
6782
end,
6883
})
6984

70-
autocommand({ "FileType" }, {
71-
pattern = { "neo-tree" },
85+
autocmd({ "FileType" }, {
86+
pattern = { "neo-tree", "alpha", "dashboard", "man" },
7287
callback = function()
7388
vim.opt_local.number = false
7489
vim.opt_local.relativenumber = false
7590
end,
7691
})
7792

78-
autocommand({ "BufReadPost" }, {
93+
autocmd({ "BufReadPost" }, {
7994
pattern = "*.pdf",
8095
callback = function(ev)
8196
local filename = ev.file
@@ -91,20 +106,22 @@ vim.filetype.add({
91106
},
92107
})
93108

94-
autocommand("ModeChanged", {
95-
pattern = "*",
96-
callback = function()
97-
if
98-
((vim.v.event.old_mode == "s" and vim.v.event.new_mode == "n") or vim.v.event.old_mode == "i")
99-
and require("luasnip").session.current_nodes[vim.api.nvim_get_current_buf()]
100-
and not require("luasnip").session.jump_active
101-
then
102-
require("luasnip").unlink_current()
103-
end
104-
end,
105-
})
106-
107109
-- make a command to clear registers
108110
vim.cmd([[
109111
command! WipeReg for i in range(34,122) | silent! call setreg(nr2char(i), []) | endfor
110112
]])
113+
114+
-- Hyprlang LSP
115+
vim.api.nvim_create_autocmd({ "BufEnter", "BufWinEnter" }, {
116+
callback = function(event)
117+
local filepath = vim.fn.expand("<afile>:p")
118+
if filepath:match("/hypr/") then
119+
-- vim.notify(string.format("starting hyprls for %s", vim.inspect(event)))
120+
vim.lsp.start({
121+
name = "hyprlang",
122+
cmd = { "hyprls" },
123+
root_dir = vim.fn.getcwd(),
124+
})
125+
end
126+
end,
127+
})

‎lua/rj/fortune.lua renamed to ‎lua/ad/fortune.lua

File renamed without changes.

‎lua/akash/icons.lua renamed to ‎lua/ad/icons.lua

File renamed without changes.

‎lua/rj/keymaps.lua renamed to ‎lua/ad/keymaps.lua

+3-6
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,6 @@ local opts = { silent = true }
33
-- Shorten function name
44
local keymap = vim.keymap.set
55

6-
--Remap space as leader key
7-
keymap("", "<Space>", "<Nop>", opts)
8-
vim.g.mapleader = " "
9-
vim.g.maplocalleader = " "
10-
116
-- Modes
127
-- normal_mode = "n",
138
-- insert_mode = "i",
@@ -23,6 +18,8 @@ keymap("n", "<C-j>", "<C-w>j", opts)
2318
keymap("n", "<C-k>", "<C-w>k", opts)
2419
keymap("n", "<C-l>", "<C-w>l", opts)
2520

21+
keymap("n", "\\", "<cmd>noh<cr>", opts)
22+
2623
-- Resize with arrows
2724
keymap("n", "<C-Up>", "<cmd>resize -2<CR>", opts)
2825
keymap("n", "<C-Down>", "<cmd>resize +2<CR>", opts)
@@ -53,7 +50,7 @@ keymap("i", "<C-h>", "<Left>", opts)
5350
keymap("i", "<C-l>", "<Right>", opts)
5451

5552
keymap("v", "p", "P", opts)
56-
keymap("n", "dc", "cc<esc>", opts)
53+
keymap("n", "dc", "^dg_", opts)
5754

5855
-- Visual Block --
5956
-- Move text up and down

‎lua/rj/lazy.lua renamed to ‎lua/ad/lazy.lua

+5-2
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,18 @@ if not vim.loop.fs_stat(lazypath) then
1111
end
1212
vim.opt.rtp:prepend(lazypath)
1313

14+
--Remap space as leader key
15+
vim.keymap.set("", "<Space>", "<Nop>", { silent = true })
1416
vim.g.mapleader = " "
17+
vim.g.maplocalleader = " "
1518

16-
require("lazy").setup("rj.plugins", {
19+
require("lazy").setup("ad.plugins", {
1720
git = {
1821
log = { "--since=3 days ago" }, -- show commits from the last 3 days
1922
timeout = 600,
2023
},
2124
defaults = {
22-
lazy = false,
25+
lazy = true,
2326
},
2427
install = { colorscheme = { "catppuccin-mocha" } },
2528
performance = {

0 commit comments

Comments
 (0)