Compare commits

..

15 Commits

Author SHA1 Message Date
Daveanand Mannie
3522c28620 [chore] include hidden on diagnostics 2026-02-04 10:20:37 -05:00
Daveanand Mannie
0fc8a32863 [chore] remove unused whichkey ui helpers 2026-02-02 15:33:46 -05:00
Daveanand Mannie
5f37db4f8b [update] venv selector to commit 321dbbb 2026-02-02 15:33:18 -05:00
Daveanand Mannie
a730958ba9 [add] links to repos 2026-01-23 09:53:40 -05:00
Daveanand Mannie
16ad70f2ce [remove] docker alias
i was dumb and thought user groups wasn't working
2026-01-23 09:48:47 -05:00
Daveanand Mannie
e9fc5490ac [add] lsp config update for multi project ruby
I'm still a bit hazy on how to integrate ruby's ecosystem
2026-01-21 09:49:35 -05:00
Daveanand Mannie
51bb7213d0 [ADD] xml lsp configuration 2026-01-12 14:29:11 -05:00
Daveanand Mannie
8006bc52e8 [remove] rubocop
not sure i need this yet lets see
2026-01-12 11:38:48 -05:00
Daveanand Mannie
2f9cbf29fa [format] lua via stylua 2026-01-12 11:38:14 -05:00
Daveanand Mannie
6720c8c765 [ADD] lua language config and ad sty config to root dir 2026-01-12 11:36:23 -05:00
Daveanand Mannie
301a265080 [update] removed the depercated LazyVim.lsp.on_attach(**) method Snacks.util.lsp.on(**) 2026-01-12 10:44:52 -05:00
Daveanand Mannie
04b8487bab [alias] 2026-01-10 16:15:22 -05:00
Daveanand Mannie
e7386248da [chore] missing .localbin in path 2026-01-10 16:12:48 -05:00
Daveanand Mannie
aece909028 [chore] update some lsp stuff and link config files 2026-01-10 16:11:53 -05:00
Daveanand Mannie
800e892b6e [CHORE] moving things around 2026-01-10 16:11:53 -05:00
24 changed files with 319 additions and 154 deletions

View File

@@ -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 This is my personal **LazyVim** configuration, designed to run seamlessly on both
**WSL (Windows)** and **bare-metal Linux** environments. It also integrates **WSL (Windows)** and **bare-metal Linux** environments. It also integrates

View File

@@ -1,11 +1,5 @@
{ {
"$schema": "https://biomejs.dev/schemas/2.0.6/schema.json", "$schema": "https://biomejs.dev/schemas/2.2.6/schema.json",
"formatter": {
"enabled": true,
"indentStyle": "space",
"indentWidth": 4,
"lineWidth": 120
},
"linter": { "linter": {
"enabled": true, "enabled": true,
"rules": { "rules": {
@@ -18,8 +12,46 @@
} }
} }
}, },
"vcs": { "vcs": {
"enabled": true, "enabled": true,
"clientKind": "git" "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"
}
} }
} }

View File

@@ -2,15 +2,15 @@
local wezterm = require("wezterm") local wezterm = require("wezterm")
local config = wezterm.config_builder() local config = wezterm.config_builder()
-- workspace dir default -- 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 -- default term prog can be changed with cli args
if os.getenv("pwsh") then if os.getenv("pwsh") then
config.default_prog = { "pwsh" } config.default_prog = { "pwsh" }
end end
--styles --styles
config.harfbuzz_features = { "calt=1", "clig=1", "liga=1" } 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.font_size = 14
config.color_scheme = "Sakura" config.color_scheme = "Sakura"
config.window_padding = { config.window_padding = {
@@ -20,7 +20,7 @@ config.window_padding = {
bottom = "0cell", bottom = "0cell",
} }
-- pane -- pane
config.colors = { split = '#E858F5' } config.colors = { split = "#E858F5" }
config.inactive_pane_hsb = { config.inactive_pane_hsb = {
saturation = 0.7, saturation = 0.7,
brightness = 0.8, brightness = 0.8,

View File

@@ -1,6 +1,5 @@
{ {
"LazyVim": { "branch": "main", "commit": "28db03f958d58dfff3c647ce28fdc1cb88ac158d" }, "LazyVim": { "branch": "main", "commit": "28db03f958d58dfff3c647ce28fdc1cb88ac158d" },
"SchemaStore.nvim": { "branch": "main", "commit": "f35b7747d4d536fba96aa098a4144e5c85252828" },
"blink.cmp": { "branch": "main", "commit": "b19413d214068f316c78978b08264ed1c41830ec" }, "blink.cmp": { "branch": "main", "commit": "b19413d214068f316c78978b08264ed1c41830ec" },
"bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" }, "bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" },
"catppuccin": { "branch": "main", "commit": "beaf41a30c26fd7d6c386d383155cbd65dd554cd" }, "catppuccin": { "branch": "main", "commit": "beaf41a30c26fd7d6c386d383155cbd65dd554cd" },
@@ -12,7 +11,6 @@
"lazy.nvim": { "branch": "main", "commit": "85c7ff3711b730b4030d03144f6db6375044ae82" }, "lazy.nvim": { "branch": "main", "commit": "85c7ff3711b730b4030d03144f6db6375044ae82" },
"lazydev.nvim": { "branch": "main", "commit": "5231c62aa83c2f8dc8e7ba957aa77098cda1257d" }, "lazydev.nvim": { "branch": "main", "commit": "5231c62aa83c2f8dc8e7ba957aa77098cda1257d" },
"lualine.nvim": { "branch": "master", "commit": "47f91c416daef12db467145e16bed5bbfe00add8" }, "lualine.nvim": { "branch": "master", "commit": "47f91c416daef12db467145e16bed5bbfe00add8" },
"markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" },
"mason-lspconfig.nvim": { "branch": "main", "commit": "fe661093f4b05136437b531e7f959af2a2ae66c8" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "fe661093f4b05136437b531e7f959af2a2ae66c8" },
"mason.nvim": { "branch": "main", "commit": "44d1e90e1f66e077268191e3ee9d2ac97cc18e65" }, "mason.nvim": { "branch": "main", "commit": "44d1e90e1f66e077268191e3ee9d2ac97cc18e65" },
"mini.ai": { "branch": "main", "commit": "bfb26d9072670c3aaefab0f53024b2f3729c8083" }, "mini.ai": { "branch": "main", "commit": "bfb26d9072670c3aaefab0f53024b2f3729c8083" },
@@ -32,12 +30,11 @@
"nvim-ts-autotag": { "branch": "main", "commit": "c4ca798ab95b316a768d51eaaaee48f64a4a46bc" }, "nvim-ts-autotag": { "branch": "main", "commit": "c4ca798ab95b316a768d51eaaaee48f64a4a46bc" },
"persistence.nvim": { "branch": "main", "commit": "b20b2a7887bd39c1a356980b45e03250f3dce49c" }, "persistence.nvim": { "branch": "main", "commit": "b20b2a7887bd39c1a356980b45e03250f3dce49c" },
"plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
"render-markdown.nvim": { "branch": "main", "commit": "73a6ebc842cf81926eb1d424820b800f6f6a1227" },
"snacks.nvim": { "branch": "main", "commit": "fe7cfe9800a182274d0f868a74b7263b8c0c020b" }, "snacks.nvim": { "branch": "main", "commit": "fe7cfe9800a182274d0f868a74b7263b8c0c020b" },
"todo-comments.nvim": { "branch": "main", "commit": "31e3c38ce9b29781e4422fc0322eb0a21f4e8668" }, "todo-comments.nvim": { "branch": "main", "commit": "31e3c38ce9b29781e4422fc0322eb0a21f4e8668" },
"tokyonight.nvim": { "branch": "main", "commit": "5da1b76e64daf4c5d410f06bcb6b9cb640da7dfd" }, "tokyonight.nvim": { "branch": "main", "commit": "5da1b76e64daf4c5d410f06bcb6b9cb640da7dfd" },
"trouble.nvim": { "branch": "main", "commit": "bd67efe408d4816e25e8491cc5ad4088e708a69a" }, "trouble.nvim": { "branch": "main", "commit": "bd67efe408d4816e25e8491cc5ad4088e708a69a" },
"ts-comments.nvim": { "branch": "main", "commit": "123a9fb12e7229342f807ec9e6de478b1102b041" }, "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" } "which-key.nvim": { "branch": "main", "commit": "3aab2147e74890957785941f0c1ad87d0a44c15a" }
} }

View File

@@ -1,7 +1,6 @@
{ {
"extras": [ "extras": [
"lazyvim.plugins.extras.lang.json",
"lazyvim.plugins.extras.lang.markdown"
], ],
"install_version": 7, "install_version": 7,
"news": { "news": {

View File

@@ -1,11 +1,3 @@
-- Autocmds are automatically loaded on the VeryLazy event -- 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 -- Default autocmds that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/autocmds.lua
-- Add any additional autocmds here -- 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,
})

View File

@@ -20,7 +20,10 @@ require("lazy").setup({
{ import = "plugins" }, { import = "plugins" },
{ import = "plugins.langs.python" }, { import = "plugins.langs.python" },
{ import = "plugins.langs.go" }, { 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 = { defaults = {
-- By default, only LazyVim plugins will be lazy-loaded. Your custom plugins will load during startup. -- By default, only LazyVim plugins will be lazy-loaded. Your custom plugins will load during startup.

View File

@@ -27,8 +27,6 @@ local layouts = {
}, },
}, },
vs_search = { vs_search = {
preview = false, preview = false,
layout = { layout = {

View File

@@ -2,7 +2,7 @@ return {
"saghen/blink.cmp", "saghen/blink.cmp",
opts = { opts = {
keymap = { keymap = {
["<Tab>"] = { "select_and_accept", 'fallback' }, ["<Tab>"] = { "select_and_accept", "fallback" },
}, },
}, },
} }

View File

@@ -1,11 +1,19 @@
return { return {
"stevearc/conform.nvim", "stevearc/conform.nvim",
opts = { opts = {
-- lsp_formatting = false,
-- fallback = false,
formatters_by_ft = { formatters_by_ft = {
python = { "black" }, python = { "black" },
javascript = { "biome" },
go = { "goimports", "gofumpt" }, go = { "goimports", "gofumpt" },
xml = { "lemminx" }, xml = { "lemminx" },
ruby = { "standardrb" },
json = { "biome", "json-lsp" },
css = { "biome" },
javascript = { "biome" },
sql = { "pg_format" },
yaml = { "hydra_lsp" },
lua = { "stylua" },
}, },
}, },
dependencies = { dependencies = {

View File

@@ -0,0 +1,11 @@
return {
"neovim/nvim-lspconfig",
opts = {
servers = {
biome = {
cmd = { "biome", "lsp-proxy" },
filetypes = { "javascript", "css", "json" },
},
},
},
}

View File

@@ -44,7 +44,7 @@ return {
gopls = function(_, opts) gopls = function(_, opts)
-- workaround for gopls not supporting semanticTokensProvider -- workaround for gopls not supporting semanticTokensProvider
-- https://github.com/golang/go/issues/54531#issuecomment-1464982242 -- 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 if not client.server_capabilities.semanticTokensProvider then
local semantic = client.config.capabilities.textDocument.semanticTokens local semantic = client.config.capabilities.textDocument.semanticTokens
client.server_capabilities.semanticTokensProvider = { client.server_capabilities.semanticTokensProvider = {
@@ -56,7 +56,7 @@ return {
range = true, range = true,
} }
end end
end, "gopls") end)
-- end workaround -- end workaround
end, end,
}, },

View 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,
},
},
}

View File

@@ -15,10 +15,7 @@ return {
dapui.setup(opts) dapui.setup(opts)
-- icons -- icons
vim.fn.sign_define( vim.fn.sign_define("DapBreakpoint", { text = "🔴", texthl = "DiagnosticError", linehl = "", numhl = "" })
"DapBreakpoint",
{ text = "🔴", texthl = "DiagnosticError", linehl = "", numhl = "" }
)
-- Auto open/close UI -- Auto open/close UI
dap.listeners.after.event_initialized["dapui_config"] = function() dap.listeners.after.event_initialized["dapui_config"] = function()

View File

@@ -4,7 +4,7 @@ local config_path
-- Determine the config path based on the OS -- Determine the config path based on the OS
if os_info.is_linux then 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 elseif os_info.is_windows then
config_path = os.getenv("LOCALAPPDATA") .. "\\nvim\\ruff.toml" config_path = os.getenv("LOCALAPPDATA") .. "\\nvim\\ruff.toml"
end end
@@ -41,11 +41,17 @@ return {
}, },
}, },
}, },
-- setup = {
-- basedpyright = function()
-- LazyVim.lsp.on_attach(function(client, _)
-- client.server_capabilities.hoverProvider = true
-- end, "basedpyright")
-- },
setup = { setup = {
basedpyright = function() basedpyright = function()
LazyVim.lsp.on_attach(function(client, _) require("snacks").util.lsp.on({ name = "basedpyright" }, function(_, client)
client.server_capabilities.hoverProvider = true client.server_capabilities.hoverProvider = true
end, "basedpyright") end)
end, end,
}, },
}, },

View 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,
},
},
},
}

View 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",
},
},
},
},
},
},
},
}

View File

@@ -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
},
}
}
}
}
}
}
}

View File

@@ -5,20 +5,22 @@ return {
-- python -- python
"basedpyright", "basedpyright",
"ruff", "ruff",
-- js, json, xml, all front end stuff
"black", "black",
-- "biome", -- js, json, xml, all front end stuff
"vtsls",
"biome",
"lemminx", "lemminx",
"html-lsp",
-- "css-lsp",
-- lua -- lua
"stylua", "stylua",
"lua-language-server", "lua-language-server",
--ruby --ruby
"ruby-lsp",
-- bash -- bash
"shfmt", "shfmt",
-- go -- go
"goimports", "goimports",
"gofumpt" "gofumpt",
}, },
}, },
} }

View File

@@ -52,16 +52,16 @@ return {
explorer = { cycle = false, layout = { preset = "sidebar" } }, explorer = { cycle = false, layout = { preset = "sidebar" } },
buffers = { layout = { preset = "vs_search" } }, buffers = { layout = { preset = "vs_search" } },
lines = { main = { current = false }, 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" } }, diagnostics_buffer = { layout = { preset = "vs_search" } },
git_status = { ignored = false }, git_status = { ignored = false },
grep = { ignored = false, hidden = false, exclude = { "*.po", " *.pot" } }, grep = { ignored = false, hidden = false, exclude = { "*.po", " *.pot" } },
todo_comments = { ignored = false, hidden = false }, todo_comments = { ignored = false, hidden = false },
lsp_symbols = {layout = {preset = "lsp_telescope" }}, lsp_symbols = { layout = { preset = "lsp_telescope" } },
files = { files = {
hidden = true, hidden = true,
ignored = true, ignored = true,
exclude = { "venvs/*", "*.pyc", "*.po" }, exclude = { "venvs/*", "*.pyc", "*.po", "node_modules/*", "bundle/*" },
layout = { preset = "file_telescope" }, layout = { preset = "file_telescope" },
}, },
}, },

View File

@@ -4,11 +4,13 @@ return {
opts = { opts = {
spec = { spec = {
{ "<leader>cL", "<cmd>LspRestart<CR>", icon = "󰝳" }, { "<leader>cL", "<cmd>LspRestart<CR>", icon = "󰝳" },
{ "<leader>`", hidden = true },
{ "<leader>-", hidden = true },
}, },
win = { win = {
no_overlap = false, no_overlap = false,
}, },
preset = 'modern' preset = "modern",
}, },
}, },
} }

View File

@@ -102,3 +102,16 @@ export ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE="fg=015,bold"
eval "$(~/.local/repos/rbenv/bin/rbenv init - --no-rehash zsh)" eval "$(~/.local/repos/rbenv/bin/rbenv init - --no-rehash zsh)"
# message of the day # message of the day
~/.config/nvim/zsh/motd.sh ~/.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"

View File

@@ -15,7 +15,6 @@ if grep -qEi "(Microsoft|WSL)" /proc/version &> /dev/null; then
else else
alias wezterm='wezterm' # Or point to native binary if needed alias wezterm='wezterm' # Or point to native binary if needed
fi fi
alias docker='sudo docker'
alias lg='lazygit' alias lg='lazygit'
# [Odoo] # [Odoo]
alias erp-dev='cd ~/workspace/pg/erp/' 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 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/' alias portal-dev='cd ~/workspace/pg/portal/'
# [portal]
alias company-store='cd ~/workspace/pg/company_stores/'
alias lg='lazygit'
alias ..nvim="../ && nvim"