feat: latest preferences

This commit is contained in:
Wil Simpson 2025-01-06 16:38:01 -05:00
parent 9d965db75f
commit 1fd6b5e58b
9 changed files with 106 additions and 67 deletions

View File

@ -1,6 +0,0 @@
column_width = 160
line_endings = "Unix"
indent_type = "Spaces"
indent_width = 2
quote_style = "AutoPreferSingle"
no_call_parentheses = true

View File

@ -116,29 +116,30 @@ require('lazy').setup({
}, },
}, },
-- {
-- -- Theme inspired by Atom
-- 'navarasu/onedark.nvim',
-- priority = 1000,
-- config = function()
-- require('onedark').setup {
-- style = 'dark',
-- code_style = {
-- comments = 'none',
-- },
-- }
-- require('onedark').load()
-- vim.cmd.colorscheme 'onedark'
-- end,
-- },
{ {
'morhetz/gruvbox', -- Theme inspired by Atom
'navarasu/onedark.nvim',
priority = 1000,
config = function() config = function()
vim.cmd.colorscheme 'gruvbox' require('onedark').setup {
vim.o.background = 'dark' style = 'warmer',
vim.o.termguicolors = true transparent = true,
end -- code_style = {
-- comments = 'none',
-- },
}
require('onedark').load()
vim.cmd.colorscheme 'onedark'
end,
}, },
-- {
-- 'morhetz/gruvbox',
-- config = function()
-- vim.cmd.colorscheme 'gruvbox'
-- vim.o.background = 'dark'
-- vim.o.termguicolors = true
-- end
-- },
{ {
-- Set lualine as statusline -- Set lualine as statusline
@ -266,7 +267,7 @@ vim.o.number = true
vim.o.scrolloff = 5 vim.o.scrolloff = 5
vim.o.sidescrolloff = 10 vim.o.sidescrolloff = 10
-- Set tabs to 4 spaces -- Set tabs to 2 spaces
vim.o.tabstop = 2 vim.o.tabstop = 2
vim.o.softtabstop = 2 vim.o.softtabstop = 2
@ -473,7 +474,7 @@ local servers = {
dockerls = {}, dockerls = {},
-- gradle_ls = {}, -- gradle_ls = {},
pyright = {}, pyright = {},
tsserver = {}, ts_ls = {},
html = {}, html = {},
jsonls = {}, jsonls = {},
-- jdtls = {}, -- jdtls = {},

View File

@ -0,0 +1,4 @@
-- User :%S to replace words with smart case
return {
'tpope/vim-abolish',
}

View File

@ -2,24 +2,24 @@ return {
'rmagatti/auto-session', 'rmagatti/auto-session',
config = function() config = function()
require("auto-session").setup { require("auto-session").setup {
log_level = "error", suppressed_dirs = { "~/", "~/Downloads", "/" },
auto_session_suppress_dirs = { "~/", "~/Downloads", "/"}, use_git_branch = true,
auto_save_enabled = true,
auto_restore_enabled = true, auto_restore_enabled = true,
auto_session_use_git_branch = true, pre_cwd_changed_cmds = {
auto_session_enable_last_session = true, "Neotree close"
pre_save_cmds = {
"NeoTreeClose"
},
post_save_cmds = {
"NeoTreeReveal"
},
pre_restore_cmds = {
"NeoTreeClose"
},
post_restore_cmds = {
"NeoTreeReveal"
}, },
-- pre_save_cmds = {
-- "tabdo Neotree close"
-- },
-- post_save_cmds = {
-- "tabdo Neotree"
-- },
-- pre_restore_cmds = {
-- "tabdo Neotree close"
-- },
-- post_restore_cmds = {
-- "tabdo Neotree"
-- },
} }
end end
} }

View File

@ -6,7 +6,7 @@ return {
"nvim-tree/nvim-web-devicons", -- not strictly required, but recommended "nvim-tree/nvim-web-devicons", -- not strictly required, but recommended
"MunifTanjim/nui.nvim", "MunifTanjim/nui.nvim",
}, },
config = function () config = function()
-- Unless you are still migrating, remove the deprecated commands from v1.x -- Unless you are still migrating, remove the deprecated commands from v1.x
vim.cmd([[ let g:neo_tree_remove_legacy_commands = 1 ]]) vim.cmd([[ let g:neo_tree_remove_legacy_commands = 1 ]])
@ -14,7 +14,7 @@ return {
close_if_last_window = true, close_if_last_window = true,
} }
vim.keymap.set('n', '<leader>nf', ':NeoTreeFloatToggle<CR>', { desc = '[N]eoTree [F]loat Toggle' }) vim.keymap.set('n', '<leader>nf', ':Neotree show float toggle<CR>', { desc = '[N]eoTree [F]loat Toggle' })
vim.keymap.set('n', '<leader>nr', ':NeoTreeRevealToggle<CR>', { desc = '[N]eoTree [R]eveal Toggle' }) vim.keymap.set('n', '<leader>nr', ':Neotree show toggle<CR>', { desc = '[N]eoTree [R]eveal Toggle' })
end, end,
} }

View File

@ -1,18 +1,12 @@
return { return {
'ray-x/go.nvim', 'ray-x/go.nvim',
requires = { requires = {
'ray-x/guihua.lua' 'ray-x/guihua.lua',
'neovim/nvim-lspconfig',
'nvim-treesitter/nvim-treesitter',
}, },
config = function() config = function()
require("go").setup() require('go').setup()
local format_sync_grp = vim.api.nvim_create_augroup("GoImport", {})
vim.api.nvim_create_autocmd("BufWritePre", {
pattern = "*.go",
callback = function()
require('go.format').goimport()
end,
group = format_sync_grp,
})
end, end,
event = { 'CmdlineEnter' }, event = { 'CmdlineEnter' },
ft = { 'go', 'gomod' }, ft = { 'go', 'gomod' },

View File

@ -0,0 +1,9 @@
return {
"iamcco/markdown-preview.nvim",
cmd = { "MarkdownPreviewToggle", "MarkdownPreview", "MarkdownPreviewStop" },
ft = { "markdown" },
build = "cd app && yarn install",
init = function()
vim.g.mkdp_filetypes = { "markdown" }
end
}

View File

@ -5,7 +5,12 @@
return { return {
'neovim/nvim-lspconfig', 'neovim/nvim-lspconfig',
dependencies = {
'ray-x/go.nvim',
'ray-x/guihua.lua',
},
config = function() config = function()
require("go").setup()
-- Switch for controlling whether you want autoformatting. -- Switch for controlling whether you want autoformatting.
-- Use :KickstartFormatToggle to toggle autoformatting on or off -- Use :KickstartFormatToggle to toggle autoformatting on or off
local format_is_enabled = true local format_is_enabled = true
@ -60,12 +65,16 @@ return {
return return
end end
vim.lsp.buf.format { if vim.bo.filetype == 'go' then
async = false, require('go.format').goimport()
filter = function(c) else
return c.id == client.id vim.lsp.buf.format {
end, async = false,
} filter = function(c)
return c.id == client.id
end,
}
end
end, end,
}) })
end, end,

View File

@ -24,22 +24,49 @@ return {
'leoluz/nvim-dap-go', 'leoluz/nvim-dap-go',
'microsoft/vscode-js-debug', 'microsoft/vscode-js-debug',
'mxsdev/nvim-dap-vscode-js', 'mxsdev/nvim-dap-vscode-js',
'julianolf/nvim-dap-lldb',
'vadimcn/codelldb',
}, },
config = function() config = function()
local dap = require 'dap' local dap = require 'dap'
local dapui = require 'dapui' local dapui = require 'dapui'
dap.adapters.lldb = {
type = 'server',
command = vim.fn.expand('$HOME/.local/share/nvim/mason/bin/codelldb'),
host = '127.0.0.1',
port = 13000,
}
dap.configurations.cpp = {
{
name = 'Launch Editor (Development)',
type = 'lldb',
request = 'launch',
program = '/home/wil/dev/ue5/Engine/Binaries/Linux/UnrealEditor',
preLaunchTask = 'Editor Linux Development Build',
args = {
'/home/wil/dev/sro/game/SRO.uproject',
'--port ${port}',
},
-- terminal = 'integrated',
cwd = '/home/wil/dev/ue5',
-- visualizerFile = '/home/wil/dev/ue5/Engine/Extras/VisualStudioDebugging/Unreal.natvis',
-- showDisplayString = 'true',
},
}
require('mason-nvim-dap').setup { require('mason-nvim-dap').setup {
-- Makes a best effort to setup the various debuggers with -- Makes a best effort to setup the various debuggers with
-- reasonable debug configurations -- reasonable debug configurations
automatic_setup = false, automatic_installation = true,
-- You'll need to check that you have the required things installed -- You'll need to check that you have the required things installed
-- online, please don't ask me how to install them :) -- online, please don't ask me how to install them :)
ensure_installed = { ensure_installed = {
-- Update this to ensure that you have the debuggers for the langs you want -- Update this to ensure that you have the debuggers for the langs you want
'delve', -- 'delve',
'js', 'js',
'node2', 'node2',
'cppdbg', 'cppdbg',
@ -86,8 +113,8 @@ return {
} }
dap.listeners.after.event_initialized['dapui_config'] = dapui.open dap.listeners.after.event_initialized['dapui_config'] = dapui.open
dap.listeners.before.event_terminated['dapui_config'] = dapui.close -- dap.listeners.before.event_terminated['dapui_config'] = dapui.close
dap.listeners.before.event_exited['dapui_config'] = dapui.close -- dap.listeners.before.event_exited['dapui_config'] = dapui.close
dap.defaults.fallback.exception_breakpoints = { 'Notice', 'Warning', 'Error', 'Exception' } dap.defaults.fallback.exception_breakpoints = { 'Notice', 'Warning', 'Error', 'Exception' }
@ -101,6 +128,7 @@ return {
adapters = { "pwa-node", "pwa-chrome", "pwa-msedge", "node-terminal", "pwa-extensionHost" }, adapters = { "pwa-node", "pwa-chrome", "pwa-msedge", "node-terminal", "pwa-extensionHost" },
} }
for _, jsLang in ipairs({ 'typescript', 'javascript' }) do for _, jsLang in ipairs({ 'typescript', 'javascript' }) do
require("dap").configurations[jsLang] = { require("dap").configurations[jsLang] = {
{ {