Skip to content

Commit 66d5262

Browse files
tjdevriestjdevries
committed
testing out lazy.nvim
1 parent 8f1e5fa commit 66d5262

36 files changed

+709
-835
lines changed

‎xdg_config/nvim/after/plugin/luasnip.lua

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
if vim.g.snippets ~= "luasnip" or not pcall(require, "luasnip") then
1+
if not pcall(require, "luasnip") then
22
return
33
end
44

‎xdg_config/nvim/after/plugin/notify.lua

-22
This file was deleted.

‎xdg_config/nvim/after/plugin/treesitter.lua

+2-23
Original file line numberDiff line numberDiff line change
@@ -2,29 +2,6 @@ if not pcall(require, "nvim-treesitter") then
22
return
33
end
44

5-
local ts_debugging = false
6-
if ts_debugging then
7-
RELOAD "nvim-treesitter"
8-
end
9-
10-
local list = require("nvim-treesitter.parsers").get_parser_configs()
11-
12-
-- list.sql = {
13-
-- install_info = {
14-
-- url = "https://github.com/DerekStride/tree-sitter-sql",
15-
-- files = { "src/parser.c" },
16-
-- branch = "main",
17-
-- },
18-
-- }
19-
20-
list.rsx = {
21-
install_info = {
22-
url = "https://github.com/tjdevries/tree-sitter-rsx",
23-
files = { "src/parser.c", "src/scanner.cc" },
24-
branch = "master",
25-
},
26-
}
27-
285
-- alt+<space>, alt+p -> swap next
296
-- alt+<backspace>, alt+p -> swap previous
307
-- swap_previous = {
@@ -53,6 +30,7 @@ end)()
5330
local _ = require("nvim-treesitter.configs").setup {
5431
ensure_installed = {
5532
"go",
33+
"help",
5634
"html",
5735
"javascript",
5836
"json",
@@ -64,6 +42,7 @@ local _ = require("nvim-treesitter.configs").setup {
6442
"toml",
6543
"tsx",
6644
"typescript",
45+
"vim",
6746
},
6847

6948
highlight = {

‎xdg_config/nvim/init.lua

+30-19
Original file line numberDiff line numberDiff line change
@@ -33,19 +33,10 @@ Much of the configuration of individual plugins you can find in either:
3333
3434
--]]
3535

36-
-- Attempt to run impatient, but it may not have been installed yet
37-
-- pcall(require, "impatient")
38-
39-
require "tj.profile"
40-
4136
-- Setup globals that I expect to be always available.
4237
-- See `./lua/tj/globals.lua` for more information.
4338
require "tj.globals"
4439

45-
if require "tj.first_load"() then
46-
return
47-
end
48-
4940
if vim.g.neovide then
5041
vim.g.neovide_cursor_trail_legnth = 0
5142
vim.g.neovide_cursor_animation_length = 0
@@ -60,16 +51,36 @@ end
6051
vim.g.mapleader = ","
6152
vim.g.maplocalleader = " "
6253

63-
-- I set some global variables to use as configuration throughout my config.
64-
-- These don't have any special meaning.
65-
vim.g.snippets = "luasnip"
66-
6754
-- Turn off builtin plugins I do not use.
6855
require "tj.disable_builtin"
6956

70-
-- Neovim builtin LSP configuration
71-
require "tj.lsp"
72-
73-
-- Telescope BTW
74-
require "tj.telescope.setup"
75-
require "tj.telescope.mappings"
57+
local lazypath = vim.fn.stdpath "data" .. "/lazy/lazy.nvim"
58+
if not vim.loop.fs_stat(lazypath) then
59+
vim.fn.system {
60+
"git",
61+
"clone",
62+
"--filter=blob:none",
63+
"--single-branch",
64+
"https://github.com/folke/lazy.nvim.git",
65+
lazypath,
66+
}
67+
end
68+
vim.opt.runtimepath:prepend(lazypath)
69+
70+
require("lazy").setup("custom.plugins", {
71+
ui = {
72+
icons = {
73+
cmd = "⌘",
74+
config = "🛠",
75+
event = "📅",
76+
ft = "📂",
77+
init = "⚙",
78+
keys = "🗝",
79+
plugin = "🔌",
80+
runtime = "💻",
81+
source = "📄",
82+
start = "🚀",
83+
task = "📌",
84+
},
85+
},
86+
})

‎xdg_config/nvim/lazy-lock.json

+79
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
{
2+
"Comment.nvim": { "branch": "master", "commit": "45dc21a71ad1450606f5e98261badb28db59d74c" },
3+
"LuaSnip": { "branch": "master", "commit": "5570fd797eae0790affb54ea669a150cad76db5d" },
4+
"aniseed": { "branch": "master", "commit": "9892a40d4cf970a2916a984544b7f984fc12f55c" },
5+
"cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
6+
"cmp-nvim-lsp": { "branch": "main", "commit": "59224771f91b86d1de12570b4070fe4ad7cd1eeb" },
7+
"cmp-nvim-lua": { "branch": "main", "commit": "d276254e7198ab7d00f117e88e223b4bd8c02d21" },
8+
"cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
9+
"cmp-zsh": { "branch": "main", "commit": "c24db8e58fac9006ec23d93f236749288d00dec9" },
10+
"cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" },
11+
"committia.vim": { "branch": "master", "commit": "0b4df1a7f48ffbc23b009bd14d58ee1be541917c" },
12+
"conf.vim": { "branch": "master", "commit": "a716df0fd5d7ba558c07dac2e07f05d5eba11afb" },
13+
"copilot-cmp": { "branch": "master", "commit": "84d5a0e8e4d1638e7554899cb7b642fa24cf463f" },
14+
"copilot.lua": { "branch": "master", "commit": "81eb5d1bc2eddad5ff0b4e3c1c4be5c09bdfaa63" },
15+
"denops.vim": { "branch": "main", "commit": "5736b667b40829ab21bedaf7d321de1cc71dbd7f" },
16+
"diffview.nvim": { "branch": "main", "commit": "3812e296d3977a24db62f7c18025755b40968d3a" },
17+
"edit_alternate.vim": { "branch": "master", "commit": "ef3019115d9bb7ffd691d2859eda213dd99e0b0a" },
18+
"fidget.nvim": { "branch": "main", "commit": "44585a0c0085765195e6961c15529ba6c5a2a13b" },
19+
"firenvim": { "branch": "master", "commit": "17a189f0f1e2d4197e00cd56dbeaed8c268bac8c" },
20+
"fzf": { "branch": "master", "commit": "44b63363729adfc6f477bedcfb4c7b6a379b948b" },
21+
"fzf.vim": { "branch": "master", "commit": "fd7fab77b20fdf09180cabdd660d8c3b7fe7ca1a" },
22+
"git-messenger.vim": { "branch": "master", "commit": "8a61bdfa351d4df9a9118ee1d3f45edbed617072" },
23+
"git-worktree.nvim": { "branch": "master", "commit": "d7f4e2584e81670154f07ca9fa5dd791d9c1b458" },
24+
"gitsigns.nvim": { "branch": "main", "commit": "2ab3bdf0a40bab53033048c6be75bda86316b55d" },
25+
"guise.vim": { "branch": "main", "commit": "1759cc936583490af76c36e0a25546329b2b9921" },
26+
"harpoon": { "branch": "master", "commit": "21d0d1bfa3000e4384740bfaefa0ebc51c773786" },
27+
"hotpot.nvim": { "branch": "master", "commit": "1002bcdea7af06c5a7bfce0536d96bc4b03ab42e" },
28+
"inlay-hints.nvim": { "branch": "main", "commit": "006b0898f5d3874e8e528352103733142e705834" },
29+
"lazy.nvim": { "branch": "main", "commit": "dc03fa1ae57c3949874c9cae50074a83232c4eed" },
30+
"lir-git-status.nvim": { "branch": "main", "commit": "6e15a3ade508522ecc027f059a814ca75a364db7" },
31+
"lir-mmv.nvim": { "branch": "master", "commit": "89b48b21be7c9e25a1e476b9f04184d1361566a6" },
32+
"lir.nvim": { "branch": "master", "commit": "84af01547e51e15fc97e878330414385eeb825e8" },
33+
"lspkind-nvim": { "branch": "master", "commit": "c68b3a003483cf382428a43035079f78474cd11e" },
34+
"markdown-preview.nvim": { "branch": "master", "commit": "02cc3874738bc0f86e4b91f09b8a0ac88aef8e96" },
35+
"mason-lspconfig.nvim": { "branch": "main", "commit": "31d8ed0dd3daf6cc64e35d710a190b64080bdc86" },
36+
"mason.nvim": { "branch": "main", "commit": "5f82a4e5618ebb0f3197141e9f14a07b56d5390f" },
37+
"neodev.nvim": { "branch": "main", "commit": "f6ee1a7651280ac476403c0b70bbfb419fa720ab" },
38+
"null-ls.nvim": { "branch": "main", "commit": "eaacba0b93c416252894f8bdc68e6b50b4e4c3b4" },
39+
"nvim-cmp": { "branch": "main", "commit": "e55033fce468c9c578b946948807f2ac48a6ee08" },
40+
"nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" },
41+
"nvim-dap": { "branch": "master", "commit": "6f2ea9e33b48a51849ec93c6c38148a5372018e4" },
42+
"nvim-dap-go": { "branch": "main", "commit": "8aa9e7ef317182b33fc3e04651041e8d367cc73a" },
43+
"nvim-dap-python": { "branch": "master", "commit": "d4400d075c21ed8fb8e8ac6a5ff56f58f6e93531" },
44+
"nvim-dap-ui": { "branch": "master", "commit": "54365d2eb4cb9cfab0371306c6a76c913c5a67e3" },
45+
"nvim-dap-virtual-text": { "branch": "master", "commit": "2971ce3e89b1711cc26e27f73d3f854b559a77d4" },
46+
"nvim-lsp-ts-utils": { "branch": "main", "commit": "0a6a16ef292c9b61eac6dad00d52666c7f84b0e7" },
47+
"nvim-lspconfig": { "branch": "master", "commit": "432935081337dbbbc80f4d0531868509624505df" },
48+
"nvim-luaref": { "branch": "main", "commit": "9cd3ed50d5752ffd56d88dd9e395ddd3dc2c7127" },
49+
"nvim-neoclip.lua": { "branch": "main", "commit": "3e0b9a134838c7356d743f84a272c92410c47d8d" },
50+
"nvim-notify": { "branch": "master", "commit": "b005821516f1f37801a73067afd1cef2dbc4dfe8" },
51+
"nvim-terminal.lua": { "branch": "master", "commit": "095f98aaa7265628a72cd2706350c091544b5602" },
52+
"nvim-tetris": { "branch": "master", "commit": "d17c99fb527ada98ffb0212ffc87ccda6fd4f7d9" },
53+
"nvim-treesitter": { "branch": "master", "commit": "fb36ed4c9e962d9fbfa608cd4a5d9313b1e8a8b1" },
54+
"nvim-treesitter-textobjects": { "branch": "master", "commit": "247e392a8beb28c5d43a1375f93f8f90f1cc11ad" },
55+
"nvim-ts-context-commentstring": { "branch": "main", "commit": "32d9627123321db65a4f158b72b757bcaef1a3f4" },
56+
"nvim-web-devicons": { "branch": "master", "commit": "05e1072f63f6c194ac6e867b567e6b437d3d4622" },
57+
"nvim-web-nonicons": { "branch": "main", "commit": "68ecb6476f1b96d03c702dce6cf3ef1e5171c9a8" },
58+
"one-small-step-for-vimkind": { "branch": "main", "commit": "4ca4df5533da67e136fce4a906e33634889d6d76" },
59+
"parinfer-rust": { "branch": "master", "commit": "55ce1e0c6e2465ce7f883972bb0feb1e4e8bdfa0" },
60+
"playground": { "branch": "master", "commit": "8a887bcf66017bd775a0fb19c9d8b7a4d6759c48" },
61+
"standard.vim": { "branch": "master", "commit": "b333ef9a9cf6cf66536deda017a542843613fa75" },
62+
"tabline.vim": { "branch": "master", "commit": "69c9698a3240860adaba93615f44778a9ab724b4" },
63+
"tabular": { "branch": "master", "commit": "339091ac4dd1f17e225fe7d57b48aff55f99b23a" },
64+
"telescope-dap.nvim": { "branch": "master", "commit": "313d2ea12ae59a1ca51b62bf01fc941a983d9c9c" },
65+
"telescope-file-browser.nvim": { "branch": "master", "commit": "eb4f026735f781ea5749331a5059021328d6eee8" },
66+
"telescope-fzf-native.nvim": { "branch": "main", "commit": "fab3e2212e206f4f8b3bbaa656e129443c9b802e" },
67+
"telescope-hop.nvim": { "branch": "master", "commit": "337a1e9f08f972ebf7a7d26251577812ebaadc78" },
68+
"telescope-ui-select.nvim": { "branch": "master", "commit": "62ea5e58c7bbe191297b983a9e7e89420f581369" },
69+
"telescope.nvim": { "branch": "master", "commit": "e960efa60e97df58e089b00270f09d60f27202c8" },
70+
"twilight.nvim": { "branch": "main", "commit": "1ffa6a4d89fb2fbb784c6674044bf54f1fca936f" },
71+
"vim-abolish": { "branch": "master", "commit": "3f0c8faadf0c5b68bcf40785c1c42e3731bfa522" },
72+
"vim-characterize": { "branch": "master", "commit": "1ba0fcf208464647e2df2e9f693247a2207f22a4" },
73+
"vim-qf": { "branch": "master", "commit": "65f115c350934517382ae45198a74232a9069c2a" },
74+
"vim-repeat": { "branch": "master", "commit": "24afe922e6a05891756ecf331f39a1f6743d3d5a" },
75+
"vim-scriptease": { "branch": "master", "commit": "18511d389675d773994215ddb572ccdc2b72f52b" },
76+
"vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" },
77+
"zen-mode.nvim": { "branch": "main", "commit": "6f5702db4fd4a4c9a212f8de3b7b982f3d93b03c" },
78+
"zig.vim": { "branch": "master", "commit": "c33e1e312fc0f9523d09d7ddb845ea5d52db41d0" }
79+
}

‎xdg_config/nvim/lua/custom/plugins/colorizer.lua

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
return {
2+
"norcalli/nvim-colorizer.lua",
3+
{
4+
"norcalli/nvim-terminal.lua",
5+
config = function()
6+
require("terminal").setup()
7+
end,
8+
},
9+
}

‎xdg_config/nvim/lua/custom/plugins/comment.lua

+60
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
return {
2+
{
3+
"numToStr/Comment.nvim",
4+
config = function()
5+
require("Comment").setup {
6+
7+
-- LHS of operator-pending mapping in NORMAL + VISUAL mode
8+
opleader = {
9+
-- line-comment keymap
10+
line = "gc",
11+
-- block-comment keymap
12+
block = "gb",
13+
},
14+
15+
-- Create basic (operator-pending) and extended mappings for NORMAL + VISUAL mode
16+
mappings = {
17+
18+
-- operator-pending mapping
19+
-- Includes:
20+
-- `gcc` -> line-comment the current line
21+
-- `gcb` -> block-comment the current line
22+
-- `gc[count]{motion}` -> line-comment the region contained in {motion}
23+
-- `gb[count]{motion}` -> block-comment the region contained in {motion}
24+
basic = true,
25+
26+
-- extra mapping
27+
-- Includes `gco`, `gcO`, `gcA`
28+
extra = true,
29+
},
30+
31+
-- LHS of toggle mapping in NORMAL + VISUAL mode
32+
toggler = {
33+
-- line-comment keymap
34+
-- Makes sense to be related to your opleader.line
35+
line = "gcc",
36+
37+
-- block-comment keymap
38+
-- Make sense to be related to your opleader.block
39+
block = "gbc",
40+
},
41+
42+
-- Pre-hook, called before commenting the line
43+
-- Can be used to determine the commentstring value
44+
-- pre_hook = nil,
45+
46+
-- Post-hook, called after commenting is done
47+
-- Can be used to alter any formatting / newlines / etc. after commenting
48+
-- post_hook = nil,
49+
50+
-- Can be used to ignore certain lines when doing linewise motions.
51+
-- Can be string (lua regex)
52+
-- Or function (that returns lua regex)
53+
-- ignore = nil,
54+
}
55+
56+
local comment_ft = require "Comment.ft"
57+
comment_ft.set("lua", { "--%s", "--[[%s]]" })
58+
end,
59+
},
60+
}

‎xdg_config/nvim/lua/custom/plugins/completion.lua

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
-- use "lukas-reineke/cmp-under-comparator"
2+
3+
return {
4+
{ "hrsh7th/nvim-cmp" },
5+
{ "hrsh7th/cmp-buffer" },
6+
{ "hrsh7th/cmp-path" },
7+
{ "hrsh7th/cmp-nvim-lua" },
8+
{ "hrsh7th/cmp-nvim-lsp" },
9+
{ "onsails/lspkind-nvim" },
10+
{ "saadparwaiz1/cmp_luasnip", dependencies = { "L3MON4D3/LuaSnip" } },
11+
{ "tamago324/cmp-zsh" },
12+
13+
{
14+
"zbirenbaum/copilot.lua",
15+
config = function()
16+
require("copilot").setup()
17+
end,
18+
},
19+
{
20+
"zbirenbaum/copilot-cmp",
21+
config = function()
22+
require("copilot_cmp").setup()
23+
end,
24+
},
25+
}

‎xdg_config/nvim/lua/custom/plugins/dap.lua

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
return {
2+
"mfussenegger/nvim-dap",
3+
"rcarriga/nvim-dap-ui",
4+
"theHamsta/nvim-dap-virtual-text",
5+
"nvim-telescope/telescope-dap.nvim",
6+
7+
-- Adaparter configuration for specific languages
8+
{ "leoluz/nvim-dap-go" },
9+
{ "mfussenegger/nvim-dap-python" },
10+
"jbyuki/one-small-step-for-vimkind",
11+
}

‎xdg_config/nvim/lua/custom/plugins/deno.lua

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
return {
2+
{
3+
"vim-denops/denops.vim",
4+
cond = function()
5+
return vim.fn.executable "deno" == 1
6+
end,
7+
},
8+
{
9+
"lambdalisue/guise.vim",
10+
cond = function()
11+
return vim.fn.executable "deno" == 1
12+
end,
13+
},
14+
}

‎xdg_config/nvim/lua/custom/plugins/edit_alternate.lua

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
return {
2+
{ "tjdevries/standard.vim", lazy = false, priority = 100 },
3+
{ "tjdevries/conf.vim", lazy = false, priority = 90 },
4+
5+
{
6+
"tjdevries/edit_alternate.vim",
7+
config = function()
8+
-- Add special alternates for golang
9+
-- Finds the alternate test
10+
vim.fn["edit_alternate#rule#add"]("go", function(filename)
11+
if filename:find "_test.go" then
12+
return (filename:gsub("_test%.go", ".go"))
13+
else
14+
return (filename:gsub("%.go", "_test.go"))
15+
end
16+
end)
17+
18+
vim.api.nvim_set_keymap("n", "<leader>ea", "<cmd>EditAlternate<CR>", { silent = true })
19+
end,
20+
priority = 80,
21+
},
22+
}

‎xdg_config/nvim/lua/custom/plugins/fennel.lua

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
return {
2+
"rktjmp/hotpot.nvim",
3+
"Olical/aniseed",
4+
{ "eraserhd/parinfer-rust", build = "cargo build --release" },
5+
}

‎xdg_config/nvim/lua/custom/plugins/filetypes.lua

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
-- -- LANGUAGE:
2+
-- -- TODO: Should check on these if they are the best ones
3+
-- use { "neovimhaskell/haskell-vim", ft = "haskell" }
4+
-- use { "elzr/vim-json", ft = "json" }
5+
-- use { "goodell/vim-mscgen", ft = "mscgen" }
6+
-- use "PProvost/vim-ps1"
7+
-- use "Glench/Vim-Jinja2-Syntax"
8+
-- use "justinmk/vim-syntax-extra"
9+
10+
return {
11+
{ "ziglang/zig.vim", ft = "zig" },
12+
}

‎xdg_config/nvim/lua/custom/plugins/fonts.lua

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
return {
2+
"kyazdani42/nvim-web-devicons",
3+
4+
-- TODO: Conditionally only do this for linux
5+
"yamatsum/nvim-web-nonicons",
6+
}

0 commit comments

Comments
 (0)