From 800e892b6e568963632fd5af2937a8386e06576c Mon Sep 17 00:00:00 2001 From: Daveanand Mannie Date: Wed, 22 Oct 2025 03:59:38 -0400 Subject: [PATCH] [CHORE] moving things around --- config_files/.rubocop.yml | 59 +++++++++++++++++++ config_files/biome.json | 46 ++++++++++++--- lua/config/lazy.lua | 4 +- lua/plugins/conform.lua | 7 ++- lua/plugins/langs/biome/nvim-lspconfig.lua | 11 ++++ lua/plugins/langs/ruby/nvim-lspconfig.lua | 33 +++++++++++ lua/plugins/langs/xml/nvim-lspconfig.lua | 22 +++++++ .../langs/xml_json_html/nvim-lspconfig.lua | 22 ------- lua/plugins/mason.lua | 7 ++- zsh/.zshrc | 8 +++ 10 files changed, 186 insertions(+), 33 deletions(-) create mode 100644 config_files/.rubocop.yml create mode 100644 lua/plugins/langs/biome/nvim-lspconfig.lua create mode 100644 lua/plugins/langs/ruby/nvim-lspconfig.lua create mode 100644 lua/plugins/langs/xml/nvim-lspconfig.lua delete mode 100644 lua/plugins/langs/xml_json_html/nvim-lspconfig.lua diff --git a/config_files/.rubocop.yml b/config_files/.rubocop.yml new file mode 100644 index 0000000..7968aa2 --- /dev/null +++ b/config_files/.rubocop.yml @@ -0,0 +1,59 @@ +AllCops: + TargetRubyVersion: 3.4 + NewCops: enable + Exclude: + - 'db/schema.rb' + - 'bin/**/*' + - 'node_modules/**/*' + - 'vendor/**/*' + +Layout/LineLength: + Max: 100 + +Layout/IndentationWidth: + Width: 2 + +Layout/EmptyLinesAroundClassBody: + Enabled: true + +Layout/EmptyLinesAroundModuleBody: + Enabled: true + +Naming/VariableName: + EnforcedStyle: snake_case + +Naming/MethodName: + EnforcedStyle: snake_case + +Naming/ClassAndModuleCamelCase: + Enabled: true + +Style/Documentation: + Enabled: false + +Style/RedundantBegin: + Enabled: true + +Style/GuardClause: + Enabled: true + +Style/StringLiterals: + EnforcedStyle: double_quotes + +Style/TrailingCommaInArguments: + EnforcedStyleForMultiline: comma + +Style/OptionalBooleanParameter: + Enabled: false + +Metrics/MethodLength: + Max: 25 + +Metrics/ClassLength: + Max: 200 + +Metrics/BlockLength: + Max: 25 + +Metrics/AbcSize: + Max: 15 diff --git a/config_files/biome.json b/config_files/biome.json index 7bda099..85f8d67 100644 --- a/config_files/biome.json +++ b/config_files/biome.json @@ -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" + } } } diff --git a/lua/config/lazy.lua b/lua/config/lazy.lua index 05d8d5e..79a2e0e 100644 --- a/lua/config/lazy.lua +++ b/lua/config/lazy.lua @@ -20,7 +20,9 @@ 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" }, }, defaults = { -- By default, only LazyVim plugins will be lazy-loaded. Your custom plugins will load during startup. diff --git a/lua/plugins/conform.lua b/lua/plugins/conform.lua index dc1609a..4c105a0 100644 --- a/lua/plugins/conform.lua +++ b/lua/plugins/conform.lua @@ -1,11 +1,16 @@ return { "stevearc/conform.nvim", opts = { + lsp_formatting = false, + fallback = false, formatters_by_ft = { python = { "black" }, - javascript = { "biome" }, go = { "goimports", "gofumpt" }, xml = { "lemminx" }, + ruby = { "rubocop" }, + json = { "biome" }, + css = { "biome" }, + javascript = { "biome" }, }, }, dependencies = { diff --git a/lua/plugins/langs/biome/nvim-lspconfig.lua b/lua/plugins/langs/biome/nvim-lspconfig.lua new file mode 100644 index 0000000..94035f0 --- /dev/null +++ b/lua/plugins/langs/biome/nvim-lspconfig.lua @@ -0,0 +1,11 @@ +return { + "neovim/nvim-lspconfig", + opts = { + servers = { + biome = { + cmd = { "biome", "lsp-proxy" }, + filetypes = { "javascript", "css", "json" }, + }, + }, + }, +} diff --git a/lua/plugins/langs/ruby/nvim-lspconfig.lua b/lua/plugins/langs/ruby/nvim-lspconfig.lua new file mode 100644 index 0000000..66838a8 --- /dev/null +++ b/lua/plugins/langs/ruby/nvim-lspconfig.lua @@ -0,0 +1,33 @@ +return { + "neovim/nvim-lspconfig", + opts = { + servers = { + ruby_lsp = { + mason = false, + cmd = { os.getenv("HOME") .. "/.rbenv/shims/ruby-lsp" }, + init_options = { + enabled_features = { + codeActions = true, + codeLens = true, + completion = true, + definition = true, + diagnostics = true, + documentHighlights = true, + documentLink = true, + documentSymbols = true, + foldingRanges = true, + formatting = true, + hover = true, + inlayHint = true, + onTypeFormatting = true, + selectionRanges = true, + semanticHighlighting = true, + signatureHelp = true, + typeHierarchy = true, + workspaceSymbol = true, + }, + }, + }, + }, + }, +} diff --git a/lua/plugins/langs/xml/nvim-lspconfig.lua b/lua/plugins/langs/xml/nvim-lspconfig.lua new file mode 100644 index 0000000..4392ba9 --- /dev/null +++ b/lua/plugins/langs/xml/nvim-lspconfig.lua @@ -0,0 +1,22 @@ +return { + "neovim/nvim-lspconfig", + opts = { + servers = { + lemminx = { + init_options = { + settings = { + xml = { + format = { + enabled = true, + splitAttributes = false, + }, + validation = { + noGrammar = "ignore", + }, + }, + }, + }, + }, + }, + }, +} diff --git a/lua/plugins/langs/xml_json_html/nvim-lspconfig.lua b/lua/plugins/langs/xml_json_html/nvim-lspconfig.lua deleted file mode 100644 index d51ca94..0000000 --- a/lua/plugins/langs/xml_json_html/nvim-lspconfig.lua +++ /dev/null @@ -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 - }, - } - } - } - } - } - } -} diff --git a/lua/plugins/mason.lua b/lua/plugins/mason.lua index 16d54ed..cb69dab 100644 --- a/lua/plugins/mason.lua +++ b/lua/plugins/mason.lua @@ -5,10 +5,13 @@ 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", diff --git a/zsh/.zshrc b/zsh/.zshrc index 39f1a7e..2ee4b6d 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -102,3 +102,11 @@ 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"