Compare commits
15 Commits
fe02946bb2
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3522c28620 | ||
|
|
0fc8a32863 | ||
|
|
5f37db4f8b | ||
|
|
a730958ba9 | ||
|
|
16ad70f2ce | ||
|
|
e9fc5490ac | ||
|
|
51bb7213d0 | ||
|
|
8006bc52e8 | ||
|
|
2f9cbf29fa | ||
|
|
6720c8c765 | ||
|
|
301a265080 | ||
|
|
04b8487bab | ||
|
|
e7386248da | ||
|
|
aece909028 | ||
|
|
800e892b6e |
@@ -1,4 +1,7 @@
|
||||
# 💤 LazyVim Config
|
||||
## [Gitea](https://gitea.routinedevelopment.ca/DaveanandMannie/lazy_config)
|
||||
## [Github mirror](https://github.com/DaveanandMannie/my_lazy_config)
|
||||
|
||||
# 💤 LazyVim Config (out of sync)
|
||||
|
||||
This is my personal **LazyVim** configuration, designed to run seamlessly on both
|
||||
**WSL (Windows)** and **bare-metal Linux** environments. It also integrates
|
||||
|
||||
@@ -1,11 +1,5 @@
|
||||
{
|
||||
"$schema": "https://biomejs.dev/schemas/2.0.6/schema.json",
|
||||
"formatter": {
|
||||
"enabled": true,
|
||||
"indentStyle": "space",
|
||||
"indentWidth": 4,
|
||||
"lineWidth": 120
|
||||
},
|
||||
"$schema": "https://biomejs.dev/schemas/2.2.6/schema.json",
|
||||
"linter": {
|
||||
"enabled": true,
|
||||
"rules": {
|
||||
@@ -18,8 +12,46 @@
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
"vcs": {
|
||||
"enabled": true,
|
||||
"clientKind": "git"
|
||||
},
|
||||
|
||||
"javascript": {
|
||||
"formatter": {
|
||||
"enabled": true,
|
||||
"indentStyle": "space",
|
||||
"indentWidth": 4,
|
||||
"lineWidth": 100
|
||||
},
|
||||
|
||||
"linter": {
|
||||
"enabled": true
|
||||
},
|
||||
"assist": {
|
||||
"enabled": true
|
||||
}
|
||||
},
|
||||
"css": {
|
||||
"formatter": {
|
||||
"enabled": true,
|
||||
"indentWidth": 2,
|
||||
"indentStyle": "space"
|
||||
},
|
||||
"linter": {
|
||||
"enabled": true
|
||||
},
|
||||
"assist": {
|
||||
"enabled": true
|
||||
}
|
||||
},
|
||||
"json": {
|
||||
"formatter": {
|
||||
"enabled": true,
|
||||
"indentStyle": "space",
|
||||
"indentWidth": 4,
|
||||
"expand": "always"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,15 +2,15 @@
|
||||
local wezterm = require("wezterm")
|
||||
local config = wezterm.config_builder()
|
||||
-- workspace dir default
|
||||
config.default_cwd = os.getenv("HOMEPATH") or os.getenv("HOME").. "/workspace"
|
||||
config.default_cwd = os.getenv("HOMEPATH") or os.getenv("HOME") .. "/workspace"
|
||||
-- default term prog can be changed with cli args
|
||||
if os.getenv("pwsh") then
|
||||
config.default_prog = { "pwsh" }
|
||||
config.default_prog = { "pwsh" }
|
||||
end
|
||||
|
||||
--styles
|
||||
config.harfbuzz_features = { "calt=1", "clig=1", "liga=1" }
|
||||
config.font = wezterm.font("JetBrainsMono NF", { weight = "Bold" , style = "Italic"})
|
||||
config.font = wezterm.font("JetBrainsMono NF", { weight = "Bold", style = "Italic" })
|
||||
-- config.font_size = 14
|
||||
config.color_scheme = "Sakura"
|
||||
config.window_padding = {
|
||||
@@ -20,7 +20,7 @@ config.window_padding = {
|
||||
bottom = "0cell",
|
||||
}
|
||||
-- pane
|
||||
config.colors = { split = '#E858F5' }
|
||||
config.colors = { split = "#E858F5" }
|
||||
config.inactive_pane_hsb = {
|
||||
saturation = 0.7,
|
||||
brightness = 0.8,
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
{
|
||||
"LazyVim": { "branch": "main", "commit": "28db03f958d58dfff3c647ce28fdc1cb88ac158d" },
|
||||
"SchemaStore.nvim": { "branch": "main", "commit": "f35b7747d4d536fba96aa098a4144e5c85252828" },
|
||||
"blink.cmp": { "branch": "main", "commit": "b19413d214068f316c78978b08264ed1c41830ec" },
|
||||
"bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" },
|
||||
"catppuccin": { "branch": "main", "commit": "beaf41a30c26fd7d6c386d383155cbd65dd554cd" },
|
||||
@@ -12,7 +11,6 @@
|
||||
"lazy.nvim": { "branch": "main", "commit": "85c7ff3711b730b4030d03144f6db6375044ae82" },
|
||||
"lazydev.nvim": { "branch": "main", "commit": "5231c62aa83c2f8dc8e7ba957aa77098cda1257d" },
|
||||
"lualine.nvim": { "branch": "master", "commit": "47f91c416daef12db467145e16bed5bbfe00add8" },
|
||||
"markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" },
|
||||
"mason-lspconfig.nvim": { "branch": "main", "commit": "fe661093f4b05136437b531e7f959af2a2ae66c8" },
|
||||
"mason.nvim": { "branch": "main", "commit": "44d1e90e1f66e077268191e3ee9d2ac97cc18e65" },
|
||||
"mini.ai": { "branch": "main", "commit": "bfb26d9072670c3aaefab0f53024b2f3729c8083" },
|
||||
@@ -32,12 +30,11 @@
|
||||
"nvim-ts-autotag": { "branch": "main", "commit": "c4ca798ab95b316a768d51eaaaee48f64a4a46bc" },
|
||||
"persistence.nvim": { "branch": "main", "commit": "b20b2a7887bd39c1a356980b45e03250f3dce49c" },
|
||||
"plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
|
||||
"render-markdown.nvim": { "branch": "main", "commit": "73a6ebc842cf81926eb1d424820b800f6f6a1227" },
|
||||
"snacks.nvim": { "branch": "main", "commit": "fe7cfe9800a182274d0f868a74b7263b8c0c020b" },
|
||||
"todo-comments.nvim": { "branch": "main", "commit": "31e3c38ce9b29781e4422fc0322eb0a21f4e8668" },
|
||||
"tokyonight.nvim": { "branch": "main", "commit": "5da1b76e64daf4c5d410f06bcb6b9cb640da7dfd" },
|
||||
"trouble.nvim": { "branch": "main", "commit": "bd67efe408d4816e25e8491cc5ad4088e708a69a" },
|
||||
"ts-comments.nvim": { "branch": "main", "commit": "123a9fb12e7229342f807ec9e6de478b1102b041" },
|
||||
"venv-selector.nvim": { "branch": "main", "commit": "58bae72c84b9f7f864c879ec1896e384296f9ffb" },
|
||||
"venv-selector.nvim": { "branch": "main", "commit": "321dbbbfc3f1d25dad24c289e853cacd0666f77f" },
|
||||
"which-key.nvim": { "branch": "main", "commit": "3aab2147e74890957785941f0c1ad87d0a44c15a" }
|
||||
}
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
{
|
||||
"extras": [
|
||||
"lazyvim.plugins.extras.lang.json",
|
||||
"lazyvim.plugins.extras.lang.markdown"
|
||||
|
||||
],
|
||||
"install_version": 7,
|
||||
"news": {
|
||||
|
||||
@@ -1,11 +1,3 @@
|
||||
-- Autocmds are automatically loaded on the VeryLazy event
|
||||
-- Default autocmds that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/autocmds.lua
|
||||
-- Add any additional autocmds here
|
||||
vim.api.nvim_create_autocmd("FileType", {
|
||||
pattern = { "lua" },
|
||||
callback = function()
|
||||
vim.bo.tabstop = 2
|
||||
vim.bo.softtabstop = 2
|
||||
vim.bo.shiftwidth = 2
|
||||
end,
|
||||
})
|
||||
|
||||
@@ -20,7 +20,10 @@ require("lazy").setup({
|
||||
{ import = "plugins" },
|
||||
{ import = "plugins.langs.python" },
|
||||
{ import = "plugins.langs.go" },
|
||||
{ import = "plugins.langs.xml_json_html" },
|
||||
{ import = "plugins.langs.ruby" },
|
||||
{ import = "plugins.langs.biome" },
|
||||
{ import = "plugins.langs.xml" },
|
||||
{ import = "plugins.langs.lua" },
|
||||
},
|
||||
defaults = {
|
||||
-- By default, only LazyVim plugins will be lazy-loaded. Your custom plugins will load during startup.
|
||||
|
||||
@@ -27,8 +27,6 @@ local layouts = {
|
||||
},
|
||||
},
|
||||
|
||||
|
||||
|
||||
vs_search = {
|
||||
preview = false,
|
||||
layout = {
|
||||
|
||||
@@ -2,7 +2,7 @@ return {
|
||||
"saghen/blink.cmp",
|
||||
opts = {
|
||||
keymap = {
|
||||
["<Tab>"] = { "select_and_accept", 'fallback' },
|
||||
["<Tab>"] = { "select_and_accept", "fallback" },
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
@@ -1,11 +1,19 @@
|
||||
return {
|
||||
"stevearc/conform.nvim",
|
||||
opts = {
|
||||
-- lsp_formatting = false,
|
||||
-- fallback = false,
|
||||
formatters_by_ft = {
|
||||
python = { "black" },
|
||||
javascript = { "biome" },
|
||||
go = { "goimports", "gofumpt" },
|
||||
xml = { "lemminx" },
|
||||
ruby = { "standardrb" },
|
||||
json = { "biome", "json-lsp" },
|
||||
css = { "biome" },
|
||||
javascript = { "biome" },
|
||||
sql = { "pg_format" },
|
||||
yaml = { "hydra_lsp" },
|
||||
lua = { "stylua" },
|
||||
},
|
||||
},
|
||||
dependencies = {
|
||||
|
||||
11
lua/plugins/langs/biome/nvim-lspconfig.lua
Normal file
11
lua/plugins/langs/biome/nvim-lspconfig.lua
Normal file
@@ -0,0 +1,11 @@
|
||||
return {
|
||||
"neovim/nvim-lspconfig",
|
||||
opts = {
|
||||
servers = {
|
||||
biome = {
|
||||
cmd = { "biome", "lsp-proxy" },
|
||||
filetypes = { "javascript", "css", "json" },
|
||||
},
|
||||
},
|
||||
},
|
||||
}
|
||||
@@ -44,7 +44,7 @@ return {
|
||||
gopls = function(_, opts)
|
||||
-- workaround for gopls not supporting semanticTokensProvider
|
||||
-- https://github.com/golang/go/issues/54531#issuecomment-1464982242
|
||||
LazyVim.lsp.on_attach(function(client, _)
|
||||
Snacks.util.lsp.on({ name = "gopls" }, function(_, client)
|
||||
if not client.server_capabilities.semanticTokensProvider then
|
||||
local semantic = client.config.capabilities.textDocument.semanticTokens
|
||||
client.server_capabilities.semanticTokensProvider = {
|
||||
@@ -56,7 +56,7 @@ return {
|
||||
range = true,
|
||||
}
|
||||
end
|
||||
end, "gopls")
|
||||
end)
|
||||
-- end workaround
|
||||
end,
|
||||
},
|
||||
|
||||
43
lua/plugins/langs/lua/nvim-lspconfig.lua
Normal file
43
lua/plugins/langs/lua/nvim-lspconfig.lua
Normal file
@@ -0,0 +1,43 @@
|
||||
return {
|
||||
"neovim/nvim-lspconfig",
|
||||
opts = {
|
||||
servers = {
|
||||
lua_ls = {
|
||||
settings = {
|
||||
Lua = {
|
||||
runtime = {
|
||||
version = "LuaJIT",
|
||||
},
|
||||
format = {
|
||||
enable = true,
|
||||
defaultConfig = {
|
||||
indent_style = "space",
|
||||
indent_size = "2",
|
||||
max_line_length = "88",
|
||||
},
|
||||
},
|
||||
diagnostics = {
|
||||
globals = { "vim" },
|
||||
},
|
||||
workspace = {
|
||||
library = {
|
||||
vim.env.VIMRUNTIME,
|
||||
},
|
||||
checkThirdParty = false,
|
||||
},
|
||||
telemetry = {
|
||||
enable = false,
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
setup = {
|
||||
lua_ls = function()
|
||||
require("snacks").util.lsp.on({ name = "lua_ls" }, function(_, client)
|
||||
client.server_capabilities.hoverProvider = true
|
||||
end)
|
||||
end,
|
||||
},
|
||||
},
|
||||
}
|
||||
@@ -15,10 +15,7 @@ return {
|
||||
dapui.setup(opts)
|
||||
-- icons
|
||||
|
||||
vim.fn.sign_define(
|
||||
"DapBreakpoint",
|
||||
{ text = "🔴", texthl = "DiagnosticError", linehl = "", numhl = "" }
|
||||
)
|
||||
vim.fn.sign_define("DapBreakpoint", { text = "🔴", texthl = "DiagnosticError", linehl = "", numhl = "" })
|
||||
|
||||
-- Auto open/close UI
|
||||
dap.listeners.after.event_initialized["dapui_config"] = function()
|
||||
|
||||
@@ -4,7 +4,7 @@ local config_path
|
||||
|
||||
-- Determine the config path based on the OS
|
||||
if os_info.is_linux then
|
||||
config_path = os.getenv("HOME") .. "/.config/nvim/ruff.toml"
|
||||
config_path = os.getenv("HOME") .. "/.config/nvim/config_files/ruff.toml"
|
||||
elseif os_info.is_windows then
|
||||
config_path = os.getenv("LOCALAPPDATA") .. "\\nvim\\ruff.toml"
|
||||
end
|
||||
@@ -41,11 +41,17 @@ return {
|
||||
},
|
||||
},
|
||||
},
|
||||
-- setup = {
|
||||
-- basedpyright = function()
|
||||
-- LazyVim.lsp.on_attach(function(client, _)
|
||||
-- client.server_capabilities.hoverProvider = true
|
||||
-- end, "basedpyright")
|
||||
-- },
|
||||
setup = {
|
||||
basedpyright = function()
|
||||
LazyVim.lsp.on_attach(function(client, _)
|
||||
require("snacks").util.lsp.on({ name = "basedpyright" }, function(_, client)
|
||||
client.server_capabilities.hoverProvider = true
|
||||
end, "basedpyright")
|
||||
end)
|
||||
end,
|
||||
},
|
||||
},
|
||||
|
||||
21
lua/plugins/langs/ruby/nvim-lspconfig.lua
Normal file
21
lua/plugins/langs/ruby/nvim-lspconfig.lua
Normal file
@@ -0,0 +1,21 @@
|
||||
return {
|
||||
"neovim/nvim-lspconfig",
|
||||
opts = {
|
||||
servers = {
|
||||
ruby_lsp = {
|
||||
mason = false,
|
||||
single_file_support = false,
|
||||
-- cmd = { os.getenv("HOME") .. "/.rbenv/shims/ruby-lsp" },
|
||||
init_options = { enabledFeatures = { formatter = "none", linters = {} } },
|
||||
settings = {
|
||||
ruby = {
|
||||
diagnostics = {
|
||||
rubocop = false,
|
||||
},
|
||||
},
|
||||
},
|
||||
formatter = false,
|
||||
},
|
||||
},
|
||||
},
|
||||
}
|
||||
56
lua/plugins/langs/xml/nvim-lspconfig.lua
Normal file
56
lua/plugins/langs/xml/nvim-lspconfig.lua
Normal file
@@ -0,0 +1,56 @@
|
||||
-- return {
|
||||
-- "neovim/nvim-lspconfig",
|
||||
-- opts = {
|
||||
-- servers = {
|
||||
-- lemminx = {
|
||||
-- init_options = {
|
||||
-- settings = {
|
||||
-- xml = {
|
||||
-- format = {
|
||||
-- enabled = true,
|
||||
-- splitAttributes = false,
|
||||
-- },
|
||||
-- validation = {
|
||||
-- noGrammar = "ignore",
|
||||
-- },
|
||||
-- },
|
||||
-- },
|
||||
-- },
|
||||
-- },
|
||||
-- },
|
||||
-- },
|
||||
-- }
|
||||
--
|
||||
|
||||
return {
|
||||
"neovim/nvim-lspconfig",
|
||||
opts = {
|
||||
servers = {
|
||||
lemminx = {
|
||||
init_options = {
|
||||
settings = {
|
||||
xml = {
|
||||
format = {
|
||||
enabled = true,
|
||||
enforceQuoteStyle = "preferred",
|
||||
maxLineWidth = 140,
|
||||
splitAttributes = "preserve",
|
||||
preserveAttributeLineBreaks = true,
|
||||
-- respect new lines
|
||||
preservedNewlines = 2,
|
||||
joinContentLines = false,
|
||||
experimental = true,
|
||||
},
|
||||
preferences = {
|
||||
quoteStyle = "double",
|
||||
},
|
||||
validation = {
|
||||
noGrammar = "ignore",
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
}
|
||||
@@ -1,22 +0,0 @@
|
||||
return {
|
||||
"neovim/nvim-lspconfig",
|
||||
opts = {
|
||||
servers = {
|
||||
lemminx = {
|
||||
init_options = {
|
||||
settings = {
|
||||
xml = {
|
||||
format = {
|
||||
enabled = true,
|
||||
splitAttributes = false,
|
||||
},
|
||||
validation = {
|
||||
noGrammar = "ignore", -- This is correct
|
||||
},
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -5,20 +5,22 @@ return {
|
||||
-- python
|
||||
"basedpyright",
|
||||
"ruff",
|
||||
-- js, json, xml, all front end stuff
|
||||
"black",
|
||||
-- "biome",
|
||||
-- js, json, xml, all front end stuff
|
||||
"vtsls",
|
||||
"biome",
|
||||
"lemminx",
|
||||
"html-lsp",
|
||||
-- "css-lsp",
|
||||
-- lua
|
||||
"stylua",
|
||||
"lua-language-server",
|
||||
--ruby
|
||||
"ruby-lsp",
|
||||
-- bash
|
||||
"shfmt",
|
||||
-- go
|
||||
"goimports",
|
||||
"gofumpt"
|
||||
"gofumpt",
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
@@ -52,16 +52,16 @@ return {
|
||||
explorer = { cycle = false, layout = { preset = "sidebar" } },
|
||||
buffers = { layout = { preset = "vs_search" } },
|
||||
lines = { main = { current = false }, layout = { preset = "vs_search" } },
|
||||
diagnostics = { layout = { preset = "vs_search" } },
|
||||
diagnostics = { layout = { preset = "vs_search" }, hidden=true },
|
||||
diagnostics_buffer = { layout = { preset = "vs_search" } },
|
||||
git_status = { ignored = false },
|
||||
grep = { ignored = false, hidden = false, exclude = { "*.po", " *.pot" } },
|
||||
todo_comments = { ignored = false, hidden = false },
|
||||
lsp_symbols = {layout = {preset = "lsp_telescope" }},
|
||||
lsp_symbols = { layout = { preset = "lsp_telescope" } },
|
||||
files = {
|
||||
hidden = true,
|
||||
ignored = true,
|
||||
exclude = { "venvs/*", "*.pyc", "*.po" },
|
||||
exclude = { "venvs/*", "*.pyc", "*.po", "node_modules/*", "bundle/*" },
|
||||
layout = { preset = "file_telescope" },
|
||||
},
|
||||
},
|
||||
|
||||
@@ -4,11 +4,13 @@ return {
|
||||
opts = {
|
||||
spec = {
|
||||
{ "<leader>cL", "<cmd>LspRestart<CR>", icon = "" },
|
||||
{ "<leader>`", hidden = true },
|
||||
{ "<leader>-", hidden = true },
|
||||
},
|
||||
win = {
|
||||
no_overlap = false,
|
||||
},
|
||||
preset = 'modern'
|
||||
preset = "modern",
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
13
zsh/.zshrc
13
zsh/.zshrc
@@ -102,3 +102,16 @@ export ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE="fg=015,bold"
|
||||
eval "$(~/.local/repos/rbenv/bin/rbenv init - --no-rehash zsh)"
|
||||
# message of the day
|
||||
~/.config/nvim/zsh/motd.sh
|
||||
|
||||
# rust
|
||||
export PATH="$HOME/.cargo/bin:$PATH"
|
||||
|
||||
# go lang
|
||||
export GOPATH=$HOME/workspace/go-tools
|
||||
export GOBIN=$GOPATH/bin
|
||||
export PATH="$GOBIN:/usr/local/go/bin:$PATH"
|
||||
|
||||
# node / js / nvm
|
||||
export NVM_DIR="$HOME/workspace/.nvm"
|
||||
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
|
||||
export PATH="$HOME/.local/bin:$PATH"
|
||||
|
||||
@@ -15,7 +15,6 @@ if grep -qEi "(Microsoft|WSL)" /proc/version &> /dev/null; then
|
||||
else
|
||||
alias wezterm='wezterm' # Or point to native binary if needed
|
||||
fi
|
||||
alias docker='sudo docker'
|
||||
alias lg='lazygit'
|
||||
# [Odoo]
|
||||
alias erp-dev='cd ~/workspace/pg/erp/'
|
||||
@@ -25,3 +24,8 @@ alias erp-dev-test='cd ~/workspace/pg/erp && source venvs/odoo18/bin/activate &&
|
||||
alias erp-portal-server='erp-dev && source venvs/odoo17/bin/activate && cd odoo && python3 odoo-bin -c ../.portalrc --dev all'
|
||||
alias portal-dev='cd ~/workspace/pg/portal/'
|
||||
|
||||
# [portal]
|
||||
alias company-store='cd ~/workspace/pg/company_stores/'
|
||||
|
||||
alias lg='lazygit'
|
||||
alias ..nvim="../ && nvim"
|
||||
|
||||
Reference in New Issue
Block a user