stuph
This commit is contained in:
parent
7c95e0827e
commit
4cb55ad327
@ -1,49 +1,11 @@
|
|||||||
# Configuration for Alacritty, the GPU enhanced terminal emulator.
|
|
||||||
|
|
||||||
# Import additional configuration files
|
|
||||||
#
|
|
||||||
# Imports are loaded in order, skipping all missing files, with the importing
|
|
||||||
# file being loaded last. If a field is already present in a previous import, it
|
|
||||||
# will be replaced.
|
|
||||||
#
|
|
||||||
# All imports must either be absolute paths starting with `/`, or paths relative
|
|
||||||
# to the user's home directory starting with `~/`.
|
|
||||||
#import:
|
|
||||||
# - /path/to/alacritty.yml
|
|
||||||
|
|
||||||
# Any items in the `env` entry below will be added as
|
|
||||||
# environment variables. Some entries may override variables
|
|
||||||
# set by alacritty itself.
|
|
||||||
#env:
|
#env:
|
||||||
# TERM variable
|
|
||||||
#
|
|
||||||
# This value is used to set the `$TERM` environment variable for
|
|
||||||
# each instance of Alacritty. If it is not present, alacritty will
|
|
||||||
# check the local terminfo database and use `alacritty` if it is
|
|
||||||
# available, otherwise `xterm-256color` is used.
|
|
||||||
#TERM: alacritty
|
#TERM: alacritty
|
||||||
|
|
||||||
# Window dimensions (changes require restart)
|
|
||||||
#
|
|
||||||
# Number of lines/columns (not pixels) in the terminal. The number of columns
|
|
||||||
# must be at least `2`, while using a value of `0` for columns and lines will
|
|
||||||
# fall back to the window manager's recommended size.
|
|
||||||
#dimensions:
|
#dimensions:
|
||||||
# columns: 0
|
# columns: 0
|
||||||
# lines: 0
|
# lines: 0
|
||||||
|
|
||||||
# Window position (changes require restart)
|
|
||||||
#
|
|
||||||
# Specified in number of pixels.
|
|
||||||
# If the position is not set, the window manager will handle the placement.
|
|
||||||
#position:
|
#position:
|
||||||
# x: 0
|
# x: 0
|
||||||
# y: 0
|
# y: 0
|
||||||
|
|
||||||
# Window padding (changes require restart)
|
|
||||||
#
|
|
||||||
# Blank space added around the window in pixels. This padding is scaled
|
|
||||||
# by DPI and the specified value is always added at both opposing sides.
|
|
||||||
window:
|
window:
|
||||||
padding:
|
padding:
|
||||||
x: 10
|
x: 10
|
||||||
@ -175,7 +137,6 @@ font:
|
|||||||
|
|
||||||
# Colors (Tomorrow Night)
|
# Colors (Tomorrow Night)
|
||||||
colors:
|
colors:
|
||||||
# Default colors
|
|
||||||
primary:
|
primary:
|
||||||
background: '#000000'
|
background: '#000000'
|
||||||
foreground: '#c5c8c6'
|
foreground: '#c5c8c6'
|
||||||
|
@ -1,46 +0,0 @@
|
|||||||
require "format".setup {
|
|
||||||
["*"] = {
|
|
||||||
{cmd = {"sed -i 's/[ \t]*$//'"}} -- remove trailing whitespace
|
|
||||||
},
|
|
||||||
vim = {
|
|
||||||
{
|
|
||||||
cmd = {"luafmt -w replace"},
|
|
||||||
start_pattern = "^lua << EOF$",
|
|
||||||
end_pattern = "^EOF$"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
vimwiki = {
|
|
||||||
{
|
|
||||||
cmd = {"prettier -w --parser babel"},
|
|
||||||
start_pattern = "^{{{javascript$",
|
|
||||||
end_pattern = "^}}}$"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
lua = {
|
|
||||||
{
|
|
||||||
cmd = {
|
|
||||||
function(file)
|
|
||||||
return string.format("luafmt -l %s -w replace %s", vim.bo.textwidth, file)
|
|
||||||
end
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
go = {
|
|
||||||
{
|
|
||||||
cmd = {"gofmt -w", "goimports -w"},
|
|
||||||
tempfile_postfix = ".tmp"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
javascript = {
|
|
||||||
{cmd = {"prettier -w", "./node_modules/.bin/eslint --fix"}}
|
|
||||||
},
|
|
||||||
markdown = {
|
|
||||||
{cmd = {"prettier -w"}},
|
|
||||||
{
|
|
||||||
cmd = {"black"},
|
|
||||||
start_pattern = "^```python$",
|
|
||||||
end_pattern = "^```$",
|
|
||||||
target = "current"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
@ -27,20 +27,10 @@ if u.has_plugin("cmp") then
|
|||||||
set tabstop=2
|
set tabstop=2
|
||||||
]]
|
]]
|
||||||
|
|
||||||
-- Debug indentations
|
|
||||||
if false then
|
|
||||||
vim.cmd [[
|
|
||||||
set list
|
|
||||||
set listchars=eol:⏎,tab:->,trail:_,nbsp:⎵
|
|
||||||
]]
|
|
||||||
end
|
|
||||||
|
|
||||||
g.hidden = true --unload buffers when hidden
|
g.hidden = true --unload buffers when hidden
|
||||||
g.filetype = true -- execute autocommands based on filetype
|
g.filetype = true -- execute autocommands based on filetype
|
||||||
o.autoread = true
|
o.autoread = true
|
||||||
|
|
||||||
o.lazyredraw = true
|
|
||||||
|
|
||||||
-- Search
|
-- Search
|
||||||
o.inccommand = 'nosplit' -- show substitutions incrementally
|
o.inccommand = 'nosplit' -- show substitutions incrementally
|
||||||
o.ignorecase = true
|
o.ignorecase = true
|
||||||
@ -81,9 +71,11 @@ if u.has_plugin("cmp") then
|
|||||||
-- Enable Theming / Syntax
|
-- Enable Theming / Syntax
|
||||||
o.syntax = "enable"
|
o.syntax = "enable"
|
||||||
o.termguicolors = true
|
o.termguicolors = true
|
||||||
cmd("colorscheme material")
|
cmd("colorscheme tokyonight")
|
||||||
g.material_terminal_italics = 1
|
g.material_terminal_italics = 1
|
||||||
g.material_theme_style = "darker"
|
g.material_theme_style = "darker"
|
||||||
|
g.tokyonight_style = "night"
|
||||||
|
g.tokyonight_transparent_sidebar = true;
|
||||||
|
|
||||||
-- Remove background color
|
-- Remove background color
|
||||||
require("transparent").setup({enable = true})
|
require("transparent").setup({enable = true})
|
||||||
@ -151,7 +143,6 @@ if u.has_plugin("cmp") then
|
|||||||
g.wiki_link_extension = ".md"
|
g.wiki_link_extension = ".md"
|
||||||
|
|
||||||
-- KeyBindings
|
-- KeyBindings
|
||||||
g.mapleader = " "
|
|
||||||
require "keymappings"
|
require "keymappings"
|
||||||
|
|
||||||
require "nvim-tmux-navigation".setup {
|
require "nvim-tmux-navigation".setup {
|
||||||
@ -171,9 +162,8 @@ if u.has_plugin("cmp") then
|
|||||||
require "treesitter-conf"
|
require "treesitter-conf"
|
||||||
|
|
||||||
-- Autocompletion Setup
|
-- Autocompletion Setup
|
||||||
o.completeopt = "menuone,noselect,noinsert"
|
|
||||||
require "autocomplete"
|
|
||||||
require "snippets"
|
require "snippets"
|
||||||
|
require "cmp-conf"
|
||||||
|
|
||||||
-- LSP Config
|
-- LSP Config
|
||||||
require "lspinstaller-conf"
|
require "lspinstaller-conf"
|
||||||
@ -198,13 +188,9 @@ if u.has_plugin("cmp") then
|
|||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
-- Autocompletion Setup
|
|
||||||
o.completeopt = "menuone,noselect,noinsert"
|
|
||||||
require "autocomplete"
|
|
||||||
|
|
||||||
-- LSP Config
|
-- LSP Config
|
||||||
require "lspinstaller-conf"
|
require "lspinstaller-conf"
|
||||||
require "lsp-utils"
|
require "lsp-conf"
|
||||||
|
|
||||||
else
|
else
|
||||||
vim.cmd[[PackerSync]]
|
vim.cmd[[PackerSync]]
|
||||||
|
@ -1,11 +1,6 @@
|
|||||||
local cmd = vim.cmd;
|
local cmd = vim.cmd;
|
||||||
|
|
||||||
cmd [[
|
cmd [[
|
||||||
augroup auto_format
|
|
||||||
au!
|
|
||||||
au BufWritePre * FormatSync
|
|
||||||
augroup END
|
|
||||||
|
|
||||||
augroup highlight_yank
|
augroup highlight_yank
|
||||||
au!
|
au!
|
||||||
au TextYankPost * silent! lua vim.highlight.on_yank { timeout = 150 }
|
au TextYankPost * silent! lua vim.highlight.on_yank { timeout = 150 }
|
||||||
|
@ -1,51 +0,0 @@
|
|||||||
-- luasnip setup
|
|
||||||
local luasnip = require "luasnip"
|
|
||||||
|
|
||||||
local cmp = require "cmp"
|
|
||||||
|
|
||||||
cmp.setup {
|
|
||||||
completion = {
|
|
||||||
completeopt = "menu,menuone,noselect"
|
|
||||||
},
|
|
||||||
preselect = "none",
|
|
||||||
snippet = {
|
|
||||||
expand = function(args)
|
|
||||||
require("luasnip").lsp_expand(args.body)
|
|
||||||
end
|
|
||||||
},
|
|
||||||
mapping = {
|
|
||||||
["<C-Space>"] = cmp.mapping.complete(),
|
|
||||||
["<C-e>"] = cmp.mapping.close(),
|
|
||||||
["<CR>"] = cmp.mapping.confirm {
|
|
||||||
behavior = cmp.ConfirmBehavior.Replace,
|
|
||||||
select = true
|
|
||||||
},
|
|
||||||
["<Tab>"] = function(fallback)
|
|
||||||
if vim.fn.pumvisible() == 1 then
|
|
||||||
vim.fn.feedkeys(vim.api.nvim_replace_termcodes("<C-n>", true, true, true), "n")
|
|
||||||
elseif luasnip.expand_or_jumpable() then
|
|
||||||
vim.fn.feedkeys(vim.api.nvim_replace_termcodes("<Plug>luasnip-expand-or-jump", true, true, true), "")
|
|
||||||
else
|
|
||||||
fallback()
|
|
||||||
end
|
|
||||||
end,
|
|
||||||
["<S-Tab>"] = function(fallback)
|
|
||||||
if vim.fn.pumvisible() == 1 then
|
|
||||||
vim.fn.feedkeys(vim.api.nvim_replace_termcodes("<C-p>", true, true, true), "n")
|
|
||||||
elseif luasnip.jumpable(-1) then
|
|
||||||
vim.fn.feedkeys(vim.api.nvim_replace_termcodes("<Plug>luasnip-jump-prev", true, true, true), "")
|
|
||||||
else
|
|
||||||
fallback()
|
|
||||||
end
|
|
||||||
end
|
|
||||||
},
|
|
||||||
sources = {
|
|
||||||
{name = "nvim_lsp"},
|
|
||||||
{name = "luasnip"},
|
|
||||||
{name = "path"}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
-- The nvim-cmp almost supports LSP's capabilities so You should advertise it to LSP servers..
|
|
||||||
local capabilities = vim.lsp.protocol.make_client_capabilities()
|
|
||||||
capabilities = require("cmp_nvim_lsp").update_capabilities(capabilities)
|
|
92
configs/nvim/lua/cmp-conf.lua
Normal file
92
configs/nvim/lua/cmp-conf.lua
Normal file
@ -0,0 +1,92 @@
|
|||||||
|
-- luasnip setup
|
||||||
|
local luasnip = require "luasnip"
|
||||||
|
local lspkind = require "lspkind"
|
||||||
|
local cmp = require "cmp"
|
||||||
|
local cmp_autopairs = require('nvim-autopairs.completion.cmp')
|
||||||
|
|
||||||
|
local has_words_before = function()
|
||||||
|
local line, col = unpack(vim.api.nvim_win_get_cursor(0))
|
||||||
|
return col ~= 0 and vim.api.nvim_buf_get_lines(0, line - 1, line, true)[1]:sub(col, col):match("%s") == nil
|
||||||
|
end
|
||||||
|
|
||||||
|
cmp.setup {
|
||||||
|
formatting = {
|
||||||
|
format = lspkind.cmp_format({with_text = true, menu = ({
|
||||||
|
buffer = "[Buffer]",
|
||||||
|
nvim_lsp = "[LSP]",
|
||||||
|
luasnip = "[LuaSnip]",
|
||||||
|
nvim_lua = "[Lua]",
|
||||||
|
latex_symbols = "[Latex]",
|
||||||
|
})}),
|
||||||
|
},
|
||||||
|
completion = {
|
||||||
|
completeopt = "menu,menuone",
|
||||||
|
},
|
||||||
|
snippet = {
|
||||||
|
expand = function(args)
|
||||||
|
luasnip.lsp_expand(args.body)
|
||||||
|
end
|
||||||
|
},
|
||||||
|
mapping = {
|
||||||
|
['<C-Leader>'] = cmp.mapping.complete(),
|
||||||
|
["<Tab>"] = cmp.mapping(function(fallback)
|
||||||
|
if cmp.visible() then
|
||||||
|
cmp.select_next_item()
|
||||||
|
elseif luasnip.expand_or_jumpable() then
|
||||||
|
luasnip.expand_or_jump()
|
||||||
|
elseif has_words_before() then
|
||||||
|
cmp.complete()
|
||||||
|
else
|
||||||
|
fallback()
|
||||||
|
end
|
||||||
|
end, { "i", "s" }),
|
||||||
|
|
||||||
|
['<CR>'] = cmp.mapping.confirm({
|
||||||
|
behavior = cmp.ConfirmBehavior.Replace,
|
||||||
|
select = true,
|
||||||
|
}),
|
||||||
|
|
||||||
|
["<S-Tab>"] = cmp.mapping(function(fallback)
|
||||||
|
if cmp.visible() then
|
||||||
|
cmp.select_prev_item()
|
||||||
|
elseif luasnip.jumpable(-1) then
|
||||||
|
luasnip.jump(-1)
|
||||||
|
else
|
||||||
|
fallback()
|
||||||
|
end
|
||||||
|
end, { "i", "s" }),
|
||||||
|
},
|
||||||
|
sources = {
|
||||||
|
{name = "nvim_lsp"},
|
||||||
|
{name = "luasnip"},
|
||||||
|
{name = "path"},
|
||||||
|
{name = "buffer"},
|
||||||
|
{name = "calc"}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
-- Use buffer source for `/` (if you enabled `native_menu`, this won't work anymore).
|
||||||
|
cmp.setup.cmdline('/', {
|
||||||
|
sources = {
|
||||||
|
{ name = 'buffer' }
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
-- Use cmdline & path source for ':' (if you enabled `native_menu`, this won't work anymore).
|
||||||
|
cmp.setup.cmdline(':', {
|
||||||
|
sources = cmp.config.sources({
|
||||||
|
{ name = 'path' }
|
||||||
|
}, {
|
||||||
|
{ name = 'cmdline' }
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
|
|
||||||
|
-- The nvim-cmp almost supports LSP's capabilities so You should advertise it to LSP servers..
|
||||||
|
-- Setup lspconfig.
|
||||||
|
local capabilities = require('cmp_nvim_lsp').update_capabilities(vim.lsp.protocol.make_client_capabilities())
|
||||||
|
require'lspconfig'.html.setup {
|
||||||
|
capabilities = capabilities
|
||||||
|
}
|
||||||
|
|
||||||
|
cmp.event:on('confirm_done', cmp_autopairs.on_confirm_done({ map_char = { tex = '' } }))
|
8
configs/nvim/lua/formatter-conf.lua
Normal file
8
configs/nvim/lua/formatter-conf.lua
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
local cmd = vim.cmd;
|
||||||
|
|
||||||
|
cmd [[
|
||||||
|
augroup auto_format
|
||||||
|
au!
|
||||||
|
au BufWritePre * FormatSync
|
||||||
|
augroup END
|
||||||
|
]]
|
@ -22,6 +22,7 @@ map("n", "<Leader>c", "<cmd>lua vim.lsp.buf.code_action()<CR>", options)
|
|||||||
map("n", "<Leader><C-f>", ":Format<CR>", options)
|
map("n", "<Leader><C-f>", ":Format<CR>", options)
|
||||||
map("n", "[d", "<cmd>lua vim.lsp.diagnostic.goto_prev()<CR>", options)
|
map("n", "[d", "<cmd>lua vim.lsp.diagnostic.goto_prev()<CR>", options)
|
||||||
map("n", "]d", "<cmd>lua vim.lsp.diagnostic.goto_next()<CR>", options)
|
map("n", "]d", "<cmd>lua vim.lsp.diagnostic.goto_next()<CR>", options)
|
||||||
|
map("n", "<leader>t", ":TroubleToggle<CR>", remap)
|
||||||
|
|
||||||
-- Navigate Buffers
|
-- Navigate Buffers
|
||||||
map("n", "<C-h>", "<C-w>h", options)
|
map("n", "<C-h>", "<C-w>h", options)
|
||||||
@ -33,8 +34,10 @@ map("n", "Y", "yy", options)
|
|||||||
map("n", "<Leader>k", "{",options)
|
map("n", "<Leader>k", "{",options)
|
||||||
map("n", "<Leader>j", "}",options)
|
map("n", "<Leader>j", "}",options)
|
||||||
|
|
||||||
map("n", "<Leader><C-j>", "<cmd>move +1<CR>", options)
|
map("n", "<A-j>", "<cmd>move +1<CR>", options)
|
||||||
map("n", "<Leader><C-k>", "<cmd>move -2<CR>", options)
|
map("n", "<A-k>", "<cmd>move -2<CR>", options)
|
||||||
|
map("i", "<A-j>", "<cmd>move +1<CR>", options)
|
||||||
|
map("i", "<A-k>", "<cmd>move -2<CR>", options)
|
||||||
|
|
||||||
-- Faster git merge
|
-- Faster git merge
|
||||||
map("n", "<Leader>gd", ":Gvdiffsplit!<CR>", options)
|
map("n", "<Leader>gd", ":Gvdiffsplit!<CR>", options)
|
||||||
|
@ -1,42 +1,9 @@
|
|||||||
local nvim_lsp = require "lspconfig"
|
local lsp = require "lspconfig"
|
||||||
local lsp_status = require("lsp-status")
|
local lsp_status = require("lsp-status")
|
||||||
local utils = require("utils")
|
|
||||||
|
|
||||||
-- function to attach completion when setting up lsp
|
-- function to attach completion when setting up lsp
|
||||||
local function on_attach(client)
|
local function on_attach()
|
||||||
local function buf_set_keymap(...)
|
vim.api.nvim_buf_set_option(bufnr, "omnifunc", "v:lua.vim.lsp.omnifunc")
|
||||||
vim.api.nvim_buf_set_keymap(bufnr, ...)
|
|
||||||
end
|
|
||||||
local function buf_set_option(...)
|
|
||||||
vim.api.nvim_buf_set_option(bufnr, ...)
|
|
||||||
end
|
|
||||||
|
|
||||||
buf_set_option("omnifunc", "v:lua.vim.lsp.omnifunc")
|
|
||||||
|
|
||||||
-- Mappings.
|
|
||||||
local opts = {noremap = true, silent = true}
|
|
||||||
|
|
||||||
-- Set some keybinds conditional on server capabilities
|
|
||||||
if client.resolved_capabilities.document_formatting then
|
|
||||||
buf_set_keymap("n", "<space>f", "<cmd>lua vim.lsp.buf.formatting()<CR>", opts)
|
|
||||||
elseif client.resolved_capabilities.document_range_formatting then
|
|
||||||
buf_set_keymap("n", "<space>f", "<cmd>lua vim.lsp.buf.range_formatting()<CR>", opts)
|
|
||||||
end
|
|
||||||
|
|
||||||
-- Set autocommands conditional on server_capabilities
|
|
||||||
if client.resolved_capabilities.document_highlight then
|
|
||||||
vim.api.nvim_exec(
|
|
||||||
[[
|
|
||||||
augroup lsp_document_highlight
|
|
||||||
autocmd! * <buffer>
|
|
||||||
autocmd CursorHold <buffer> lua vim.lsp.buf.document_highlight()
|
|
||||||
autocmd CursorMoved <buffer> lua vim.lsp.buf.clear_references()
|
|
||||||
autocmd CursorHold *.* :lua vim.lsp.diagnostic.show_line_diagnostics()
|
|
||||||
augroup END
|
|
||||||
]],
|
|
||||||
false
|
|
||||||
)
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
local system_name = ""
|
local system_name = ""
|
||||||
@ -58,7 +25,7 @@ local runtime_path = vim.split(package.path, ";")
|
|||||||
table.insert(runtime_path, "lua/?.lua")
|
table.insert(runtime_path, "lua/?.lua")
|
||||||
table.insert(runtime_path, "lua/?/init.lua")
|
table.insert(runtime_path, "lua/?/init.lua")
|
||||||
|
|
||||||
nvim_lsp.sumneko_lua.setup {
|
lsp.sumneko_lua.setup {
|
||||||
on_attach = on_attach,
|
on_attach = on_attach,
|
||||||
capabilities = lsp_status.capabilities,
|
capabilities = lsp_status.capabilities,
|
||||||
cmd = {sumneko_binary, "-E", sumneko_root_path .. "/main.lua"},
|
cmd = {sumneko_binary, "-E", sumneko_root_path .. "/main.lua"},
|
||||||
@ -72,7 +39,7 @@ nvim_lsp.sumneko_lua.setup {
|
|||||||
},
|
},
|
||||||
diagnostics = {
|
diagnostics = {
|
||||||
-- Get the language server to recognize the `vim` global
|
-- Get the language server to recognize the `vim` global
|
||||||
globals = {"vim"}
|
globals = {"vim", "bufnr", "use"}
|
||||||
},
|
},
|
||||||
workspace = {
|
workspace = {
|
||||||
-- Make the server aware of Neovim runtime files
|
-- Make the server aware of Neovim runtime files
|
||||||
@ -88,37 +55,36 @@ nvim_lsp.sumneko_lua.setup {
|
|||||||
|
|
||||||
-- Go Language Server
|
-- Go Language Server
|
||||||
|
|
||||||
nvim_lsp.gopls.setup {
|
lsp.gopls.setup {
|
||||||
on_attach = on_attach,
|
on_attach = on_attach,
|
||||||
capabilities = lsp_status.capabilities
|
capabilities = lsp_status.capabilities
|
||||||
}
|
}
|
||||||
|
|
||||||
-- Html Setup
|
-- Html Setup
|
||||||
nvim_lsp.html.setup {
|
lsp.html.setup {
|
||||||
on_attach = on_attach,
|
on_attach = on_attach,
|
||||||
capabilities = lsp_status.capabilities,
|
capabilities = lsp_status.capabilities,
|
||||||
filetypes = {"html"}
|
filetypes = {"html"}
|
||||||
}
|
}
|
||||||
|
|
||||||
-- Svelte Language Server
|
-- Svelte Language Server
|
||||||
|
lsp.svelte.setup {
|
||||||
nvim_lsp.svelte.setup {
|
|
||||||
on_attach = on_attach,
|
on_attach = on_attach,
|
||||||
capabilities = lsp_status.capabilities
|
capabilities = lsp_status.capabilities
|
||||||
}
|
}
|
||||||
|
|
||||||
-- Typescript Language Server
|
-- Typescript Language Server
|
||||||
|
|
||||||
local function organize_imports()
|
local function organize_imports()
|
||||||
local params = {
|
local params = {
|
||||||
command = "_typescript.organizeImports",
|
command = "_typescript.organizeImports",
|
||||||
arguments = {vim.api.nvim_buf_get_name(0)},
|
arguments = {vim.api.nvim_buf_get_name(bufnr)},
|
||||||
title = ""
|
title = ""
|
||||||
}
|
}
|
||||||
vim.lsp.buf.execute_command(params)
|
|
||||||
|
vim.lsp.buf_request_sync(bufnr, "workspace/executeCommand", params, 500)
|
||||||
end
|
end
|
||||||
|
|
||||||
nvim_lsp.tsserver.setup {
|
lsp.tsserver.setup {
|
||||||
on_attach = on_attach,
|
on_attach = on_attach,
|
||||||
capabilities = lsp_status.capabilities,
|
capabilities = lsp_status.capabilities,
|
||||||
commands = {
|
commands = {
|
||||||
@ -129,17 +95,20 @@ nvim_lsp.tsserver.setup {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
-- JSON ls setup
|
||||||
|
lsp.jsonls.setup {
|
||||||
|
on_attach = on_attach,
|
||||||
|
capabilities = lsp_status.capabilities
|
||||||
|
}
|
||||||
|
|
||||||
-- Setup diagnostics formaters and linters for non LSP provided files
|
-- Setup diagnostics formaters and linters for non LSP provided files
|
||||||
nvim_lsp.diagnosticls.setup {
|
lsp.diagnosticls.setup {
|
||||||
on_attach = on_attach,
|
on_attach = on_attach,
|
||||||
capabilities = lsp_status.capabilities,
|
capabilities = lsp_status.capabilities,
|
||||||
cmd = {"diagnostic-languageserver", "--stdio"},
|
cmd = {"diagnostic-languageserver", "--stdio"},
|
||||||
filetypes = {
|
filetypes = {
|
||||||
"lua",
|
|
||||||
"sh",
|
"sh",
|
||||||
"markdown",
|
"markdown",
|
||||||
"json",
|
|
||||||
"jsonc",
|
|
||||||
"yaml",
|
"yaml",
|
||||||
"toml"
|
"toml"
|
||||||
},
|
},
|
@ -50,7 +50,7 @@ local nvimConfig =
|
|||||||
{
|
{
|
||||||
cmd = "cd $HOME/.dotfiles && nvim configs/init.lua && cd -",
|
cmd = "cd $HOME/.dotfiles && nvim configs/init.lua && cd -",
|
||||||
direction = "float",
|
direction = "float",
|
||||||
on_close = function(term)
|
on_close = function()
|
||||||
Terminal:close()
|
Terminal:close()
|
||||||
u.ReloadConfig()
|
u.ReloadConfig()
|
||||||
end
|
end
|
||||||
|
@ -12,7 +12,7 @@ return require("packer").startup(function()
|
|||||||
use "alexghergh/nvim-tmux-navigation"
|
use "alexghergh/nvim-tmux-navigation"
|
||||||
|
|
||||||
-- Theming Section
|
-- Theming Section
|
||||||
use "kaicataldo/material.vim"
|
use 'folke/tokyonight.nvim'
|
||||||
use "xiyaowong/nvim-transparent"
|
use "xiyaowong/nvim-transparent"
|
||||||
|
|
||||||
-- Layout Plugins
|
-- Layout Plugins
|
||||||
@ -39,22 +39,39 @@ return require("packer").startup(function()
|
|||||||
-- Obsidian / Roam like features
|
-- Obsidian / Roam like features
|
||||||
-- use "lervag/wiki.vim"
|
-- use "lervag/wiki.vim"
|
||||||
|
|
||||||
|
-- Lsp Errors
|
||||||
|
use "folke/lsp-colors.nvim"
|
||||||
|
use "onsails/lspkind-nvim"
|
||||||
|
use {
|
||||||
|
"folke/trouble.nvim",
|
||||||
|
requires = "kyazdani42/nvim-web-devicons",
|
||||||
|
config = function()
|
||||||
|
require("trouble").setup {
|
||||||
|
-- your configuration comes here
|
||||||
|
-- or leave it empty to use the default settings
|
||||||
|
-- refer to the configuration section below
|
||||||
|
}
|
||||||
|
end
|
||||||
|
}
|
||||||
|
|
||||||
-- Syntax / Autocomplete
|
-- Syntax / Autocomplete
|
||||||
use "neovim/nvim-lspconfig"
|
use "neovim/nvim-lspconfig"
|
||||||
use "hrsh7th/nvim-cmp"
|
use "hrsh7th/nvim-cmp"
|
||||||
use "hrsh7th/cmp-nvim-lsp"
|
use "hrsh7th/cmp-nvim-lsp"
|
||||||
use "hrsh7th/cmp-path"
|
use "hrsh7th/cmp-path"
|
||||||
|
use "hrsh7th/cmp-calc"
|
||||||
use "hrsh7th/cmp-buffer"
|
use "hrsh7th/cmp-buffer"
|
||||||
use "hrsh7th/cmp-cmdline"
|
use "hrsh7th/cmp-cmdline"
|
||||||
use "L3MON4D3/LuaSnip"
|
use "L3MON4D3/LuaSnip"
|
||||||
use "saadparwaiz1/cmp_luasnip"
|
use "saadparwaiz1/cmp_luasnip"
|
||||||
use "rafamadriz/friendly-snippets"
|
use "rafamadriz/friendly-snippets"
|
||||||
|
|
||||||
|
use "beyondmarc/glsl.vim"
|
||||||
|
|
||||||
use "tpope/vim-commentary"
|
use "tpope/vim-commentary"
|
||||||
|
|
||||||
use "williamboman/nvim-lsp-installer"
|
use "williamboman/nvim-lsp-installer"
|
||||||
use "nvim-lua/lsp-status.nvim"
|
use "nvim-lua/lsp-status.nvim"
|
||||||
use "L3MON4D3/LuaSnip"
|
|
||||||
use "windwp/nvim-autopairs"
|
use "windwp/nvim-autopairs"
|
||||||
use "neoclide/jsonc.vim"
|
use "neoclide/jsonc.vim"
|
||||||
use {
|
use {
|
||||||
@ -65,7 +82,7 @@ return require("packer").startup(function()
|
|||||||
-- Preview Markdown
|
-- Preview Markdown
|
||||||
use "ellisonleao/glow.nvim"
|
use "ellisonleao/glow.nvim"
|
||||||
|
|
||||||
-- Autoformat
|
-- Autoformat
|
||||||
--use "sbdchd/neoformat"
|
--use "sbdchd/neoformat"
|
||||||
-- use "lukas-reineke/format.nvim"
|
-- use "lukas-reineke/format.nvim"
|
||||||
|
|
||||||
|
@ -1,4 +1,5 @@
|
|||||||
local parser_configs = require("nvim-treesitter.parsers").get_parser_configs()
|
local parser_configs = require("nvim-treesitter.parsers").get_parser_configs()
|
||||||
|
|
||||||
parser_configs.http = {
|
parser_configs.http = {
|
||||||
install_info = {
|
install_info = {
|
||||||
url = "https://github.com/NTBBloodbath/tree-sitter-http",
|
url = "https://github.com/NTBBloodbath/tree-sitter-http",
|
||||||
@ -6,7 +7,16 @@ local parser_configs = require("nvim-treesitter.parsers").get_parser_configs()
|
|||||||
branch = "main"
|
branch = "main"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
parser_configs.glsl = {
|
||||||
|
filetype = "vert",
|
||||||
|
filetypes = {"vert","frag"}
|
||||||
|
}
|
||||||
|
|
||||||
require "nvim-treesitter.configs".setup {
|
require "nvim-treesitter.configs".setup {
|
||||||
|
indent = {
|
||||||
|
enable = true
|
||||||
|
},
|
||||||
ensure_installed = {
|
ensure_installed = {
|
||||||
"bash",
|
"bash",
|
||||||
"yaml",
|
"yaml",
|
||||||
|
21
node_modules/.modules.yaml
generated
vendored
Normal file
21
node_modules/.modules.yaml
generated
vendored
Normal file
@ -0,0 +1,21 @@
|
|||||||
|
hoistPattern:
|
||||||
|
- '*'
|
||||||
|
hoistedDependencies: {}
|
||||||
|
included:
|
||||||
|
dependencies: true
|
||||||
|
devDependencies: true
|
||||||
|
optionalDependencies: true
|
||||||
|
layoutVersion: 5
|
||||||
|
packageManager: pnpm@6.22.2
|
||||||
|
pendingBuilds: []
|
||||||
|
prunedAt: Wed, 17 Nov 2021 13:45:43 GMT
|
||||||
|
publicHoistPattern:
|
||||||
|
- '*types*'
|
||||||
|
- '*eslint*'
|
||||||
|
- '@prettier/plugin-*'
|
||||||
|
- '*prettier-plugin-*'
|
||||||
|
registries:
|
||||||
|
default: https://registry.npmjs.org/
|
||||||
|
skipped: []
|
||||||
|
storeDir: /home/jim/.pnpm-store/v3
|
||||||
|
virtualStoreDir: .pnpm
|
15
node_modules/.pnpm/lock.yaml
generated
vendored
Normal file
15
node_modules/.pnpm/lock.yaml
generated
vendored
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
lockfileVersion: 5.3
|
||||||
|
|
||||||
|
specifiers:
|
||||||
|
vite-plugin-fonts: ^0.2.2
|
||||||
|
|
||||||
|
devDependencies:
|
||||||
|
vite-plugin-fonts: 0.2.2
|
||||||
|
|
||||||
|
packages:
|
||||||
|
|
||||||
|
/vite-plugin-fonts/0.2.2:
|
||||||
|
resolution: {integrity: sha512-fhzhsrTiuzlDjSO6g5sV5EVIIvbb8lmsaIY6eUTBM4lcF55x40UBpHrcyvNwIhQG211g0lu83XC7oZlkmvdkMA==}
|
||||||
|
peerDependencies:
|
||||||
|
vite: ^2.0.0
|
||||||
|
dev: true
|
113
node_modules/.pnpm/vite-plugin-fonts@0.2.2/node_modules/vite-plugin-fonts/README.md
generated
vendored
Normal file
113
node_modules/.pnpm/vite-plugin-fonts@0.2.2/node_modules/vite-plugin-fonts/README.md
generated
vendored
Normal file
@ -0,0 +1,113 @@
|
|||||||
|
# vite-plugin-fonts
|
||||||
|
|
||||||
|
Webfont loader for vite
|
||||||
|
|
||||||
|
### Install
|
||||||
|
|
||||||
|
```sh
|
||||||
|
npm i --save-dev vite-plugin-fonts # yarn add -D vite-plugin-fonts
|
||||||
|
```
|
||||||
|
|
||||||
|
### Add it to vite.config.js
|
||||||
|
|
||||||
|
```ts
|
||||||
|
// vite.config.js
|
||||||
|
import ViteFonts from 'vite-plugin-fonts'
|
||||||
|
|
||||||
|
export default {
|
||||||
|
plugins: [
|
||||||
|
ViteFonts({
|
||||||
|
google: {
|
||||||
|
families: ['Source Sans Pro']
|
||||||
|
},
|
||||||
|
})
|
||||||
|
],
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
|
||||||
|
## Options
|
||||||
|
|
||||||
|
```ts
|
||||||
|
// vite.config.js
|
||||||
|
import ViteFonts from 'vite-plugin-fonts'
|
||||||
|
|
||||||
|
export default {
|
||||||
|
plugins: [
|
||||||
|
ViteFonts({
|
||||||
|
// Typekit API
|
||||||
|
typekit: {
|
||||||
|
/**
|
||||||
|
* Typekit project id
|
||||||
|
*/
|
||||||
|
id: '<projectId>',
|
||||||
|
|
||||||
|
/**
|
||||||
|
* enable non-blocking renderer
|
||||||
|
* <link rel="preload" href="xxx" as="style" onload="this.rel='stylesheet'">
|
||||||
|
* default: true
|
||||||
|
*/
|
||||||
|
defer: true
|
||||||
|
},
|
||||||
|
|
||||||
|
// Google Fonts API V2
|
||||||
|
google: {
|
||||||
|
/**
|
||||||
|
* enable preconnect link injection
|
||||||
|
* <link rel="preconnect" href="https://fonts.gstatic.com/" crossorigin>
|
||||||
|
* default: true
|
||||||
|
*/
|
||||||
|
preconnect: false,
|
||||||
|
|
||||||
|
/**
|
||||||
|
* values: auto, block, swap(default), fallback, optional
|
||||||
|
* default: 'swap'
|
||||||
|
*/
|
||||||
|
display: 'block',
|
||||||
|
|
||||||
|
/**
|
||||||
|
* values: auto, block, swap(default), fallback, optional
|
||||||
|
* default: undefined
|
||||||
|
*/
|
||||||
|
text: 'ViteAwsom',
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Fonts families lists
|
||||||
|
*/
|
||||||
|
families: [
|
||||||
|
// families can be either strings (only regular 400 will be loaded)
|
||||||
|
'Source Sans Pro',
|
||||||
|
|
||||||
|
// or objects
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* Family name (required)
|
||||||
|
*/
|
||||||
|
name: 'Roboto',
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Family styles
|
||||||
|
*/
|
||||||
|
styles: 'ital,wght@0,400;1,200',
|
||||||
|
|
||||||
|
/**
|
||||||
|
* enable non-blocking renderer
|
||||||
|
* <link rel="preload" href="xxx" as="style" onload="this.rel='stylesheet'">
|
||||||
|
* default: true
|
||||||
|
*/
|
||||||
|
defer: true
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
})
|
||||||
|
],
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
|
||||||
|
## Ressources
|
||||||
|
|
||||||
|
- https://web.dev/optimize-webfont-loading/
|
||||||
|
- https://csswizardry.com/2020/05/the-fastest-google-fonts/
|
||||||
|
- _(unmaintained)_ https://www.npmjs.com/package/webfontloader
|
30
node_modules/.pnpm/vite-plugin-fonts@0.2.2/node_modules/vite-plugin-fonts/dist/index.d.ts
generated
vendored
Normal file
30
node_modules/.pnpm/vite-plugin-fonts@0.2.2/node_modules/vite-plugin-fonts/dist/index.d.ts
generated
vendored
Normal file
@ -0,0 +1,30 @@
|
|||||||
|
import { HtmlTagDescriptor } from 'vite';
|
||||||
|
|
||||||
|
declare type GoogleFontFamily = {
|
||||||
|
name: string;
|
||||||
|
styles?: string;
|
||||||
|
defer?: boolean;
|
||||||
|
};
|
||||||
|
declare type GoogleFonts = {
|
||||||
|
families: (string | GoogleFontFamily)[];
|
||||||
|
text?: string;
|
||||||
|
display?: 'auto' | 'block' | 'swap' | 'fallback' | 'optional';
|
||||||
|
preconnect?: boolean;
|
||||||
|
};
|
||||||
|
|
||||||
|
declare type TypeKitFonts = {
|
||||||
|
id: string;
|
||||||
|
defer?: boolean;
|
||||||
|
};
|
||||||
|
|
||||||
|
declare type VitePluginFontsOptions = {
|
||||||
|
google?: GoogleFonts;
|
||||||
|
typekit?: TypeKitFonts;
|
||||||
|
};
|
||||||
|
declare function VitePluginFonts(options?: VitePluginFontsOptions): {
|
||||||
|
name: string;
|
||||||
|
transformIndexHtml(): HtmlTagDescriptor[];
|
||||||
|
};
|
||||||
|
|
||||||
|
export default VitePluginFonts;
|
||||||
|
export { VitePluginFonts as Plugin, VitePluginFontsOptions };
|
138
node_modules/.pnpm/vite-plugin-fonts@0.2.2/node_modules/vite-plugin-fonts/dist/index.js
generated
vendored
Normal file
138
node_modules/.pnpm/vite-plugin-fonts@0.2.2/node_modules/vite-plugin-fonts/dist/index.js
generated
vendored
Normal file
@ -0,0 +1,138 @@
|
|||||||
|
"use strict";Object.defineProperty(exports, "__esModule", {value: true});// src/google-fonts.ts
|
||||||
|
var GoogleFontsBase = "https://fonts.googleapis.com/css2";
|
||||||
|
function injectFonts({
|
||||||
|
families,
|
||||||
|
text,
|
||||||
|
preconnect = true,
|
||||||
|
display = "swap"
|
||||||
|
}) {
|
||||||
|
const specs = [];
|
||||||
|
const deferedSpecs = [];
|
||||||
|
const tags = [];
|
||||||
|
if (!Array.isArray(families)) {
|
||||||
|
console.warn("Google font families is required");
|
||||||
|
return tags;
|
||||||
|
}
|
||||||
|
if (families.length >= 0) {
|
||||||
|
for (const family of families) {
|
||||||
|
if (typeof family === "string") {
|
||||||
|
deferedSpecs.push(family);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if (!family)
|
||||||
|
continue;
|
||||||
|
const {
|
||||||
|
name,
|
||||||
|
styles,
|
||||||
|
defer = true
|
||||||
|
} = family;
|
||||||
|
if (!name) {
|
||||||
|
console.warn("A google font family name is missing");
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
let spec = name;
|
||||||
|
if (typeof styles === "string")
|
||||||
|
spec += `:${styles}`;
|
||||||
|
if (defer)
|
||||||
|
deferedSpecs.push(spec);
|
||||||
|
else
|
||||||
|
specs.push(spec);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (preconnect && specs.length + deferedSpecs.length > 0) {
|
||||||
|
tags.push({
|
||||||
|
tag: "link",
|
||||||
|
attrs: {
|
||||||
|
rel: "preconnect",
|
||||||
|
href: "https://fonts.gstatic.com/",
|
||||||
|
crossorigin: true
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
if (deferedSpecs.length > 0) {
|
||||||
|
let href = `${GoogleFontsBase}?family=${deferedSpecs.join("&family=")}`;
|
||||||
|
if (typeof display === "string" && display !== "auto")
|
||||||
|
href += `&display=${display}`;
|
||||||
|
if (typeof text === "string" && text.length > 0)
|
||||||
|
href += `&text=${text}`;
|
||||||
|
tags.push({
|
||||||
|
tag: "link",
|
||||||
|
attrs: {
|
||||||
|
rel: "preload",
|
||||||
|
as: "style",
|
||||||
|
onload: "this.rel='stylesheet'",
|
||||||
|
href
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
if (specs.length > 0) {
|
||||||
|
let href = `${GoogleFontsBase}?family=${specs.join("&family=")}`;
|
||||||
|
if (typeof display === "string" && display !== "auto")
|
||||||
|
href += `&display=${display}`;
|
||||||
|
if (typeof text === "string" && text.length > 0)
|
||||||
|
href += `&text=${text}`;
|
||||||
|
tags.push({
|
||||||
|
tag: "link",
|
||||||
|
attrs: {
|
||||||
|
rel: "stylesheet",
|
||||||
|
href
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
return tags;
|
||||||
|
}
|
||||||
|
var google_fonts_default = injectFonts;
|
||||||
|
|
||||||
|
// src/typekit.ts
|
||||||
|
var TypekitFontBase = "https://use.typekit.net/";
|
||||||
|
function injectFonts2({
|
||||||
|
id,
|
||||||
|
defer = true
|
||||||
|
}) {
|
||||||
|
const tags = [];
|
||||||
|
if (typeof id !== "string") {
|
||||||
|
console.warn("A Typekit id is required");
|
||||||
|
return tags;
|
||||||
|
}
|
||||||
|
if (defer) {
|
||||||
|
tags.push({
|
||||||
|
tag: "link",
|
||||||
|
attrs: {
|
||||||
|
rel: "preload",
|
||||||
|
as: "style",
|
||||||
|
onload: "this.rel='stylesheet'",
|
||||||
|
href: `${TypekitFontBase}${id}.css`
|
||||||
|
}
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
tags.push({
|
||||||
|
tag: "link",
|
||||||
|
attrs: {
|
||||||
|
rel: "stylesheet",
|
||||||
|
href: `${TypekitFontBase}${id}.css`
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
return tags;
|
||||||
|
}
|
||||||
|
var typekit_default = injectFonts2;
|
||||||
|
|
||||||
|
// src/index.ts
|
||||||
|
function VitePluginFonts(options = {}) {
|
||||||
|
return {
|
||||||
|
name: "vite-plugin-fonts",
|
||||||
|
transformIndexHtml() {
|
||||||
|
const tags = [];
|
||||||
|
if (options.typekit)
|
||||||
|
tags.push(...typekit_default(options.typekit));
|
||||||
|
if (options.google)
|
||||||
|
tags.push(...google_fonts_default(options.google));
|
||||||
|
return tags;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
var src_default = VitePluginFonts;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
exports.Plugin = VitePluginFonts; exports.default = src_default;
|
138
node_modules/.pnpm/vite-plugin-fonts@0.2.2/node_modules/vite-plugin-fonts/dist/index.mjs
generated
vendored
Normal file
138
node_modules/.pnpm/vite-plugin-fonts@0.2.2/node_modules/vite-plugin-fonts/dist/index.mjs
generated
vendored
Normal file
@ -0,0 +1,138 @@
|
|||||||
|
// src/google-fonts.ts
|
||||||
|
var GoogleFontsBase = "https://fonts.googleapis.com/css2";
|
||||||
|
function injectFonts({
|
||||||
|
families,
|
||||||
|
text,
|
||||||
|
preconnect = true,
|
||||||
|
display = "swap"
|
||||||
|
}) {
|
||||||
|
const specs = [];
|
||||||
|
const deferedSpecs = [];
|
||||||
|
const tags = [];
|
||||||
|
if (!Array.isArray(families)) {
|
||||||
|
console.warn("Google font families is required");
|
||||||
|
return tags;
|
||||||
|
}
|
||||||
|
if (families.length >= 0) {
|
||||||
|
for (const family of families) {
|
||||||
|
if (typeof family === "string") {
|
||||||
|
deferedSpecs.push(family);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if (!family)
|
||||||
|
continue;
|
||||||
|
const {
|
||||||
|
name,
|
||||||
|
styles,
|
||||||
|
defer = true
|
||||||
|
} = family;
|
||||||
|
if (!name) {
|
||||||
|
console.warn("A google font family name is missing");
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
let spec = name;
|
||||||
|
if (typeof styles === "string")
|
||||||
|
spec += `:${styles}`;
|
||||||
|
if (defer)
|
||||||
|
deferedSpecs.push(spec);
|
||||||
|
else
|
||||||
|
specs.push(spec);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (preconnect && specs.length + deferedSpecs.length > 0) {
|
||||||
|
tags.push({
|
||||||
|
tag: "link",
|
||||||
|
attrs: {
|
||||||
|
rel: "preconnect",
|
||||||
|
href: "https://fonts.gstatic.com/",
|
||||||
|
crossorigin: true
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
if (deferedSpecs.length > 0) {
|
||||||
|
let href = `${GoogleFontsBase}?family=${deferedSpecs.join("&family=")}`;
|
||||||
|
if (typeof display === "string" && display !== "auto")
|
||||||
|
href += `&display=${display}`;
|
||||||
|
if (typeof text === "string" && text.length > 0)
|
||||||
|
href += `&text=${text}`;
|
||||||
|
tags.push({
|
||||||
|
tag: "link",
|
||||||
|
attrs: {
|
||||||
|
rel: "preload",
|
||||||
|
as: "style",
|
||||||
|
onload: "this.rel='stylesheet'",
|
||||||
|
href
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
if (specs.length > 0) {
|
||||||
|
let href = `${GoogleFontsBase}?family=${specs.join("&family=")}`;
|
||||||
|
if (typeof display === "string" && display !== "auto")
|
||||||
|
href += `&display=${display}`;
|
||||||
|
if (typeof text === "string" && text.length > 0)
|
||||||
|
href += `&text=${text}`;
|
||||||
|
tags.push({
|
||||||
|
tag: "link",
|
||||||
|
attrs: {
|
||||||
|
rel: "stylesheet",
|
||||||
|
href
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
return tags;
|
||||||
|
}
|
||||||
|
var google_fonts_default = injectFonts;
|
||||||
|
|
||||||
|
// src/typekit.ts
|
||||||
|
var TypekitFontBase = "https://use.typekit.net/";
|
||||||
|
function injectFonts2({
|
||||||
|
id,
|
||||||
|
defer = true
|
||||||
|
}) {
|
||||||
|
const tags = [];
|
||||||
|
if (typeof id !== "string") {
|
||||||
|
console.warn("A Typekit id is required");
|
||||||
|
return tags;
|
||||||
|
}
|
||||||
|
if (defer) {
|
||||||
|
tags.push({
|
||||||
|
tag: "link",
|
||||||
|
attrs: {
|
||||||
|
rel: "preload",
|
||||||
|
as: "style",
|
||||||
|
onload: "this.rel='stylesheet'",
|
||||||
|
href: `${TypekitFontBase}${id}.css`
|
||||||
|
}
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
tags.push({
|
||||||
|
tag: "link",
|
||||||
|
attrs: {
|
||||||
|
rel: "stylesheet",
|
||||||
|
href: `${TypekitFontBase}${id}.css`
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
return tags;
|
||||||
|
}
|
||||||
|
var typekit_default = injectFonts2;
|
||||||
|
|
||||||
|
// src/index.ts
|
||||||
|
function VitePluginFonts(options = {}) {
|
||||||
|
return {
|
||||||
|
name: "vite-plugin-fonts",
|
||||||
|
transformIndexHtml() {
|
||||||
|
const tags = [];
|
||||||
|
if (options.typekit)
|
||||||
|
tags.push(...typekit_default(options.typekit));
|
||||||
|
if (options.google)
|
||||||
|
tags.push(...google_fonts_default(options.google));
|
||||||
|
return tags;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
var src_default = VitePluginFonts;
|
||||||
|
export {
|
||||||
|
VitePluginFonts as Plugin,
|
||||||
|
src_default as default
|
||||||
|
};
|
34
node_modules/.pnpm/vite-plugin-fonts@0.2.2/node_modules/vite-plugin-fonts/package.json
generated
vendored
Normal file
34
node_modules/.pnpm/vite-plugin-fonts@0.2.2/node_modules/vite-plugin-fonts/package.json
generated
vendored
Normal file
@ -0,0 +1,34 @@
|
|||||||
|
{
|
||||||
|
"name": "vite-plugin-fonts",
|
||||||
|
"version": "0.2.2",
|
||||||
|
"description": "Webfont loader for vite",
|
||||||
|
"author": "stafyniaksacha",
|
||||||
|
"repository": "stafyniaksacha/vite-plugin-fonts",
|
||||||
|
"license": "MIT",
|
||||||
|
"main": "dist/index.js",
|
||||||
|
"module": "dist/index.mjs",
|
||||||
|
"types": "dist/index.d.ts",
|
||||||
|
"files": [
|
||||||
|
"dist"
|
||||||
|
],
|
||||||
|
"scripts": {
|
||||||
|
"dev": "npm run build -- --watch",
|
||||||
|
"example:dev": "npm -C example run dev",
|
||||||
|
"example:build": "npm -C example run build",
|
||||||
|
"build": "tsup src/index.ts --dts --format cjs,esm",
|
||||||
|
"lint": "eslint --ext .ts ./src",
|
||||||
|
"lint:fix": "eslint --fix --ext .ts ./src"
|
||||||
|
},
|
||||||
|
"peerDependencies": {
|
||||||
|
"vite": "^2.0.0"
|
||||||
|
},
|
||||||
|
"devDependencies": {
|
||||||
|
"@antfu/eslint-config-ts": "^0.5.0",
|
||||||
|
"@typescript-eslint/eslint-plugin": "^4.17.0",
|
||||||
|
"eslint": "^7.22.0",
|
||||||
|
"eslint-plugin-eslint-comments": "^3.2.0",
|
||||||
|
"tsup": "^4.6.1",
|
||||||
|
"typescript": "^4.2.3",
|
||||||
|
"vite": "^2.0.5"
|
||||||
|
}
|
||||||
|
}
|
1
node_modules/vite-plugin-fonts
generated
vendored
Symbolic link
1
node_modules/vite-plugin-fonts
generated
vendored
Symbolic link
@ -0,0 +1 @@
|
|||||||
|
.pnpm/vite-plugin-fonts@0.2.2/node_modules/vite-plugin-fonts
|
5
package.json
Normal file
5
package.json
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
{
|
||||||
|
"devDependencies": {
|
||||||
|
"vite-plugin-fonts": "^0.2.2"
|
||||||
|
}
|
||||||
|
}
|
15
pnpm-lock.yaml
Normal file
15
pnpm-lock.yaml
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
lockfileVersion: 5.3
|
||||||
|
|
||||||
|
specifiers:
|
||||||
|
vite-plugin-fonts: ^0.2.2
|
||||||
|
|
||||||
|
devDependencies:
|
||||||
|
vite-plugin-fonts: 0.2.2
|
||||||
|
|
||||||
|
packages:
|
||||||
|
|
||||||
|
/vite-plugin-fonts/0.2.2:
|
||||||
|
resolution: {integrity: sha512-fhzhsrTiuzlDjSO6g5sV5EVIIvbb8lmsaIY6eUTBM4lcF55x40UBpHrcyvNwIhQG211g0lu83XC7oZlkmvdkMA==}
|
||||||
|
peerDependencies:
|
||||||
|
vite: ^2.0.0
|
||||||
|
dev: true
|
Loading…
Reference in New Issue
Block a user