Skip to content

Commit fbf19e0

Browse files
julianorchardjulianorchard
committed
feat: Misc updates
Signed-off-by: Julian Orchard <[email protected]>
1 parent 3f8fe68 commit fbf19e0

File tree

6 files changed

+80
-46
lines changed

6 files changed

+80
-46
lines changed

‎init.lua

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,23 @@
11
vim.g.mapleader = " "
22
vim.g.maplocalleader = " "
33

4+
vim.g.theme = "vague"
5+
vim.g.mason_autoinstall = false -- Does not use "mason" or "mason tool installer" to install stuff automagically
6+
vim.g.dependencies = {
7+
-- Formatters
8+
"black",
9+
"jq",
10+
"jsonnetfmt",
11+
"prettier",
12+
"shfmt",
13+
"stylua",
14+
"yamlfix",
15+
-- Linters
16+
"hadolint",
17+
"ansible-lint",
18+
"phpstan",
19+
}
20+
421
local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
522
if not (vim.uv or vim.loop).fs_stat(lazypath) then
623
local lazyrepo = "https://github.com/folke/lazy.nvim.git"

‎lazy-lock.json

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,43 @@
11
{
2-
"LuaSnip": { "branch": "master", "commit": "e808bee352d1a6fcf902ca1a71cee76e60e24071" },
2+
"LuaSnip": { "branch": "master", "commit": "c9b9a22904c97d0eb69ccb9bab76037838326817" },
33
"NrrwRgn": { "branch": "master", "commit": "e027db9d94f94947153cd7b5ac9abd04371ab2b0" },
4-
"SchemaStore.nvim": { "branch": "main", "commit": "6f86b595c24ba3d6d1de23e219bf3be6131aa617" },
4+
"SchemaStore.nvim": { "branch": "main", "commit": "5be212138af55d3dcae9d77b5b14f63634243e3d" },
55
"cloak.nvim": { "branch": "main", "commit": "648aca6d33ec011dc3166e7af3b38820d01a71e4" },
6-
"cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
6+
"cmp-nvim-lsp": { "branch": "main", "commit": "99290b3ec1322070bcfb9e846450a46f6efa50f0" },
77
"cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
8-
"cmp-rg": { "branch": "master", "commit": "677a7874ee8f1afc648c2e7d63a97bc21a7663c5" },
9-
"cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
10-
"conform.nvim": { "branch": "master", "commit": "40d4e98fcc3e6f485f0e8924c63734bc7e305967" },
8+
"cmp-rg": { "branch": "master", "commit": "70a43543f61b6083ba9c3b7deb9ccee671410ac6" },
9+
"cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" },
10+
"conform.nvim": { "branch": "master", "commit": "f8d743ce333bedc47821de2cd4d23c43856ecbe5" },
1111
"diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
12-
"fidget.nvim": { "branch": "main", "commit": "ef99df04a1c53a453602421bc0f756997edc8289" },
13-
"friendly-snippets": { "branch": "main", "commit": "de8fce94985873666bd9712ea3e49ee17aadb1ed" },
14-
"gitsigns.nvim": { "branch": "main", "commit": "863903631e676b33e8be2acb17512fdc1b80b4fb" },
15-
"jinja.vim": { "branch": "master", "commit": "d112541c062122969c6c0bc3df7e3cab3595c253" },
16-
"lazy.nvim": { "branch": "main", "commit": "1159bdccd8910a0fd0914b24d6c3d186689023d9" },
12+
"fidget.nvim": { "branch": "main", "commit": "9238947645ce17d96f30842e61ba81147185b657" },
13+
"friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" },
14+
"gitsigns.nvim": { "branch": "main", "commit": "3ec5fbd9202ae3908551c98c4b6c3c05ff7c8e96" },
15+
"go-up.nvim": { "branch": "main", "commit": "5c5fcdff9efd4ae40865596ae12bd5be1c36ee9b" },
16+
"jinja.vim": { "branch": "master", "commit": "06fcfeeb20c6c76d6fee021b250c8780c38e2925" },
17+
"lazy.nvim": { "branch": "main", "commit": "d8f26efd456190241afd1b0f5235fe6fdba13d4a" },
1718
"markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" },
18-
"mason-lspconfig.nvim": { "branch": "main", "commit": "25c11854aa25558ee6c03432edfa0df0217324be" },
19+
"mason-lspconfig.nvim": { "branch": "main", "commit": "e942edf5c85b6a2ab74059ea566cac5b3e1514a4" },
1920
"mason-tool-installer.nvim": { "branch": "main", "commit": "c5e07b8ff54187716334d585db34282e46fa2932" },
2021
"mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
21-
"neogit": { "branch": "master", "commit": "bab8703a4d5406548ab7feb47efbabf023f5ae1a" },
22-
"nightfox.nvim": { "branch": "main", "commit": "7557f26defd093c4e9bc17f28b08403f706f5a44" },
23-
"nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" },
24-
"nvim-lint": { "branch": "master", "commit": "f707b3ae50417067fa63fdfe179b0bff6b380da1" },
25-
"nvim-lspconfig": { "branch": "master", "commit": "d141895d1d9f41048fff201d62a2d6e96d299e32" },
26-
"nvim-moonwalk": { "branch": "master", "commit": "86a59f16ae01606824cef3d0f3f87c9886b312d0" },
27-
"nvim-scissors": { "branch": "main", "commit": "39880476d8027371c7d7f6a8b890aedaefb21f74" },
28-
"nvim-treesitter": { "branch": "master", "commit": "5a2ff8b7ca5470b1011ed82ef3fdd53139ffc467" },
29-
"nvim-treesitter-context": { "branch": "master", "commit": "78a81c7494e7d1a08dd1200b556933e513fd9f29" },
22+
"neogit": { "branch": "master", "commit": "63124cf520ff24d09deb3b850e053908ab0fc66a" },
23+
"nvim-cmp": { "branch": "main", "commit": "12509903a5723a876abd65953109f926f4634c30" },
24+
"nvim-lint": { "branch": "master", "commit": "789b7ada1b4f00e08d026dffde410dcfa6a0ba87" },
25+
"nvim-lspconfig": { "branch": "master", "commit": "b4d65bce97795438ab6e1974b3672c17a4865e3c" },
26+
"nvim-scissors": { "branch": "main", "commit": "12d9f282b67525bb766c6fe33317caf25a19c86a" },
27+
"nvim-treesitter": { "branch": "master", "commit": "6587a5886873cce8698a47477224c30578b33a24" },
28+
"nvim-treesitter-context": { "branch": "master", "commit": "bece284c5322ddf6946fa4bdc383a2bc033269d7" },
3029
"nvim-treesitter-refactor": { "branch": "master", "commit": "d8b74fa87afc6a1e97b18da23e762efb032dc270" },
31-
"nvim-treesitter-textobjects": { "branch": "master", "commit": "b91c98afa6c42819aea6cbc1ba38272f5456a5cf" },
32-
"oil.nvim": { "branch": "master", "commit": "ccab9d5e09e2d0042fbbe5b6bd05e82426247067" },
33-
"orgmode": { "branch": "master", "commit": "a5aeb14663ef08e0bb4bb847f8d79f9c253094a0" },
34-
"plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" },
35-
"telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" },
30+
"nvim-treesitter-textobjects": { "branch": "master", "commit": "ad8f0a472148c3e0ae9851e26a722ee4e29b1595" },
31+
"oil.nvim": { "branch": "master", "commit": "7a782c9a9cb7a16ec52199e55a1e892262c5dbbc" },
32+
"orgmode": { "branch": "master", "commit": "13924c0ee70e6a6e604a159261b72ab5901865c0" },
33+
"plenary.nvim": { "branch": "master", "commit": "3707cdb1e43f5cea73afb6037e6494e7ce847a66" },
34+
"telescope-fzf-native.nvim": { "branch": "main", "commit": "dae2eac9d91464448b584c7949a31df8faefec56" },
3635
"telescope.nvim": { "branch": "0.1.x", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" },
37-
"todo-comments.nvim": { "branch": "main", "commit": "ae0a2afb47cf7395dc400e5dc4e05274bf4fb9e0" },
38-
"undotree": { "branch": "master", "commit": "78b5241191852ffa9bb5da5ff2ee033160798c3b" },
36+
"todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" },
37+
"undotree": { "branch": "master", "commit": "2556c6800b210b2096b55b66e74b4cc1d9ebbe4f" },
38+
"vague.nvim": { "branch": "main", "commit": "aa744dbf7bfc768da3dd232ccde3b337182903dc" },
3939
"vim-easy-align": { "branch": "master", "commit": "9815a55dbcd817784458df7a18acacc6f82b1241" },
40-
"vim-fugitive": { "branch": "master", "commit": "d4877e54cef67f5af4f950935b1ade19ed6b7370" },
40+
"vim-fugitive": { "branch": "master", "commit": "d74a7cff4cfcf84f83cc7eccfa365488f3bbabc2" },
4141
"vim-helm": { "branch": "master", "commit": "ae1ebc160d2b9b90108477ab10df7a4fc501e358" },
4242
"vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" },
4343
"vim-visual-multi": { "branch": "master", "commit": "a6975e7c1ee157615bbc80fc25e4392f71c344d4" },

‎lua/config/lsp.lua

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,8 +138,12 @@ function M.setup()
138138

139139
-- Ensure the servers above are installed
140140
local mason_lspconfig = require("mason-lspconfig")
141+
local install_list = {}
142+
if vim.g.mason_autoinstall == true then
143+
install_list = vim.tbl_keys(servers)
144+
end
141145
mason_lspconfig.setup({
142-
ensure_installed = vim.tbl_keys(servers),
146+
ensure_installed = install_list,
143147
})
144148
mason_lspconfig.setup_handlers({
145149
function(server_name)

‎lua/plugins/aesthetics.lua

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,24 @@
22
local M = {
33
{
44
"j-hui/fidget.nvim",
5-
tag = "v2.4.5",
5+
tag = "v1.5.0",
66
config = function()
77
require("config.fidget").setup()
88
end,
99
},
10+
{
11+
"nullromo/go-up.nvim",
12+
opts = {},
13+
config = function(_, opts)
14+
local goUp = require("go-up")
15+
goUp.setup(opts)
16+
end,
17+
},
1018
}
1119

1220
-- Theme map
1321
local T = {}
14-
local current_theme = "meh"
22+
local current_theme = vim.g.theme
1523

1624
local function bg_nullify(selector)
1725
vim.api.nvim_set_hl(0, selector, {
@@ -35,6 +43,16 @@ local function colour_my_pencils(pencils)
3543
end
3644
end
3745

46+
T.vague = {
47+
"vague2k/vague.nvim",
48+
config = function()
49+
require("vague").setup({
50+
transparent = true,
51+
})
52+
vim.cmd.colorscheme("vague")
53+
end,
54+
}
55+
3856
T.nightfox = {
3957
"EdenEast/nightfox.nvim",
4058
config = function()
@@ -104,6 +122,8 @@ local function set_theme()
104122
table.insert(M, T.nightfox)
105123
elseif current_theme == "rose-pine" then
106124
table.insert(M, T.rosepine)
125+
elseif current_theme == "vague" then
126+
table.insert(M, T.vague)
107127
else
108128
vim.cmd([[
109129
execute "source " . stdpath("config") . "/colors/murphme.vim"

‎lua/plugins/lsp.lua

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -41,21 +41,12 @@ local M = {
4141
"mfussenegger/nvim-lint",
4242
},
4343
config = function()
44+
local install_list = {}
45+
if vim.g.mason_autoinstall == true then
46+
install_list = vim.g.dependencies
47+
end
4448
require("mason-tool-installer").setup({
45-
ensure_installed = {
46-
-- formatters
47-
"black",
48-
"jq",
49-
"jsonnetfmt",
50-
"prettier",
51-
"shfmt",
52-
"stylua",
53-
"yamlfix",
54-
-- linters
55-
"hadolint",
56-
"ansible-lint",
57-
"phpstan",
58-
},
49+
ensure_installed = install_list,
5950
})
6051
end,
6152
},

‎lua/plugins/version-control.lua

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@ return {
4545
fugimap("n", "<leader>gd", "diff")
4646
fugimap("n", "<leader>gl", "log")
4747
fugimap("n", "<leader>gs", "status")
48+
fugimap("n", "<leader>ga", "add .")
49+
fugimap("n", "<leader>gp", "push")
4850
end,
4951
},
5052

0 commit comments

Comments
 (0)