Compare commits
4 Commits
9fbedf12b1
...
e624c09664
| Author | SHA1 | Date | |
|---|---|---|---|
| e624c09664 | |||
| d5b9b5ac6a | |||
| 029310a027 | |||
| 88bd68d93e |
@@ -11,6 +11,7 @@
|
||||
r = reset
|
||||
s = status
|
||||
cleanup = "!output=$(git fetch -p && git branch -vv | grep ': gone]' | grep -v '*' | awk '{ print $1 }' | xargs -r git branch -d) && if [[ -z \"$output\" ]]; then echo 'No unparented branches deleted'; else echo \"$output\"; fi"
|
||||
cleanup-hard = "!output=$(git fetch -p && git branch -vv | grep ': gone]' | grep -v '*' | awk '{ print $1 }' | xargs -r git branch -D) && if [[ -z \"$output\" ]]; then echo 'No unparented branches deleted'; else echo \"$output\"; fi"
|
||||
[credential "https://git.zacke.dev"]
|
||||
provider = generic
|
||||
[push]
|
||||
|
||||
11
.profile.ps1
11
.profile.ps1
@@ -6,6 +6,17 @@ oh-my-posh init pwsh --config "$HOME/.theme.omp.json" | Invoke-Expression
|
||||
# setup fnm
|
||||
fnm env --use-on-cd --shell powershell | Out-String | Invoke-Expression
|
||||
|
||||
wezterm cli set-tab-title "unnamed tab"
|
||||
|
||||
function Set-Title {
|
||||
param(
|
||||
[string]$title
|
||||
)
|
||||
wezterm cli set-tab-title $title
|
||||
}
|
||||
Set-Alias -Name title -Value Set-Title
|
||||
|
||||
|
||||
# Functions
|
||||
function cdli {
|
||||
Set-Location "C:\repos\litium"
|
||||
|
||||
@@ -6,8 +6,9 @@
|
||||
--local node_version = vim.fn.system('nvm current'):gsub('\n[^\n]*$', '') -- remove line endings
|
||||
--local vue_typescript_plugin_path = vim.fs.normalize(nvm_bin .. '\\' .. node_version .. '\\node_modules\\@vue\\typescript-plugin')
|
||||
local vue_typescript_plugin_path = vim.fs.normalize '~/node_modules/@vue/typescript-plugin'
|
||||
local vue_language_server_path = vim.fn.stdpath 'data' .. '/mason/packages/vue-language-server/node_modules/@vue/language-server'
|
||||
|
||||
print(vue_typescript_plugin_path)
|
||||
print(vue_language_server_path)
|
||||
|
||||
-- "<leader>sh" to [s]earch the [h]elp documentation.
|
||||
|
||||
@@ -541,29 +542,48 @@ require('lazy').setup({
|
||||
}
|
||||
|
||||
local servers = {
|
||||
ts_ls = {
|
||||
init_options = {
|
||||
hostInfo = 'neovim',
|
||||
plugins = {
|
||||
{
|
||||
name = '@vue/typescript-plugin',
|
||||
--location = '', -- use local node_modules path
|
||||
location = vue_typescript_plugin_path,
|
||||
languages = { 'vue', 'javascript', 'typescript' },
|
||||
--ts_ls = {
|
||||
-- init_options = {
|
||||
-- hostInfo = 'neovim',
|
||||
-- plugins = {
|
||||
-- {
|
||||
-- name = '@vue/typescript-plugin',
|
||||
-- --location = '', -- use local node_modules path
|
||||
-- location = vue_typescript_plugin_path,
|
||||
-- languages = { 'vue', 'javascript', 'typescript' },
|
||||
-- },
|
||||
-- },
|
||||
-- },
|
||||
-- filetypes = { 'javascript', 'javascriptreact', 'javascript.jsx', 'typescript', 'typescriptreact', 'typescript.tsx', 'vue' },
|
||||
--},
|
||||
-- Volar is deprecated in favor of vue_ls
|
||||
--volar = {
|
||||
-- filetypes = { 'typescript', 'javascript', 'javascriptreact', 'typescriptreact', 'vue' },
|
||||
-- init_options = {
|
||||
-- vue = {
|
||||
-- -- disable hybrid mode
|
||||
-- hybridMode = true,
|
||||
-- },
|
||||
-- },
|
||||
--}, -- hybrid mode is default
|
||||
vue_ls = {},
|
||||
vtsls = {
|
||||
filetypes = { 'typescript', 'javascript', 'javascriptreact', 'typescriptreact', 'vue' },
|
||||
settings = {
|
||||
vtsls = {
|
||||
tsserver = {
|
||||
globalPlugins = {
|
||||
{
|
||||
name = '@vue/typescript-plugin',
|
||||
location = vue_language_server_path,
|
||||
languages = { 'vue' },
|
||||
configNamespace = 'typescript',
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
filetypes = { 'javascript', 'javascriptreact', 'javascript.jsx', 'typescript', 'typescriptreact', 'typescript.tsx', 'vue' },
|
||||
},
|
||||
volar = {
|
||||
filetypes = { 'typescript', 'javascript', 'javascriptreact', 'typescriptreact', 'vue' },
|
||||
init_options = {
|
||||
vue = {
|
||||
-- disable hybrid mode
|
||||
hybridMode = true,
|
||||
},
|
||||
},
|
||||
}, -- hybrid mode is default
|
||||
eslint = {
|
||||
flags = { debounce_text_changes = 500 },
|
||||
-- on_attach = function(client, bufnr)
|
||||
@@ -712,7 +732,7 @@ require('lazy').setup({
|
||||
version = '1.*',
|
||||
dependencies = {
|
||||
-- Copilot blink integration
|
||||
'fang2hou/blink-copilot',
|
||||
--'fang2hou/blink-copilot',
|
||||
-- Snippet Engine
|
||||
{
|
||||
'L3MON4D3/LuaSnip',
|
||||
@@ -793,15 +813,16 @@ require('lazy').setup({
|
||||
},
|
||||
|
||||
sources = {
|
||||
default = { 'copilot', 'lsp', 'path', 'lazydev', 'snippets' },
|
||||
--default = { 'copilot', 'lsp', 'path', 'lazydev', 'snippets' },
|
||||
default = { 'lsp', 'path', 'lazydev', 'snippets' },
|
||||
providers = {
|
||||
copilot = {
|
||||
name = 'copilot',
|
||||
module = 'blink-copilot',
|
||||
score_offset = 1000,
|
||||
async = true,
|
||||
max_items = 1,
|
||||
},
|
||||
--copilot = {
|
||||
-- name = 'copilot',
|
||||
-- module = 'blink-copilot',
|
||||
-- score_offset = 1000,
|
||||
-- async = true,
|
||||
-- max_items = 1,
|
||||
--},
|
||||
lsp = { score_offset = 0 },
|
||||
-- Lazydev gives autocompletion for lua, imported libraries and ---@module "nvim-treesitter" statements
|
||||
lazydev = { module = 'lazydev.integrations.blink', score_offset = 0, max_items = 5 },
|
||||
|
||||
@@ -1,37 +1,35 @@
|
||||
{
|
||||
"LuaSnip": { "branch": "master", "commit": "458560534a73f7f8d7a11a146c801db00b081df0" },
|
||||
"blink-copilot": { "branch": "main", "commit": "bdc45bbbed2ec252b3a29f4adecf031e157b5573" },
|
||||
"blink.cmp": { "branch": "main", "commit": "022521a8910a5543b0251b21c9e1a1e989745796" },
|
||||
"catppuccin": { "branch": "main", "commit": "1bf070129c0b6f77cc23f6a2212dcdc868308c52" },
|
||||
"conform.nvim": { "branch": "master", "commit": "2b2b30260203af3b93a7470ac6c8457ddd6e32d9" },
|
||||
"copilot.lua": { "branch": "master", "commit": "0929c92097a49b6ae3565aab157fa2bce398d953" },
|
||||
"blink.cmp": { "branch": "main", "commit": "586ee87534f5bf65f1c8dea2d1da2a57e8cddd36" },
|
||||
"catppuccin": { "branch": "main", "commit": "fa42eb5e26819ef58884257d5ae95dd0552b9a66" },
|
||||
"conform.nvim": { "branch": "master", "commit": "973f3cb73887d510321653044791d7937c7ec0fa" },
|
||||
"fidget.nvim": { "branch": "main", "commit": "d9ba6b7bfe29b3119a610892af67602641da778e" },
|
||||
"friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" },
|
||||
"gitsigns.nvim": { "branch": "main", "commit": "e399f9748d7cfd8859747c8d6c4e9c8b4d50a1bd" },
|
||||
"gitsigns.nvim": { "branch": "main", "commit": "d20209a154a8d11710607899b24a0698085b35cf" },
|
||||
"indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" },
|
||||
"lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
|
||||
"lazydev.nvim": { "branch": "main", "commit": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c" },
|
||||
"markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" },
|
||||
"mason-lspconfig.nvim": { "branch": "main", "commit": "d39a75bbce4b8aad5d627191ea915179c77c100f" },
|
||||
"mason-lspconfig.nvim": { "branch": "main", "commit": "bc743e4f3dc4b6d22b0a9e0b68a6664d93f8a694" },
|
||||
"mason-nvim-dap.nvim": { "branch": "main", "commit": "4c2cdc69d69fe00c15ae8648f7e954d99e5de3ea" },
|
||||
"mason-tool-installer.nvim": { "branch": "main", "commit": "75d60a8f928decd8b38897f80849768b7c540a5b" },
|
||||
"mason.nvim": { "branch": "main", "commit": "7c7318e8bae7e3536ef6b9e86b9e38e74f2e125e" },
|
||||
"mini.nvim": { "branch": "main", "commit": "009435c6c3653d54bc62997ca6b2e8513bc52cf4" },
|
||||
"neo-tree.nvim": { "branch": "main", "commit": "f481de16a0eb59c985abac8985e3f2e2f75b4875" },
|
||||
"nui.nvim": { "branch": "main", "commit": "f535005e6ad1016383f24e39559833759453564e" },
|
||||
"nvim-autopairs": { "branch": "master", "commit": "4d74e75913832866aa7de35e4202463ddf6efd1b" },
|
||||
"nvim-dap": { "branch": "master", "commit": "8df427aeba0a06c6577dc3ab82de3076964e3b8d" },
|
||||
"nvim-dap-go": { "branch": "main", "commit": "8763ced35b19c8dc526e04a70ab07c34e11ad064" },
|
||||
"mason-tool-installer.nvim": { "branch": "main", "commit": "517ef5994ef9d6b738322664d5fdd948f0fdeb46" },
|
||||
"mason.nvim": { "branch": "main", "commit": "8024d64e1330b86044fed4c8494ef3dcd483a67c" },
|
||||
"mini.nvim": { "branch": "main", "commit": "ec0fc48de7408f1fc09b1ee2a87484396032dbb4" },
|
||||
"neo-tree.nvim": { "branch": "main", "commit": "cea666ef965884414b1b71f6b39a537f9238bdb2" },
|
||||
"nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
|
||||
"nvim-autopairs": { "branch": "master", "commit": "23320e75953ac82e559c610bec5a90d9c6dfa743" },
|
||||
"nvim-dap": { "branch": "master", "commit": "cc77338e6e34c79f1c638f51ae4160dc9bfb05de" },
|
||||
"nvim-dap-go": { "branch": "main", "commit": "b4421153ead5d726603b02743ea40cf26a51ed5f" },
|
||||
"nvim-dap-python": { "branch": "master", "commit": "261ce649d05bc455a29f9636dc03f8cdaa7e0e2c" },
|
||||
"nvim-dap-ui": { "branch": "master", "commit": "73a26abf4941aa27da59820fd6b028ebcdbcf932" },
|
||||
"nvim-dap-virtual-text": { "branch": "master", "commit": "df66808cd78b5a97576bbaeee95ed5ca385a9750" },
|
||||
"nvim-lint": { "branch": "master", "commit": "fdb04e9285edefbe25a02a31a35e8fbb10fe054d" },
|
||||
"nvim-lspconfig": { "branch": "master", "commit": "ac1dfbe3b60e5e23a2cff90e3bd6a3bc88031a57" },
|
||||
"nvim-dap-ui": { "branch": "master", "commit": "cf91d5e2d07c72903d052f5207511bf7ecdb7122" },
|
||||
"nvim-dap-virtual-text": { "branch": "master", "commit": "fbdb48c2ed45f4a8293d0d483f7730d24467ccb6" },
|
||||
"nvim-lint": { "branch": "master", "commit": "3c5e34c24834a67b1cb37600ab7663eefd2b0390" },
|
||||
"nvim-lspconfig": { "branch": "master", "commit": "5bb3fb4a63eb38361f3f992618f65dd4fa52e72b" },
|
||||
"nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" },
|
||||
"nvim-treesitter": { "branch": "master", "commit": "066fd6505377e3fd4aa219e61ce94c2b8bdb0b79" },
|
||||
"nvim-web-devicons": { "branch": "master", "commit": "d360317f8f509b99229bb31d42269987696df6ff" },
|
||||
"nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
|
||||
"nvim-web-devicons": { "branch": "master", "commit": "0422a19d9aa3aad2c7e5cca167e5407b13407a9d" },
|
||||
"plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
|
||||
"roslyn.nvim": { "branch": "main", "commit": "8dc729a651ae980088246caf651e5ff24e21077a" },
|
||||
"roslyn.nvim": { "branch": "main", "commit": "3056635ed6ebe5035c94a7c8d0d362e95817839e" },
|
||||
"telescope-fzf-native.nvim": { "branch": "main", "commit": "1f08ed60cafc8f6168b72b80be2b2ea149813e55" },
|
||||
"telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" },
|
||||
"telescope.nvim": { "branch": "master", "commit": "b4da76be54691e854d3e0e02c36b0245f945c2c7" },
|
||||
|
||||
@@ -4,35 +4,35 @@
|
||||
-- See the kickstart.nvim README for more information
|
||||
return {
|
||||
-- Configure copilot
|
||||
{
|
||||
'zbirenbaum/copilot.lua',
|
||||
cmd = 'Copilot',
|
||||
build = ':Copilot auth',
|
||||
event = 'InsertEnter',
|
||||
config = function()
|
||||
require('copilot').setup {
|
||||
suggestion = { enabled = false },
|
||||
panel = { enabled = false },
|
||||
filetypes = {
|
||||
markdown = true,
|
||||
help = true,
|
||||
},
|
||||
}
|
||||
|
||||
vim.api.nvim_create_autocmd('User', {
|
||||
pattern = 'BlinkCmpMenuOpen',
|
||||
callback = function()
|
||||
vim.b.copilot_suggestion_hidden = true
|
||||
end,
|
||||
})
|
||||
vim.api.nvim_create_autocmd('User', {
|
||||
pattern = 'BlinkCmpMenuClose',
|
||||
callback = function()
|
||||
vim.b.copilot_suggestion_hidden = false
|
||||
end,
|
||||
})
|
||||
end,
|
||||
},
|
||||
-- {
|
||||
-- 'zbirenbaum/copilot.lua',
|
||||
-- cmd = 'Copilot',
|
||||
-- build = ':Copilot auth',
|
||||
-- event = 'InsertEnter',
|
||||
-- config = function()
|
||||
-- require('copilot').setup {
|
||||
-- suggestion = { enabled = false },
|
||||
-- panel = { enabled = false },
|
||||
-- filetypes = {
|
||||
-- markdown = true,
|
||||
-- help = true,
|
||||
-- },
|
||||
-- }
|
||||
--
|
||||
-- vim.api.nvim_create_autocmd('User', {
|
||||
-- pattern = 'BlinkCmpMenuOpen',
|
||||
-- callback = function()
|
||||
-- vim.b.copilot_suggestion_hidden = true
|
||||
-- end,
|
||||
-- })
|
||||
-- vim.api.nvim_create_autocmd('User', {
|
||||
-- pattern = 'BlinkCmpMenuClose',
|
||||
-- callback = function()
|
||||
-- vim.b.copilot_suggestion_hidden = false
|
||||
-- end,
|
||||
-- })
|
||||
-- end,
|
||||
-- },
|
||||
{
|
||||
'iamcco/markdown-preview.nvim',
|
||||
cmd = { 'MarkdownPreviewToggle', 'MarkdownPreview', 'MarkdownPreviewStop' },
|
||||
|
||||
@@ -7,9 +7,9 @@ return {
|
||||
local lint = require 'lint'
|
||||
lint.linters_by_ft = {
|
||||
markdown = { 'markdownlint' },
|
||||
javascript = { 'eslint_d' },
|
||||
typescript = { 'eslint_d' },
|
||||
vue = { 'eslint_d' },
|
||||
-- javascript = { 'eslint_d' },
|
||||
-- typescript = { 'eslint_d' },
|
||||
-- vue = { 'eslint_d' },
|
||||
}
|
||||
|
||||
-- To allow other plugins to add linters to require('lint').linters_by_ft,
|
||||
|
||||
Reference in New Issue
Block a user