Skip to content

Commit c136cac

Browse files
committed
Personalised and added some of my own config stuff.
This will probably be the last version of this config for a while. Mostly keeping it for reference. Custom config time!
1 parent e02f9a2 commit c136cac

File tree

7 files changed

+122
-62
lines changed

7 files changed

+122
-62
lines changed

lazy-lock.json

Lines changed: 37 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,57 @@
11
{
2-
"LazyVim": { "branch": "main", "commit": "ec5981dfb1222c3bf246d9bcaa713d5cfa486fbd" },
3-
"blink.cmp": { "branch": "main", "commit": "cb5e346d9e0efa7a3eee7fd4da0b690c48d2a98e" },
2+
"LazyVim": { "branch": "main", "commit": "3f034d0a7f58031123300309f2efd3bb0356ee21" },
3+
"LuaSnip": { "branch": "master", "commit": "c9b9a22904c97d0eb69ccb9bab76037838326817" },
4+
"alpha-nvim": { "branch": "main", "commit": "de72250e054e5e691b9736ee30db72c65d560771" },
5+
"blink.cmp": { "branch": "main", "commit": "4f38ce99a472932d5776337f08f7a8180f1f571a" },
46
"bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" },
5-
"catppuccin": { "branch": "main", "commit": "5b5e3aef9ad7af84f463d17b5479f06b87d5c429" },
6-
"conform.nvim": { "branch": "master", "commit": "eebc724d12c5579d733d1f801386e0ceb909d001" },
7+
"catppuccin": { "branch": "main", "commit": "b7bbdf93b42866f166af98d39a2563eedb7cabac" },
8+
"conform.nvim": { "branch": "master", "commit": "372fc521f8421b7830ea6db4d6ea3bae1c77548c" },
9+
"crates.nvim": { "branch": "main", "commit": "2c8f4fab02e3e9ea42c6ad9b547e4207a914a397" },
10+
"cyberdream.nvim": { "branch": "main", "commit": "4aa7c64b0b18a542d6587632efa93c3bea469979" },
711
"flash.nvim": { "branch": "main", "commit": "3c942666f115e2811e959eabbdd361a025db8b63" },
8-
"friendly-snippets": { "branch": "main", "commit": "31f2a2657b6261724313281fe0d8ba6f43f4a4fa" },
9-
"gitsigns.nvim": { "branch": "main", "commit": "fcfa7a989cd6fed10abf02d9880dc76d7a38167d" },
10-
"grug-far.nvim": { "branch": "main", "commit": "3bc6997724c6b9c10bc4bac86821c9061694ded3" },
12+
"friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" },
13+
"gitsigns.nvim": { "branch": "main", "commit": "1796c7cedfe7e5dd20096c5d7b8b753d8f8d22eb" },
14+
"grug-far.nvim": { "branch": "main", "commit": "6ff8a205a29db3a9b08e5debe09452b4d6fd6591" },
15+
"haskell-snippets.nvim": { "branch": "master", "commit": "27ac316463b9807496cd03e65289d3e79aa23528" },
16+
"haskell-tools.nvim": { "branch": "master", "commit": "65d6993eba1a56bbd5211ef13a100d26ce3e644a" },
17+
"kanagawa.nvim": { "branch": "master", "commit": "cc3b68b08e6a0cb6e6bf9944932940091e49bb83" },
1118
"lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
1219
"lazydev.nvim": { "branch": "main", "commit": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c" },
13-
"lualine.nvim": { "branch": "master", "commit": "86fe39534b7da729a1ac56c0466e76f2c663dc42" },
20+
"lualine.nvim": { "branch": "master", "commit": "15884cee63a8c205334ab13ab1c891cd4d27101a" },
21+
"markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" },
1422
"mason-lspconfig.nvim": { "branch": "main", "commit": "1a31f824b9cd5bc6f342fc29e9a53b60d74af245" },
1523
"mason.nvim": { "branch": "main", "commit": "fc98833b6da5de5a9c5b1446ac541577059555be" },
1624
"mini.ai": { "branch": "main", "commit": "e139eb1101beb0250fea322f8c07a42f0f175688" },
25+
"mini.hipatterns": { "branch": "main", "commit": "e5083df391171dc9d8172645606f8496d9443374" },
1726
"mini.icons": { "branch": "main", "commit": "397ed3807e96b59709ef3292f0a3e253d5c1dc0a" },
1827
"mini.pairs": { "branch": "main", "commit": "69864a2efb36c030877421634487fd90db1e4298" },
28+
"neo-tree.nvim": { "branch": "main", "commit": "71bfdeddc90225e281ce34c378dc1b5914f5018d" },
29+
"neotest": { "branch": "master", "commit": "6267dcd577aa519c828d2526b05844770d3a2c6a" },
30+
"neotest-haskell": { "branch": "master", "commit": "83a8917ab31ab6ff2886d7b42645099c4a4e7396" },
31+
"neotest-python": { "branch": "master", "commit": "a2861ab3c9a0bf75a56b11835c2bfc8270f5be7e" },
32+
"neotest-zig": { "branch": "main", "commit": "de63f3b9a182d374d2e71cf44385326682ec90e7" },
33+
"nightfly": { "branch": "master", "commit": "033e0240479126267deae2f9a4a1b0864f14bba6" },
1934
"noice.nvim": { "branch": "main", "commit": "0427460c2d7f673ad60eb02b35f5e9926cf67c59" },
20-
"nui.nvim": { "branch": "main", "commit": "8d3bce9764e627b62b07424e0df77f680d47ffdb" },
21-
"nvim-lint": { "branch": "master", "commit": "5b1bdf306bd3e565908145279e8bbfc594dac3b3" },
22-
"nvim-lspconfig": { "branch": "master", "commit": "81920264a264144bd075f7f48f0c4356fc2c6236" },
23-
"nvim-treesitter": { "branch": "master", "commit": "7bbed4b548d9a81c14351bda93d16336edefd067" },
24-
"nvim-treesitter-textobjects": { "branch": "master", "commit": "698b5f805722254bca3c509591c1806d268b6c2f" },
35+
"nord.nvim": { "branch": "master", "commit": "80c1e5321505aeb22b7a9f23eb82f1e193c12470" },
36+
"nui.nvim": { "branch": "main", "commit": "8d5b0b568517935d3c84f257f272ef004d9f5a59" },
37+
"nvim-lint": { "branch": "master", "commit": "9dfb77ef6c5092a19502883c02dc5a02ec648729" },
38+
"nvim-lspconfig": { "branch": "master", "commit": "46434074f188e6bfccf9d9153dd8be6b1381498b" },
39+
"nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" },
40+
"nvim-treesitter": { "branch": "master", "commit": "94ea4f436d2b59c80f02e293466c374584f03b8c" },
41+
"nvim-treesitter-textobjects": { "branch": "master", "commit": "ed373482db797bbf71bdff37a15c7555a84dce47" },
2542
"nvim-ts-autotag": { "branch": "main", "commit": "a1d526af391f6aebb25a8795cbc05351ed3620b5" },
2643
"persistence.nvim": { "branch": "main", "commit": "166a79a55bfa7a4db3e26fc031b4d92af71d0b51" },
2744
"plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
45+
"render-markdown.nvim": { "branch": "main", "commit": "8c33733b9af902250731539b2fe3920c76993765" },
46+
"rustaceanvim": { "branch": "master", "commit": "3f2b7a94b7fa3c0f301dfa9644c94b543000efc2" },
2847
"snacks.nvim": { "branch": "main", "commit": "bc0630e43be5699bb94dadc302c0d21615421d93" },
48+
"telescope.nvim": { "branch": "master", "commit": "a4ed82509cecc56df1c7138920a1aeaf246c0ac5" },
49+
"telescope_hoogle": { "branch": "master", "commit": "5c2ae51bcf905a7101134a597e6f7be2dc05f975" },
2950
"todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" },
3051
"tokyonight.nvim": { "branch": "main", "commit": "057ef5d260c1931f1dffd0f052c685dcd14100a3" },
3152
"trouble.nvim": { "branch": "main", "commit": "85bedb7eb7fa331a2ccbecb9202d8abba64d37b3" },
3253
"ts-comments.nvim": { "branch": "main", "commit": "1bd9d0ba1d8b336c3db50692ffd0955fe1bb9f0c" },
33-
"which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" }
54+
"venv-selector.nvim": { "branch": "regexp", "commit": "c677caa1030808a9f90092e522de7cc20c1390dd" },
55+
"which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" },
56+
"yanky.nvim": { "branch": "main", "commit": "04775cc6e10ef038c397c407bc17f00a2f52b378" }
3457
}

lazyvim.json

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,15 @@
11
{
22
"extras": [
3-
3+
"lazyvim.plugins.extras.coding.yanky",
4+
"lazyvim.plugins.extras.editor.neo-tree",
5+
"lazyvim.plugins.extras.lang.haskell",
6+
"lazyvim.plugins.extras.lang.markdown",
7+
"lazyvim.plugins.extras.lang.python",
8+
"lazyvim.plugins.extras.lang.rust",
9+
"lazyvim.plugins.extras.lang.zig",
10+
"lazyvim.plugins.extras.test.core",
11+
"lazyvim.plugins.extras.ui.alpha",
12+
"lazyvim.plugins.extras.util.mini-hipatterns"
413
],
514
"install_version": 8,
615
"news": {

lua/config/lazy.lua

Lines changed: 46 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,54 @@
11
local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
22
if not (vim.uv or vim.loop).fs_stat(lazypath) then
3-
local lazyrepo = "https://github.com/folke/lazy.nvim.git"
4-
local out = vim.fn.system({ "git", "clone", "--filter=blob:none", "--branch=stable", lazyrepo, lazypath })
5-
if vim.v.shell_error ~= 0 then
6-
vim.api.nvim_echo({
7-
{ "Failed to clone lazy.nvim:\n", "ErrorMsg" },
8-
{ out, "WarningMsg" },
9-
{ "\nPress any key to exit..." },
10-
}, true, {})
11-
vim.fn.getchar()
12-
os.exit(1)
13-
end
3+
local lazyrepo = "https://github.com/folke/lazy.nvim.git"
4+
local out = vim.fn.system({ "git", "clone", "--filter=blob:none", "--branch=stable", lazyrepo, lazypath })
5+
if vim.v.shell_error ~= 0 then
6+
vim.api.nvim_echo({
7+
{ "Failed to clone lazy.nvim:\n", "ErrorMsg" },
8+
{ out, "WarningMsg" },
9+
{ "\nPress any key to exit..." },
10+
}, true, {})
11+
vim.fn.getchar()
12+
os.exit(1)
13+
end
1414
end
1515
vim.opt.rtp:prepend(lazypath)
1616

1717
require("lazy").setup({
18-
spec = {
19-
-- add LazyVim and import its plugins
20-
{ "LazyVim/LazyVim", import = "lazyvim.plugins" },
21-
-- import/override with your plugins
22-
{ import = "plugins" },
23-
},
24-
defaults = {
25-
-- By default, only LazyVim plugins will be lazy-loaded. Your custom plugins will load during startup.
26-
-- If you know what you're doing, you can set this to `true` to have all your custom plugins lazy-loaded by default.
27-
lazy = false,
28-
-- It's recommended to leave version=false for now, since a lot the plugin that support versioning,
29-
-- have outdated releases, which may break your Neovim install.
30-
version = false, -- always use the latest git commit
31-
-- version = "*", -- try installing the latest stable version for plugins that support semver
32-
},
33-
install = { colorscheme = { "tokyonight", "habamax" } },
34-
checker = {
35-
enabled = true, -- check for plugin updates periodically
36-
notify = false, -- notify on update
37-
}, -- automatically check for plugin updates
38-
performance = {
39-
rtp = {
40-
-- disable some rtp plugins
41-
disabled_plugins = {
42-
"gzip",
43-
-- "matchit",
44-
-- "matchparen",
45-
-- "netrwPlugin",
46-
"tarPlugin",
47-
"tohtml",
48-
"tutor",
49-
"zipPlugin",
50-
},
18+
19+
spec = {
20+
-- add LazyVim and import its plugins
21+
{ "LazyVim/LazyVim", import = "lazyvim.plugins" },
22+
-- import/override with your plugins
23+
{ import = "plugins" },
24+
},
25+
defaults = {
26+
-- By default, only LazyVim plugins will be lazy-loaded. Your custom plugins will load during startup.
27+
-- If you know what you're doing, you can set this to `true` to have all your custom plugins lazy-loaded by default.
28+
lazy = false,
29+
-- It's recommended to leave version=false for now, since a lot the plugin that support versioning,
30+
-- have outdated releases, which may break your Neovim install.
31+
version = false, -- always use the latest git commit
32+
-- version = "*", -- try installing the latest stable version for plugins that support semver
33+
},
34+
install = { colorscheme = { "tokyonight", "habamax" } },
35+
checker = {
36+
enabled = true, -- check for plugin updates periodically
37+
notify = false, -- notify on update
38+
}, -- automatically check for plugin updates
39+
performance = {
40+
rtp = {
41+
-- disable some rtp plugins
42+
disabled_plugins = {
43+
"gzip",
44+
-- "matchit",
45+
-- "matchparen",
46+
-- "netrwPlugin",
47+
"tarPlugin",
48+
"tohtml",
49+
"tutor",
50+
"zipPlugin",
51+
},
52+
},
5153
},
52-
},
5354
})

lua/config/options.lua

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
11
-- Options are automatically loaded before lazy.nvim startup
22
-- Default options that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/options.lua
33
-- Add any additional options here
4+
vim.opt.guifont = { "JetBrainsMono Nerd Font", ":h10" }
5+
6+
if vim.g.neovide then
7+
vim.cmd("cd ~")
8+
end

lua/plugins/colorscheme.lua

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
return {
2+
{ "scottmckendry/cyberdream.nvim", lazy = false, priority = 1000 },
3+
{ "rebelot/kanagawa.nvim" },
4+
{ "shaunsingh/nord.nvim" },
5+
{ "bluz71/vim-nightfly-colors", name = "nightfly", lazy = false, priority = 1000 },
6+
{
7+
"LazyVim/LazyVim",
8+
opts = {
9+
colorscheme = "kanagawa",
10+
},
11+
},
12+
}

lua/plugins/neo_tree.lua

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
return {
2+
{
3+
"nvim-neo-tree/neo-tree.nvim",
4+
opts = {
5+
window = {
6+
position = "right",
7+
},
8+
},
9+
},
10+
}

stylua.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
indent_type = "Spaces"
2-
indent_width = 2
3-
column_width = 120
2+
indent_width = 4
3+
column_width = 120

0 commit comments

Comments
 (0)