Compare commits
No commits in common. "8da7e8132983f40f584409f1b52a5b297725d8f1" and "fc6b1e5fe5f066eee08b805bc689d48d938ea304" have entirely different histories.
8da7e81329
...
fc6b1e5fe5
8 changed files with 204 additions and 373 deletions
|
|
@ -3,9 +3,9 @@
|
|||
|
||||
# The current setup
|
||||
|
||||
Terminal Emulator: [Ghostty](https://ghostty.org/)
|
||||
- Zig-based terminal emulator
|
||||
- uses platform-native UI & GPU acceleration (e.g. MacOS secure input for passwords)
|
||||
Terminal Emulator: [Kitty](https://sw.kovidgoyal.net/kitty/)
|
||||
- fast GPU accelerated terminal emulator
|
||||
- removes need for tmux (appreciate it)
|
||||
|
||||
Shell: [fish](https://fishshell.com/)
|
||||
- completions
|
||||
|
|
|
|||
|
|
@ -1,48 +0,0 @@
|
|||
### Configuration
|
||||
# Font
|
||||
font-family = "Hack Nerd Font Mono"
|
||||
font-family-bold = "Hack Nerd Font Mono"
|
||||
font-family-italic = "Hack Nerd Font Mono"
|
||||
font-family-bold-italic = "Hack Nerd Font Mono"
|
||||
font-family = "Hack Nerd Font Mono"
|
||||
font-size = 15.0
|
||||
|
||||
# Theme
|
||||
theme = "detuned"
|
||||
|
||||
# Cursor
|
||||
cursor-style = "block"
|
||||
mouse-hide-while-typing = true
|
||||
background-opacity = 0.9
|
||||
background-blur = 10
|
||||
unfocused-split-opacity = 1
|
||||
|
||||
# Window
|
||||
window-padding-x = 0
|
||||
window-padding-y = 0
|
||||
|
||||
macos-titlebar-style = "tabs"
|
||||
macos-option-as-alt = left
|
||||
|
||||
### Keybinds
|
||||
# Splits
|
||||
keybind = ctrl+a>v=new_split:left
|
||||
keybind = ctrl+a>n=new_split:down
|
||||
keybind = ctrl+a>z=toggle_split_zoom
|
||||
keybind = alt+h=goto_split:left
|
||||
keybind = alt+l=goto_split:right
|
||||
keybind = alt+j=goto_split:down
|
||||
keybind = alt+k=goto_split:up
|
||||
keybind = ctrl+a>l=resize_split:right,60
|
||||
keybind = ctrl+a>h=resize_split:left,60
|
||||
keybind = ctrl+a>j=resize_split:down,60
|
||||
keybind = ctrl+a>k=resize_split:up,60
|
||||
# Tabs
|
||||
keybind = cmd+t=new_tab
|
||||
keybind = cmd+w=close_tab
|
||||
keybind = ctrl+tab=next_tab
|
||||
keybind = ctrl+shift>tab=previous_tab
|
||||
keybind = ctrl+a>d=close_surface
|
||||
# Terminal
|
||||
keybind = global:cmd+grave_accent=toggle_quick_terminal
|
||||
shell-integration = fish
|
||||
|
|
@ -1,13 +1,12 @@
|
|||
-- This file needs to have same structure as nvconfig.lua
|
||||
-- This file needs to have same structure as nvconfig.lua
|
||||
-- https://github.com/NvChad/ui/blob/v3.0/lua/nvconfig.lua
|
||||
-- Please read that file to know all available options :(
|
||||
-- Please read that file to know all available options :(
|
||||
|
||||
---@type ChadrcConfig
|
||||
local M = {}
|
||||
|
||||
M.base46 = {
|
||||
theme = "mountain",
|
||||
transparency = true,
|
||||
|
||||
hl_override = {
|
||||
Comment = { italic = true },
|
||||
|
|
|
|||
|
|
@ -1,14 +0,0 @@
|
|||
return {
|
||||
provider = "openrouter", -- Recommend using Claude
|
||||
vendors = {
|
||||
["openrouter"] = {
|
||||
__inherited_from = "openai",
|
||||
endpoint = "https://openrouter.ai/api/v1",
|
||||
api_key_name = "OPENROUTER_API_KEY_AVANTE",
|
||||
model = "anthropic/claude-3.7-sonnet",
|
||||
temperature = 0,
|
||||
max_tokens = 4096,
|
||||
},
|
||||
},
|
||||
auto_suggestions_provider = nil, -- Since auto-suggestions are a high-frequency operation and therefore expensive, it is recommended to specify an inexpensive provider or even a free provider: copilot
|
||||
}
|
||||
|
|
@ -1,28 +1,24 @@
|
|||
local options = {
|
||||
formatters_by_ft = {
|
||||
lua = { "stylua" },
|
||||
css = { "prettier" },
|
||||
html = { "prettier" },
|
||||
python = { "ruff_format", "ruff_fix", "ruff_organize_imports" },
|
||||
tf = { "tflint", "terraform-ls" },
|
||||
go = { "goimports", "gofmt" },
|
||||
json = { "jq" },
|
||||
templ = { "templ" },
|
||||
ts = { "typescript-language-server" },
|
||||
zig = { "zls" },
|
||||
},
|
||||
formatters_by_ft = {
|
||||
lua = { "stylua" },
|
||||
css = { "prettier" },
|
||||
html = { "prettier" },
|
||||
python = { "ruff_format", "ruff_fix", "ruff_organize_imports" },
|
||||
go = { "goimports", "gofmt" },
|
||||
json = { "jq" },
|
||||
},
|
||||
|
||||
format_on_save = {
|
||||
-- These options will be passed to conform.format()
|
||||
timeout_ms = 500,
|
||||
lsp_format = "fallback",
|
||||
},
|
||||
-- Set the log level. Use `:ConformInfo` to see the location of the log file.
|
||||
log_level = vim.log.levels.ERROR,
|
||||
-- Conform will notify you when a formatter errors
|
||||
notify_on_error = true,
|
||||
-- Conform will notify you when no formatters are available for the buffer
|
||||
notify_no_formatters = true,
|
||||
format_on_save = {
|
||||
-- These options will be passed to conform.format()
|
||||
timeout_ms = 500,
|
||||
lsp_format = "fallback",
|
||||
},
|
||||
-- Set the log level. Use `:ConformInfo` to see the location of the log file.
|
||||
log_level = vim.log.levels.ERROR,
|
||||
-- Conform will notify you when a formatter errors
|
||||
notify_on_error = true,
|
||||
-- Conform will notify you when no formatters are available for the buffer
|
||||
notify_no_formatters = true,
|
||||
}
|
||||
|
||||
return options
|
||||
|
|
|
|||
|
|
@ -1,11 +0,0 @@
|
|||
return {
|
||||
animate = {
|
||||
enabled = false,
|
||||
},
|
||||
exit_when_last = false,
|
||||
right = {
|
||||
{
|
||||
ft = "trouble",
|
||||
},
|
||||
},
|
||||
}
|
||||
|
|
@ -1,55 +1,53 @@
|
|||
local configs = require("nvchad.configs.lspconfig")
|
||||
local configs = require "nvchad.configs.lspconfig"
|
||||
configs.defaults()
|
||||
|
||||
local servers = {
|
||||
html = {},
|
||||
cssls = {},
|
||||
gopls = {
|
||||
analyses = {
|
||||
unusedparams = true,
|
||||
},
|
||||
staticcheck = true,
|
||||
gofumpt = true,
|
||||
},
|
||||
ruff = {
|
||||
lint = {
|
||||
run = "onSave",
|
||||
},
|
||||
},
|
||||
zls = {},
|
||||
terraformls = {},
|
||||
templ = {},
|
||||
html = {},
|
||||
cssls = {},
|
||||
gopls = {
|
||||
analyses = {
|
||||
unusedparams = true,
|
||||
},
|
||||
staticcheck = true,
|
||||
gofumpt = true,
|
||||
},
|
||||
ruff = {
|
||||
lint = {
|
||||
run = "onSave",
|
||||
},
|
||||
},
|
||||
zls = {},
|
||||
|
||||
pyright = {
|
||||
settings = {
|
||||
python = {
|
||||
analysis = {
|
||||
autoSearchPaths = true,
|
||||
typeCheckingMode = "basic",
|
||||
},
|
||||
venvPath = vim.fn.getcwd() .. "/.venv",
|
||||
pythonPath = vim.fn.getcwd() .. "/.venv/bin/python3",
|
||||
},
|
||||
},
|
||||
},
|
||||
ts_ls = {
|
||||
settings = {
|
||||
completions = {
|
||||
completeFunctionCalls = true,
|
||||
},
|
||||
},
|
||||
},
|
||||
pyright = {
|
||||
settings = {
|
||||
python = {
|
||||
analysis = {
|
||||
autoSearchPaths = true,
|
||||
typeCheckingMode = "basic",
|
||||
},
|
||||
venvPath = vim.fn.getcwd() .. "/.venv",
|
||||
pythonPath = vim.fn.getcwd() .. "/.venv/bin/python3",
|
||||
},
|
||||
},
|
||||
},
|
||||
ts_ls = {
|
||||
settings = {
|
||||
completions = {
|
||||
completeFunctionCalls = true,
|
||||
},
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
local on_attach = function(client, bufnr)
|
||||
configs.on_attach(client, bufnr)
|
||||
client.server_capabilities.documentFormattingProvider = true
|
||||
configs.on_attach(client, bufnr)
|
||||
client.server_capabilities.documentFormattingProvider = true
|
||||
end
|
||||
|
||||
for name, opts in pairs(servers) do
|
||||
opts.on_init = configs.on_init
|
||||
opts.on_attach = on_attach
|
||||
opts.capabilities = configs.capabilities
|
||||
opts.on_init = configs.on_init
|
||||
opts.on_attach = on_attach
|
||||
opts.capabilities = configs.capabilities
|
||||
|
||||
require("lspconfig")[name].setup(opts)
|
||||
require("lspconfig")[name].setup(opts)
|
||||
end
|
||||
|
|
|
|||
|
|
@ -1,232 +1,143 @@
|
|||
return {
|
||||
{
|
||||
"stevearc/conform.nvim",
|
||||
event = "BufWritePre", -- uncomment for format on save
|
||||
opts = require("configs.conform"),
|
||||
},
|
||||
{
|
||||
"stevearc/conform.nvim",
|
||||
event = "BufWritePre", -- uncomment for format on save
|
||||
opts = require "configs.conform",
|
||||
},
|
||||
|
||||
-- These are some examples, uncomment them if you want to see them work!
|
||||
{
|
||||
"neovim/nvim-lspconfig",
|
||||
config = function()
|
||||
require("configs.lspconfig")
|
||||
end,
|
||||
},
|
||||
-- These are some examples, uncomment them if you want to see them work!
|
||||
{
|
||||
"neovim/nvim-lspconfig",
|
||||
config = function()
|
||||
require "configs.lspconfig"
|
||||
end,
|
||||
},
|
||||
|
||||
{
|
||||
"nvim-treesitter/nvim-treesitter",
|
||||
opts = {
|
||||
ensure_installed = {
|
||||
"vim",
|
||||
"lua",
|
||||
"vimdoc",
|
||||
"html",
|
||||
"css",
|
||||
"python",
|
||||
"typescript",
|
||||
"go",
|
||||
"terraform",
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
"tpope/vim-fugitive",
|
||||
cmd = { "Git", "G", "Gdiffsplit", "Gvdiffsplit", "Gwrite", "Gread", "Ggrep", "GMove", "GDelete", "GBrowse" },
|
||||
keys = {
|
||||
{ "<leader>gs", "<cmd>vertical Git<cr>" },
|
||||
desc = "Open Fugitive",
|
||||
},
|
||||
opts = {
|
||||
enabled = true,
|
||||
},
|
||||
dependencies = {
|
||||
"tpope/vim-rhubarb",
|
||||
},
|
||||
},
|
||||
{ "tpope/vim-rhubarb", opts = { enabled = true } },
|
||||
{
|
||||
"folke/zen-mode.nvim",
|
||||
cmd = "ZenMode",
|
||||
opts = {
|
||||
plugins = {
|
||||
kitty = {
|
||||
enabled = true,
|
||||
font = "+4",
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
"folke/trouble.nvim",
|
||||
opts = {
|
||||
auto_close = true,
|
||||
auto_open = false,
|
||||
warn_no_results = false,
|
||||
modes = {
|
||||
symbols = { -- Configure symbols mode
|
||||
win = {
|
||||
type = "split", -- split window
|
||||
relative = "win", -- relative to current window
|
||||
position = "left", -- right side
|
||||
size = 0.20, -- 30% of the window
|
||||
},
|
||||
},
|
||||
diagnostics = {
|
||||
win = {
|
||||
type = "split",
|
||||
relative = "win",
|
||||
position = "bottom",
|
||||
size = 0.30,
|
||||
},
|
||||
},
|
||||
lsp = { -- Configure LSP references mode
|
||||
win = {
|
||||
type = "split", -- split window
|
||||
relative = "win", -- relative to current window
|
||||
position = "right", -- appear below
|
||||
size = 0.25, -- 25% of the window height
|
||||
},
|
||||
},
|
||||
preview = {
|
||||
mode = "diagnostics",
|
||||
preview = {
|
||||
type = "split",
|
||||
relative = "win",
|
||||
position = "right",
|
||||
size = 0.3,
|
||||
},
|
||||
},
|
||||
preview_float = {
|
||||
mode = "diagnostics",
|
||||
preview = {
|
||||
type = "float",
|
||||
relative = "editor",
|
||||
border = "rounded",
|
||||
title = "Preview",
|
||||
title_pos = "center",
|
||||
position = { 0, -2 },
|
||||
size = { width = 0.3, height = 0.5 },
|
||||
zindex = 200,
|
||||
},
|
||||
},
|
||||
},
|
||||
}, -- for default options, refer to the configuration section for custom setup.
|
||||
cmd = "Trouble",
|
||||
keys = {
|
||||
{
|
||||
"<leader>xx",
|
||||
"<cmd>Trouble preview toggle<cr>",
|
||||
desc = "Diagnostics (Trouble)",
|
||||
},
|
||||
{
|
||||
"<leader>xX",
|
||||
"<cmd>Trouble diagnostics toggle filter.buf=0<cr>",
|
||||
desc = "Buffer Diagnostics (Trouble)",
|
||||
},
|
||||
{
|
||||
"<leader>cs",
|
||||
"<cmd>Trouble symbols toggle focus=false<cr>",
|
||||
desc = "Symbols (Trouble)",
|
||||
},
|
||||
{
|
||||
"<leader>cl",
|
||||
"<cmd>Trouble lsp toggle focus=false<cr>",
|
||||
desc = "LSP Definitions / references / ... (Trouble)",
|
||||
},
|
||||
{
|
||||
"<leader>xL",
|
||||
"<cmd>Trouble loclist toggle<cr>",
|
||||
desc = "Location List (Trouble)",
|
||||
},
|
||||
{
|
||||
"<leader>xQ",
|
||||
"<cmd>Trouble qflist toggle<cr>",
|
||||
desc = "Quickfix List (Trouble)",
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
"folke/noice.nvim",
|
||||
event = "VeryLazy",
|
||||
opts = {
|
||||
lsp = {
|
||||
-- override markdown rendering so that **cmp** and other plugins use **Treesitter**
|
||||
override = {
|
||||
["vim.lsp.util.convert_input_to_markdown_lines"] = true,
|
||||
["vim.lsp.util.stylize_markdown"] = true,
|
||||
["cmp.entry.get_documentation"] = true, -- requires hrsh7th/nvim-cmp
|
||||
},
|
||||
},
|
||||
-- you can enable a preset for easier configuration
|
||||
presets = {
|
||||
bottom_search = true, -- use a classic bottom cmdline for search
|
||||
command_palette = true, -- position the cmdline and popupmenu together
|
||||
long_message_to_split = true, -- long messages will be sent to a split
|
||||
inc_rename = false, -- enables an input dialog for inc-rename.nvim
|
||||
lsp_doc_border = false, -- add a border to hover docs and signature help
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
"knubie/vim-kitty-navigator",
|
||||
enabled = true,
|
||||
lazy = false,
|
||||
build = {
|
||||
"cp ./*.py ~/.config/kitty/",
|
||||
},
|
||||
},
|
||||
{
|
||||
"gfontenot/vim-xcode",
|
||||
enabled = true,
|
||||
},
|
||||
{
|
||||
"yetone/avante.nvim",
|
||||
event = "VeryLazy",
|
||||
lazy = false,
|
||||
version = false, -- set this to "*" if you want to always pull the latest change, false to update on release
|
||||
opts = require("configs.avante"),
|
||||
-- if you want to build from source then do `make BUILD_FROM_SOURCE=true`
|
||||
build = "make",
|
||||
-- build = "powershell -ExecutionPolicy Bypass -File Build.ps1 -BuildFromSource false" -- for windows
|
||||
dependencies = {
|
||||
"stevearc/dressing.nvim",
|
||||
"nvim-lua/plenary.nvim",
|
||||
"MunifTanjim/nui.nvim",
|
||||
--- The below dependencies are optional,
|
||||
"hrsh7th/nvim-cmp", -- autocompletion for avante commands and mentions
|
||||
"nvim-tree/nvim-web-devicons", -- or echasnovski/mini.icons
|
||||
"zbirenbaum/copilot.lua", -- for providers='copilot'
|
||||
{
|
||||
-- support for image pasting
|
||||
"HakonHarnes/img-clip.nvim",
|
||||
event = "VeryLazy",
|
||||
opts = {
|
||||
-- recommended settings
|
||||
default = {
|
||||
embed_image_as_base64 = false,
|
||||
prompt_for_file_name = false,
|
||||
drag_and_drop = {
|
||||
insert_mode = true,
|
||||
},
|
||||
-- required for Windows users
|
||||
use_absolute_path = true,
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
-- Make sure to set this up properly if you have lazy=true
|
||||
"MeanderingProgrammer/render-markdown.nvim",
|
||||
opts = {
|
||||
file_types = { "markdown", "Avante" },
|
||||
},
|
||||
ft = { "markdown", "Avante" },
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
"folke/edgy.nvim",
|
||||
event = "VeryLazy",
|
||||
enabled = false,
|
||||
opts = require("configs.edgy"),
|
||||
},
|
||||
{
|
||||
"nvim-treesitter/nvim-treesitter",
|
||||
opts = {
|
||||
ensure_installed = {
|
||||
"vim",
|
||||
"lua",
|
||||
"vimdoc",
|
||||
"html",
|
||||
"css",
|
||||
"python",
|
||||
"typescript",
|
||||
"go",
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
"tpope/vim-fugitive",
|
||||
cmd = { "Git", "G", "Gdiffsplit", "Gvdiffsplit", "Gwrite", "Gread", "Ggrep", "GMove", "GDelete", "GBrowse" },
|
||||
keys = {
|
||||
{ "<leader>gs", "<cmd>vertical Git<cr>" },
|
||||
desc = "Open Fugitive",
|
||||
},
|
||||
opts = {
|
||||
enabled = true,
|
||||
},
|
||||
dependencies = {
|
||||
"tpope/vim-rhubarb",
|
||||
},
|
||||
},
|
||||
{ "tpope/vim-rhubarb", opts = { enabled = true } },
|
||||
{
|
||||
"folke/zen-mode.nvim",
|
||||
cmd = "ZenMode",
|
||||
opts = {
|
||||
plugins = {
|
||||
kitty = {
|
||||
enabled = true,
|
||||
font = "+4",
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
"folke/trouble.nvim",
|
||||
opts = {
|
||||
auto_close = true,
|
||||
auto_open = false,
|
||||
warn_no_results = false,
|
||||
modes = {
|
||||
symbols = { -- Configure symbols mode
|
||||
win = {
|
||||
type = "split", -- split window
|
||||
relative = "win", -- relative to current window
|
||||
position = "right", -- right side
|
||||
size = 0.15, -- 30% of the window
|
||||
},
|
||||
},
|
||||
},
|
||||
}, -- for default options, refer to the configuration section for custom setup.
|
||||
cmd = "Trouble",
|
||||
keys = {
|
||||
{
|
||||
"<leader>xx",
|
||||
"<cmd>Trouble diagnostics toggle<cr>",
|
||||
desc = "Diagnostics (Trouble)",
|
||||
},
|
||||
{
|
||||
"<leader>xX",
|
||||
"<cmd>Trouble diagnostics toggle filter.buf=0<cr>",
|
||||
desc = "Buffer Diagnostics (Trouble)",
|
||||
},
|
||||
{
|
||||
"<leader>cs",
|
||||
"<cmd>Trouble symbols toggle focus=false<cr>",
|
||||
desc = "Symbols (Trouble)",
|
||||
},
|
||||
{
|
||||
"<leader>cl",
|
||||
"<cmd>Trouble lsp toggle focus=false win.position=right<cr>",
|
||||
desc = "LSP Definitions / references / ... (Trouble)",
|
||||
},
|
||||
{
|
||||
"<leader>xL",
|
||||
"<cmd>Trouble loclist toggle<cr>",
|
||||
desc = "Location List (Trouble)",
|
||||
},
|
||||
{
|
||||
"<leader>xQ",
|
||||
"<cmd>Trouble qflist toggle<cr>",
|
||||
desc = "Quickfix List (Trouble)",
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
"folke/noice.nvim",
|
||||
event = "VeryLazy",
|
||||
opts = {
|
||||
lsp = {
|
||||
-- override markdown rendering so that **cmp** and other plugins use **Treesitter**
|
||||
override = {
|
||||
["vim.lsp.util.convert_input_to_markdown_lines"] = true,
|
||||
["vim.lsp.util.stylize_markdown"] = true,
|
||||
["cmp.entry.get_documentation"] = true, -- requires hrsh7th/nvim-cmp
|
||||
},
|
||||
},
|
||||
-- you can enable a preset for easier configuration
|
||||
presets = {
|
||||
bottom_search = true, -- use a classic bottom cmdline for search
|
||||
command_palette = true, -- position the cmdline and popupmenu together
|
||||
long_message_to_split = true, -- long messages will be sent to a split
|
||||
inc_rename = false, -- enables an input dialog for inc-rename.nvim
|
||||
lsp_doc_border = false, -- add a border to hover docs and signature help
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
"knubie/vim-kitty-navigator",
|
||||
enabled = true,
|
||||
lazy = false,
|
||||
build = {
|
||||
"cp ./*.py ~/.config/kitty/",
|
||||
},
|
||||
},
|
||||
{
|
||||
"gfontenot/vim-xcode",
|
||||
enabled = true,
|
||||
},
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue