formatting/linting added for lua/ts
This commit is contained in:
RingOfStorms (Joshua Bell)
parent
e54f6ee975
commit
61d3aec608
18 changed files with 338 additions and 710 deletions
129
init.lua
129
init.lua
|
|
@ -1,11 +1,14 @@
|
|||
if NIX then
|
||||
-- Add my lua dir to the path. THIS IS NOT RECURSIVE!
|
||||
-- For recursive we can do something like this: https://github.com/RingOfStorms/nvim/blob/0b833d555c69e88b450a10eec4e39a782bad1037/init.lua#L1-L17
|
||||
-- However this pollutes the path, it could be limited to just init files but this approach here one level deep is adequate for my own needs
|
||||
package.path = package.path .. ";" .. NIX.storePath .. "/lua/?.lua"
|
||||
package.path = package.path .. ";" .. NIX.storePath .. "/lua/?/init.lua"
|
||||
-- Add my lua dir to the path. THIS IS NOT RECURSIVE!
|
||||
-- For recursive we can do something like this: https://github.com/RingOfStorms/nvim/blob/0b833d555c69e88b450a10eec4e39a782bad1037/init.lua#L1-L17
|
||||
-- However this pollutes the path, it could be limited to just init files but this approach here one level deep is adequate for my own needs
|
||||
package.path = package.path .. ";" .. NIX.storePath .. "/lua/?.lua"
|
||||
package.path = package.path .. ";" .. NIX.storePath .. "/lua/?/init.lua"
|
||||
end
|
||||
|
||||
-- Compat stolen form LazyVim
|
||||
vim.uv = vim.uv or vim.loop
|
||||
|
||||
U = require("util") -- NOTE global U[til]
|
||||
require("options")
|
||||
require("keymaps")
|
||||
|
|
@ -13,75 +16,75 @@ require("keymaps")
|
|||
-- When using nix, it will set lazy via LAZY env variable.
|
||||
local lazypath = vim.env.LAZY or (vim.fn.stdpath("data") .. "/lazy/lazy.nvim")
|
||||
if not vim.loop.fs_stat(lazypath) then
|
||||
if NIX then
|
||||
error("LAZY environment variable to nix store was not found: " .. vim.env.LAZY)
|
||||
return
|
||||
end
|
||||
-- For non nix systems, pull lazy stable to the normal XDG config path
|
||||
local output = vim.fn.system({
|
||||
"git",
|
||||
"clone",
|
||||
"--filter=blob:none",
|
||||
"https://github.com/folke/lazy.nvim.git",
|
||||
"--branch=stable", -- latest stable release
|
||||
lazypath,
|
||||
})
|
||||
if vim.api.nvim_get_vvar("shell_error") ~= 0 then
|
||||
error("Error cloning lazy.nvim repository...\n\n" .. output)
|
||||
end
|
||||
if NIX then
|
||||
error("LAZY environment variable to nix store was not found: " .. vim.env.LAZY)
|
||||
return
|
||||
end
|
||||
-- For non nix systems, pull lazy stable to the normal XDG config path
|
||||
local output = vim.fn.system({
|
||||
"git",
|
||||
"clone",
|
||||
"--filter=blob:none",
|
||||
"https://github.com/folke/lazy.nvim.git",
|
||||
"--branch=stable", -- latest stable release
|
||||
lazypath,
|
||||
})
|
||||
if vim.api.nvim_get_vvar("shell_error") ~= 0 then
|
||||
error("Error cloning lazy.nvim repository...\n\n" .. output)
|
||||
end
|
||||
end
|
||||
vim.opt.rtp:prepend(lazypath)
|
||||
|
||||
-- Setup lazy
|
||||
local function ensure_table(object)
|
||||
return type(object) == "table" and object or { object }
|
||||
return type(object) == "table" and object or { object }
|
||||
end
|
||||
local function getSpec()
|
||||
if NIX then
|
||||
-- Convert plugins to use nix store, this auto sets the `dir` property for us on all plugins.
|
||||
function convertPluginToNixStore(plugin)
|
||||
local p = ensure_table(plugin)
|
||||
local nixName = "nvim_plugin-" .. p[1]
|
||||
if not NIX.pluginPaths[nixName] then
|
||||
error("Plugin is missing in the nix store, ensure it is in the nix flake inputs: " .. p[1])
|
||||
end
|
||||
p.dir = NIX.pluginPaths[nixName]
|
||||
p.name = p.name or p[1]
|
||||
p.url = "not_used_in_nix"
|
||||
p.pin = true
|
||||
if p.dependencies then
|
||||
p.dependencies = ensure_table(p.dependencies)
|
||||
for i, dep in ipairs(p.dependencies) do
|
||||
p.dependencies[i] = convertPluginToNixStore(dep)
|
||||
end
|
||||
end
|
||||
return p
|
||||
end
|
||||
if NIX then
|
||||
-- Convert plugins to use nix store, this auto sets the `dir` property for us on all plugins.
|
||||
function convertPluginToNixStore(plugin)
|
||||
local p = ensure_table(plugin)
|
||||
local nixName = "nvim_plugin-" .. p[1]
|
||||
if not NIX.pluginPaths[nixName] then
|
||||
error("Plugin is missing in the nix store, ensure it is in the nix flake inputs: " .. p[1])
|
||||
end
|
||||
p.dir = NIX.pluginPaths[nixName]
|
||||
p.name = p.name or p[1]
|
||||
p.url = "not_used_in_nix"
|
||||
p.pin = true
|
||||
if p.dependencies then
|
||||
p.dependencies = ensure_table(p.dependencies)
|
||||
for i, dep in ipairs(p.dependencies) do
|
||||
p.dependencies[i] = convertPluginToNixStore(dep)
|
||||
end
|
||||
end
|
||||
return p
|
||||
end
|
||||
|
||||
local plugins = {}
|
||||
local plugins_path = debug.getinfo(2, "S").source:sub(2):match("(.*/)") .. "lua/plugins"
|
||||
for _, file in ipairs(vim.fn.readdir(plugins_path, [[v:val =~ '\.lua$']])) do
|
||||
local plugin = string.sub(file, 0, -5)
|
||||
table.insert(plugins, convertPluginToNixStore(require("plugins." .. plugin)))
|
||||
end
|
||||
return plugins
|
||||
else
|
||||
-- TODO I want this to work in the nixos versionhttps://github.com/RingOfStorms/nvim/blob/nix-flake/init.lua#L39-L55
|
||||
-- but it is not resolving properly to the nix store.
|
||||
-- Will revisit at some point, instead we manually pull them
|
||||
-- in above with a directory scan.
|
||||
return { { import = "plugins" } }
|
||||
end
|
||||
local plugins = {}
|
||||
local plugins_path = debug.getinfo(2, "S").source:sub(2):match("(.*/)") .. "lua/plugins"
|
||||
for _, file in ipairs(vim.fn.readdir(plugins_path, [[v:val =~ '\.lua$']])) do
|
||||
local plugin = string.sub(file, 0, -5)
|
||||
table.insert(plugins, convertPluginToNixStore(require("plugins." .. plugin)))
|
||||
end
|
||||
return plugins
|
||||
else
|
||||
-- TODO I want this to work in the nixos versionhttps://github.com/RingOfStorms/nvim/blob/nix-flake/init.lua#L39-L55
|
||||
-- but it is not resolving properly to the nix store.
|
||||
-- Will revisit at some point, instead we manually pull them
|
||||
-- in above with a directory scan.
|
||||
return { { import = "plugins" } }
|
||||
end
|
||||
end
|
||||
require("lazy").setup({
|
||||
spec = getSpec(),
|
||||
change_detection = {
|
||||
enabled = false,
|
||||
},
|
||||
spec = getSpec(),
|
||||
change_detection = {
|
||||
enabled = false,
|
||||
},
|
||||
|
||||
defaults = {
|
||||
lazy = true,
|
||||
},
|
||||
defaults = {
|
||||
lazy = true,
|
||||
},
|
||||
})
|
||||
|
||||
vim.cmd("colorscheme catppuccin")
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue