Skip to content

Commit ba9bf14

Browse files
committed
Added updated nvim
1 parent 81ef6f0 commit ba9bf14

Some content is hidden

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

92 files changed

+5379
-0
lines changed

.stylua.toml

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
column_width = 120
2+
line_endings = "Unix"
3+
indent_type = "Spaces"
4+
indent_width = 2
5+
quote_style = "AutoPreferDouble"
6+
call_parentheses = "Always"
7+
collapse_simple_statement = "Never"
8+
9+
[sort_requires]
10+
enabled = false

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/lua.lua

+88
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
1+
vim.opt.shiftwidth = 2
2+
vim.opt.tabstop = 2
3+
local fmt = string.format
4+
5+
-- Iterator that splits a string o a given delimiter
6+
local function split(str, delim)
7+
delim = delim or "%s"
8+
return string.gmatch(str, fmt("[^%s]+", delim))
9+
end
10+
11+
-- Find the proper directory separator depending
12+
-- on lua installation or OS.
13+
local function dir_separator()
14+
-- Look at package.config for directory separator string (it's the first line)
15+
if package.config then
16+
return string.match(package.config, "^[^\n]")
17+
elseif vim.fn.has("win32") == 1 then
18+
return "\\"
19+
else
20+
return "/"
21+
end
22+
end
23+
24+
-- Search for lua traditional include paths.
25+
-- This mimics how require internally works.
26+
local function include_paths(fname, ext)
27+
ext = ext or "lua"
28+
local sep = dir_separator()
29+
local paths = string.gsub(package.path, "%?", fname)
30+
for path in split(paths, "%;") do
31+
if vim.fn.filereadable(path) == 1 then
32+
return path
33+
end
34+
end
35+
end
36+
37+
-- Search for nvim lua include paths
38+
local function include_rtpaths(fname, ext)
39+
ext = ext or "lua"
40+
local sep = dir_separator()
41+
local rtpaths = vim.api.nvim_list_runtime_paths()
42+
local modfile, initfile = fmt("%s.%s", fname, ext), fmt("init.%s", ext)
43+
for _, path in ipairs(rtpaths) do
44+
-- Look on runtime path for 'lua/*.lua' files
45+
local path1 = table.concat({ path, ext, modfile }, sep)
46+
if vim.fn.filereadable(path1) == 1 then
47+
return path1
48+
end
49+
-- Look on runtime path for 'lua/*/init.lua' files
50+
local path2 = table.concat({ path, ext, fname, initfile }, sep)
51+
if vim.fn.filereadable(path2) == 1 then
52+
return path2
53+
end
54+
end
55+
end
56+
57+
-- Global function that searches the path for the required file
58+
function find_required_path(module)
59+
-- Look at package.config for directory separator string (it's the first line)
60+
local sep = string.match(package.config, "^[^\n]")
61+
-- Properly change '.' to separator (probably '/' on *nix and '\' on Windows)
62+
local fname = vim.fn.substitute(module, "\\.", sep, "g")
63+
local f
64+
---- First search for lua modules
65+
f = include_paths(fname, "lua")
66+
if f then
67+
return f
68+
end
69+
-- This part is just for nvim modules
70+
f = include_rtpaths(fname, "lua")
71+
if f then
72+
return f
73+
end
74+
---- Now search for Fennel modules
75+
f = include_paths(fname, "fnl")
76+
if f then
77+
return f
78+
end
79+
-- This part is just for nvim modules
80+
f = include_rtpaths(fname, "fnl")
81+
if f then
82+
return f
83+
end
84+
end
85+
86+
-- Set options to open require with gf
87+
vim.opt_local.include = [=[\v<((do|load)file|require)\s*\(?['"]\zs[^'"]+\ze['"]]=]
88+
vim.opt_local.includeexpr = "v:lua.find_required_path(v:fname)"

ftplugin/man.lua

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
vim.keymap.set("n", "q", ":q", { silent = true, buffer = 0 })

ftplugin/markdown.lua

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
vim.opt.textwidth = 120

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

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
vim.loader.enable()
2+
3+
require("ad.options")
4+
require("ad.lazy")
5+
require("ad.autocommands")
6+
require("ad.keymaps")
7+
8+
9+
-- Bufferline
10+
require("bufferline").setup{}

lazy-lock.json

+95
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
1+
{
2+
"2048.nvim": { "branch": "main", "commit": "aee7c41a9a9473117465132768ae4b4da97435c3" },
3+
"Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" },
4+
"FixCursorHold.nvim": { "branch": "master", "commit": "1900f89dc17c603eec29960f57c00bd9ae696495" },
5+
"LuaSnip": { "branch": "master", "commit": "45db5addf8d0a201e1cf247cae4cdce605ad3768" },
6+
"alpha-nvim": { "branch": "main", "commit": "b6f4129302db197a7249e67a90de3f2b676de13e" },
7+
"auto-save.nvim": { "branch": "main", "commit": "5fe9ab0c42f0457f2a973e814a6352b8eeb04730" },
8+
"barbecue.nvim": { "branch": "main", "commit": "3e31404f0b93a2c30d151abf0648650ac811c664" },
9+
"better-escape.nvim": { "branch": "master", "commit": "bb197e51a91a635deb88630813c3bfc284413697" },
10+
"bufferline.nvim": { "branch": "main", "commit": "0b2fd861eee7595015b6561dade52fb060be10c4" },
11+
"catppuccin": { "branch": "main", "commit": "4fd72a9ab64b393c2c22b168508fd244877fec96" },
12+
"clangd_extensions.nvim": { "branch": "main", "commit": "385a44f133f4145e3a3da1a2a557225dccc3e1f8" },
13+
"cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
14+
"cmp-calc": { "branch": "main", "commit": "5947b412da67306c5b68698a02a846760059be2e" },
15+
"cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" },
16+
"cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
17+
"cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" },
18+
"cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
19+
"cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
20+
"conform.nvim": { "branch": "master", "commit": "0ebe875d9c306f5fc829db38492ffff2a70d8e9d" },
21+
"cppman.nvim": { "branch": "main", "commit": "89a2a7c3ad0ae434ff5c920fd406fcc884559883" },
22+
"cybu.nvim": { "branch": "main", "commit": "c0866ef6735a85f85d4cf77ed6d9bc92046b5a99" },
23+
"dressing.nvim": { "branch": "master", "commit": "c5775a888adbc50652cb370073fcfec963eca93e" },
24+
"flatten.nvim": { "branch": "main", "commit": "e420e531d2ab24aebcf7b3c9fca28e6c5c34964d" },
25+
"friendly-snippets": { "branch": "main", "commit": "00ebcaa159e817150bd83bfe2d51fa3b3377d5c4" },
26+
"fsread.nvim": { "branch": "main", "commit": "a637bf048f733def7c5c46f5bf482f93a8311b29" },
27+
"garbage-day.nvim": { "branch": "main", "commit": "4a1160bfffb2f499fb55a54333f29d160ab3c8a1" },
28+
"gist.nvim": { "branch": "main", "commit": "92b13e486dd9fd083750450e0d262fcc68a62b91" },
29+
"gitignore.nvim": { "branch": "master", "commit": "2455191ec94da8ed222806a4fe3aa358eac1e558" },
30+
"gitsigns.nvim": { "branch": "main", "commit": "1ef74b546732f185d0f806860fa5404df7614f28" },
31+
"harpoon": { "branch": "master", "commit": "1bc17e3e42ea3c46b33c0bbad6a880792692a1b3" },
32+
"hop.nvim": { "branch": "v2", "commit": "90db1b2c61b820e230599a04fedcd2679e64bd07" },
33+
"img-clip.nvim": { "branch": "main", "commit": "28a32d811d69042f4fa5c3d5fa35571df2bc1623" },
34+
"indent-blankline.nvim": { "branch": "master", "commit": "9637670896b68805430e2f72cf5d16be5b97a22a" },
35+
"indent-o-matic": { "branch": "master", "commit": "4d11e98f523d3c4500b1dc33f0d1a248a4f69719" },
36+
"jaq-nvim": { "branch": "master", "commit": "236296aae555657487d1bb4d066cbde9d79d8cd4" },
37+
"jupytext.nvim": { "branch": "main", "commit": "c8baf3ad344c59b3abd461ecc17fc16ec44d0f7b" },
38+
"lazy.nvim": { "branch": "main", "commit": "48b52b5cfcf8f88ed0aff8fde573a5cc20b1306d" },
39+
"leetcode.nvim": { "branch": "master", "commit": "02fb2c855658ad6b60e43671f6b040c812181a1d" },
40+
"live-server.nvim": { "branch": "main", "commit": "5fc8abb727827a09d0ce1b7757d0a4c7b5802b09" },
41+
"lua-async-await": { "branch": "main", "commit": "652d94df34e97abe2d4a689edbc4270e7ead1a98" },
42+
"lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" },
43+
"luatab.nvim": { "branch": "master", "commit": "7bc6e0f6957fbaa93c98529f2cf28052329002e0" },
44+
"markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" },
45+
"markview.nvim": { "branch": "dev", "commit": "57d35eef8ef75c083560ad7eadbf405f740c93d0" },
46+
"mason-lspconfig.nvim": { "branch": "main", "commit": "25c11854aa25558ee6c03432edfa0df0217324be" },
47+
"mason-tool-installer.nvim": { "branch": "main", "commit": "c5e07b8ff54187716334d585db34282e46fa2932" },
48+
"mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
49+
"neo-tree.nvim": { "branch": "v2.x", "commit": "80dc74d081823649809f78370fa5b204aa9a853a" },
50+
"noice.nvim": { "branch": "main", "commit": "448bb9c524a7601035449210838e374a30153172" },
51+
"nui.nvim": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" },
52+
"nvim-autopairs": { "branch": "master", "commit": "fd2badc24e675f947162a16c124d395bde80dbd6" },
53+
"nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" },
54+
"nvim-colorizer.lua": { "branch": "master", "commit": "194ec600488f7c7229668d0e80bd197f3a2b84ff" },
55+
"nvim-dap": { "branch": "master", "commit": "20a4859ebde1c9bc8e96f8cc11a20667e7fdd516" },
56+
"nvim-dap-ui": { "branch": "master", "commit": "1c351e4e417d4691da12948b6ecf966936a56d28" },
57+
"nvim-early-retirement": { "branch": "main", "commit": "2c36a5671b9d8f0d9e11b77c5a55de802bc45e34" },
58+
"nvim-fundo": { "branch": "main", "commit": "ac9c9372c4bf677721e24f144ef29d3a05c2b589" },
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" },
64+
"nvim-lastplace": { "branch": "main", "commit": "0bb6103c506315044872e0f84b1f736c4172bb20" },
65+
"nvim-lint": { "branch": "master", "commit": "a7ce9c78a7c710c28bee56dfab10a5c0c80b7fb5" },
66+
"nvim-lspconfig": { "branch": "master", "commit": "bdbc65aadc708ce528efb22bca5f82a7cca6b54d" },
67+
"nvim-navic": { "branch": "master", "commit": "8649f694d3e76ee10c19255dece6411c29206a54" },
68+
"nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" },
69+
"nvim-treesitter": { "branch": "master", "commit": "4770d9a1a77b0cc2b723c646c3dbe43a9133e5db" },
70+
"nvim-ts-autotag": { "branch": "main", "commit": "e239a560f338be31337e7abc3ee42515daf23f5e" },
71+
"nvim-ts-context-commentstring": { "branch": "main", "commit": "375c2d86cee6674afd75b4f727ce3a80065552f7" },
72+
"nvim-web-devicons": { "branch": "master", "commit": "9793801f974bba70e4ac5d7eae6c4f5659993d8e" },
73+
"octo.nvim": { "branch": "master", "commit": "fd50872494abd1cb580c604f1f52aae2257f7220" },
74+
"oil.nvim": { "branch": "master", "commit": "1fe476daf0b3c108cb8ee1fc1226cc282fa2c9c1" },
75+
"playground": { "branch": "master", "commit": "ba48c6a62a280eefb7c85725b0915e021a1a0749" },
76+
"plenary.nvim": { "branch": "master", "commit": "ec289423a1693aeae6cd0d503bac2856af74edaa" },
77+
"presence.nvim": { "branch": "main", "commit": "87c857a56b7703f976d3a5ef15967d80508df6e6" },
78+
"project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" },
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" },
84+
"tailwindcss-colorizer-cmp.nvim": { "branch": "main", "commit": "3d3cd95e4a4135c250faf83dd5ed61b8e5502b86" },
85+
"telescope-file-browser.nvim": { "branch": "master", "commit": "c5a14e0550699a7db575805cdb9ddc969ba0f1f5" },
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" },
90+
"url-open": { "branch": "main", "commit": "9f8f4a56ac709f26aa17d8ef921b272bf2262a30" },
91+
"vim-be-good": { "branch": "master", "commit": "4fa57b7957715c91326fcead58c1fa898b9b3625" },
92+
"vim-illuminate": { "branch": "master", "commit": "5eeb7951fc630682c322e88a9bbdae5c224ff0aa" },
93+
"which-key.nvim": { "branch": "main", "commit": "bfec3d6bc0a9b0b2cb11644642f78c2c3915eef0" },
94+
"zen-mode.nvim": { "branch": "main", "commit": "29b292bdc58b76a6c8f294c961a8bf92c5a6ebd6" }
95+
}

lua/ad/autocommands.lua

+127
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,127 @@
1+
local autocmd = vim.api.nvim_create_autocmd
2+
3+
autocmd({ "FileType" }, {
4+
pattern = { "c", "go", "java", "cpp", "py", "sh" },
5+
callback = function()
6+
vim.opt_local.shiftwidth = 4
7+
vim.opt_local.tabstop = 4
8+
end,
9+
})
10+
11+
autocmd({ "FileType" }, {
12+
pattern = { "qf", "help", "lspinfo", "spectre_panel", "oil", "Jaq" },
13+
callback = function()
14+
vim.keymap.set("n", "q", "<cmd>close<CR>", { silent = true, buffer = true })
15+
vim.api.nvim_set_option_value("buflisted", false, { buf = 0 })
16+
end,
17+
})
18+
19+
autocmd({ "FileType" }, {
20+
pattern = { "gitcommit", "markdown" },
21+
callback = function()
22+
vim.opt_local.wrap = true
23+
vim.opt_local.spell = true
24+
end,
25+
})
26+
27+
autocmd({ "FileType" }, {
28+
pattern = { "TelescopePrompt", "neo-tree-popup", "oil" },
29+
callback = function()
30+
require("cmp").setup.buffer({
31+
completion = { autocomplete = false },
32+
})
33+
end,
34+
})
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 ]]
46+
47+
autocmd({ "FileType" }, {
48+
pattern = { "cpp" },
49+
callback = function()
50+
require("cmp").setup.buffer({
51+
experimental = {
52+
ghost_text = true,
53+
},
54+
})
55+
end,
56+
})
57+
58+
autocmd({ "VimResized" }, {
59+
callback = function()
60+
vim.cmd("tabdo wincmd =")
61+
end,
62+
})
63+
64+
autocmd({ "TextYankPost" }, {
65+
callback = function()
66+
vim.highlight.on_yank({ higroup = "Visual", timeout = 200 })
67+
end,
68+
})
69+
70+
autocmd({ "VimEnter" }, {
71+
callback = function()
72+
vim.cmd("hi link illuminatedWord LspReferenceText")
73+
end,
74+
})
75+
76+
autocmd({ "BufWinEnter" }, {
77+
callback = function()
78+
local line_count = vim.api.nvim_buf_line_count(0)
79+
if line_count >= 10000 then
80+
vim.cmd("IlluminatePauseBuf")
81+
end
82+
end,
83+
})
84+
85+
autocmd({ "FileType" }, {
86+
pattern = { "neo-tree", "alpha", "dashboard", "man" },
87+
callback = function()
88+
vim.opt_local.number = false
89+
vim.opt_local.relativenumber = false
90+
end,
91+
})
92+
93+
autocmd({ "BufReadPost" }, {
94+
pattern = "*.pdf",
95+
callback = function(ev)
96+
local filename = ev.file
97+
vim.fn.jobstart({ "xdg-open", filename }, { detach = true })
98+
vim.api.nvim_buf_delete(0, {})
99+
end,
100+
})
101+
102+
vim.filetype.add({
103+
extension = {
104+
rasi = "rasi",
105+
conf = "conf",
106+
},
107+
})
108+
109+
-- make a command to clear registers
110+
vim.cmd([[
111+
command! WipeReg for i in range(34,122) | silent! call setreg(nr2char(i), []) | endfor
112+
]])
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+
})

0 commit comments

Comments
 (0)