Thu, 16 Mar 2023 12:30:54 -0500
Cleaner conflict resolution
1014 | 1 | local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" |
2 | if not vim.loop.fs_stat(lazypath) then | |
1064 | 3 | vim.fn.system({ |
4 | "git", | |
5 | "clone", | |
6 | "--filter=blob:none", | |
7 | "https://github.com/folke/lazy.nvim.git", | |
8 | "--branch=stable", | |
9 | lazypath, | |
10 | }) | |
1014 | 11 | end |
12 | vim.opt.rtp:prepend(vim.env.LAZY or lazypath) | |
13 | ||
1019 | 14 | require("lazy").setup({ |
15 | spec = { | |
1073
911aa9d81e71
Switch to kanagawa until themer's jellybeans is fixed
Meredith Howard <mhoward@roomag.org>
parents:
1064
diff
changeset
|
16 | -- { |
911aa9d81e71
Switch to kanagawa until themer's jellybeans is fixed
Meredith Howard <mhoward@roomag.org>
parents:
1064
diff
changeset
|
17 | -- "themercorp/themer.lua", |
911aa9d81e71
Switch to kanagawa until themer's jellybeans is fixed
Meredith Howard <mhoward@roomag.org>
parents:
1064
diff
changeset
|
18 | -- priority = 1000, |
911aa9d81e71
Switch to kanagawa until themer's jellybeans is fixed
Meredith Howard <mhoward@roomag.org>
parents:
1064
diff
changeset
|
19 | -- opts = { |
911aa9d81e71
Switch to kanagawa until themer's jellybeans is fixed
Meredith Howard <mhoward@roomag.org>
parents:
1064
diff
changeset
|
20 | -- -- colorscheme = "jellybeans", |
911aa9d81e71
Switch to kanagawa until themer's jellybeans is fixed
Meredith Howard <mhoward@roomag.org>
parents:
1064
diff
changeset
|
21 | -- }, |
911aa9d81e71
Switch to kanagawa until themer's jellybeans is fixed
Meredith Howard <mhoward@roomag.org>
parents:
1064
diff
changeset
|
22 | -- }, |
1049
3f01468ffc32
Switch to themer jellybeans
Meredith Howard <mhoward@roomag.org>
parents:
1019
diff
changeset
|
23 | { |
1073
911aa9d81e71
Switch to kanagawa until themer's jellybeans is fixed
Meredith Howard <mhoward@roomag.org>
parents:
1064
diff
changeset
|
24 | "rebelot/kanagawa.nvim", |
1019 | 25 | priority = 1000, |
1049
3f01468ffc32
Switch to themer jellybeans
Meredith Howard <mhoward@roomag.org>
parents:
1019
diff
changeset
|
26 | opts = { |
1073
911aa9d81e71
Switch to kanagawa until themer's jellybeans is fixed
Meredith Howard <mhoward@roomag.org>
parents:
1064
diff
changeset
|
27 | keywordStyle = { italic = false }, |
911aa9d81e71
Switch to kanagawa until themer's jellybeans is fixed
Meredith Howard <mhoward@roomag.org>
parents:
1064
diff
changeset
|
28 | statementStyle = { bold = false }, |
911aa9d81e71
Switch to kanagawa until themer's jellybeans is fixed
Meredith Howard <mhoward@roomag.org>
parents:
1064
diff
changeset
|
29 | colors = { |
911aa9d81e71
Switch to kanagawa until themer's jellybeans is fixed
Meredith Howard <mhoward@roomag.org>
parents:
1064
diff
changeset
|
30 | theme = { |
911aa9d81e71
Switch to kanagawa until themer's jellybeans is fixed
Meredith Howard <mhoward@roomag.org>
parents:
1064
diff
changeset
|
31 | all = { |
911aa9d81e71
Switch to kanagawa until themer's jellybeans is fixed
Meredith Howard <mhoward@roomag.org>
parents:
1064
diff
changeset
|
32 | ui = { |
911aa9d81e71
Switch to kanagawa until themer's jellybeans is fixed
Meredith Howard <mhoward@roomag.org>
parents:
1064
diff
changeset
|
33 | bg = "none", |
911aa9d81e71
Switch to kanagawa until themer's jellybeans is fixed
Meredith Howard <mhoward@roomag.org>
parents:
1064
diff
changeset
|
34 | bg_gutter = "none", |
911aa9d81e71
Switch to kanagawa until themer's jellybeans is fixed
Meredith Howard <mhoward@roomag.org>
parents:
1064
diff
changeset
|
35 | }, |
911aa9d81e71
Switch to kanagawa until themer's jellybeans is fixed
Meredith Howard <mhoward@roomag.org>
parents:
1064
diff
changeset
|
36 | }, |
911aa9d81e71
Switch to kanagawa until themer's jellybeans is fixed
Meredith Howard <mhoward@roomag.org>
parents:
1064
diff
changeset
|
37 | }, |
911aa9d81e71
Switch to kanagawa until themer's jellybeans is fixed
Meredith Howard <mhoward@roomag.org>
parents:
1064
diff
changeset
|
38 | }, |
1049
3f01468ffc32
Switch to themer jellybeans
Meredith Howard <mhoward@roomag.org>
parents:
1019
diff
changeset
|
39 | }, |
1073
911aa9d81e71
Switch to kanagawa until themer's jellybeans is fixed
Meredith Howard <mhoward@roomag.org>
parents:
1064
diff
changeset
|
40 | config = function(_, opts) |
911aa9d81e71
Switch to kanagawa until themer's jellybeans is fixed
Meredith Howard <mhoward@roomag.org>
parents:
1064
diff
changeset
|
41 | require("kanagawa").setup(opts) |
911aa9d81e71
Switch to kanagawa until themer's jellybeans is fixed
Meredith Howard <mhoward@roomag.org>
parents:
1064
diff
changeset
|
42 | vim.cmd("colorscheme kanagawa") |
911aa9d81e71
Switch to kanagawa until themer's jellybeans is fixed
Meredith Howard <mhoward@roomag.org>
parents:
1064
diff
changeset
|
43 | end, |
1049
3f01468ffc32
Switch to themer jellybeans
Meredith Howard <mhoward@roomag.org>
parents:
1019
diff
changeset
|
44 | }, |
1064 | 45 | { import = "plugins" }, |
1019 | 46 | }, |
47 | change_detection = { enabled = false }, | |
48 | performance = { | |
49 | rtp = { | |
50 | disabled_plugins = { | |
51 | "gzip", | |
52 | "tarPlugin", | |
53 | "tohtml", | |
54 | "zipPlugin", | |
55 | "tutor", | |
56 | }, | |
57 | }, | |
58 | }, | |
59 | }) |