mqttr/dotfiles
1
0
Fork 0
mirror of https://github.com/mqttr/dotfiles.git synced 2025-12-15 04:25:50 -06:00
Code Issues Packages Projects Releases Wiki Activity

Many changes lol

Browse Source
This commit is contained in:
mattr
2025-02-03 16:51:51 -06:00
parent 79eef026d6
commit 5718d7336a
7 changed files with 137 additions and 237 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
nvim/init.lua
View File

@@ -107,8 +107,19 @@ vim.keymap.set('t', '<C-x>', '<C-\\><C-n>', { silent=true, desc = 'Exit terminal
-- Skipping Sections
vim.keymap.set('n', '<C-Up>', 'zz20kzz', { silent=true, desc = 'Skip Large Sections' })
vim.keymap.set('n', '<C-Down>', 'zz20jzz', { silent=true, desc = 'Skip Large Sections' })
vim.keymap.set('i', '<C-Up>', '<ESC>2ka', { silent=true, desc = 'Skip Large Sections' })
vim.keymap.set('i', '<C-Down>', '<ESC>2ja', { silent=true, desc = 'Skip Large Sections' })
vim.keymap.set('i', '<C-Up>', '<C-o>2k', { silent=true, desc = 'Skip Large Sections' })
vim.keymap.set('i', '<C-Down>', '<C-o>2j', { silent=true, desc = 'Skip Large Sections' })
vim.keymap.set('n', '<A-k>', 'zz20kzz', { silent=true, desc = 'Skip Large Sections' })
vim.keymap.set('n', '<A-j>', 'zz20jzz', { silent=true, desc = 'Skip Large Sections' })
vim.keymap.set('n', '<A-h>', '10h', { silent=true, desc = 'Skip Large Sections' })
vim.keymap.set('n', '<A-l>', '10l', { silent=true, desc = 'Skip Large Sections' })
vim.keymap.set('i', '<A-k>', '<C-o>2k', { silent=true, desc = 'Skip Large Sections' })
vim.keymap.set('i', '<A-j>', '<C-o>2j', { silent=true, desc = 'Skip Large Sections' })
vim.keymap.set('i', '<A-l>', '<C-o>10l', { silent=true, desc = 'Skip Large Sections' })
vim.keymap.set('i', '<A-h>', '<C-o>10h', { silent=true, desc = 'Skip Large Sections' })
--------------------
-- Window Manipulation
@@ -145,6 +156,13 @@ if not (vim.uv or vim.loop).fs_stat(lazypath) then
end ---@diagnostic disable-next-line: undefined-field
vim.opt.rtp:prepend(lazypath)
-- vim.notify = function(msg, level, opts)
-- if msg:match("blink.cmp") then
-- return -- Ignore messages from blink.cmp
-- end
-- vim.fn.notify(msg, level, opts)
-- end
require('lazy').setup({
-- Was constantly fighting this. It get's it wrong istg ;-;
-- 'tpope/vim-sleuth', -- Detect tabstop and shiftwidth automatically
@@ -339,6 +357,7 @@ require('lazy').setup({
require 'plugins.terminal',
require 'plugins.venn',
require 'plugins.blinkcmp',
require 'plugins.colorful_indent',
-- require 'plugins.debug',
-- Highlight todo, notes, etc in comments
{
@@ -446,4 +465,4 @@ require('lazy').setup({
},
})
require('config.lsp')
require('config')

41
nvim/lazy-lock.json
View File

@@ -1,30 +1,31 @@
{
"FTerm.nvim": { "branch": "master", "commit": "d1320892cc2ebab472935242d9d992a2c9570180" },
"barbar.nvim": { "branch": "master", "commit": "53b5a2f34b68875898f0531032fbf090e3952ad7" },
"blink.cmp": { "branch": "main", "commit": "75cadbcd2657ed01326ca2b0e5e4d78a77127ca3" },
"blink.cmp": { "branch": "main", "commit": "b6f11a0aa33e601c469a126e3ed6e35208fe3ea3" },
"fine-cmdline.nvim": { "branch": "main", "commit": "aec9efebf6f4606a5204d49ffa3ce2eeb7e08a3e" },
"friendly-snippets": { "branch": "main", "commit": "de8fce94985873666bd9712ea3e49ee17aadb1ed" },
"gitsigns.nvim": { "branch": "main", "commit": "4daf7022f1481edf1e8fb9947df13bb07c18e89a" },
"lazy.nvim": { "branch": "main", "commit": "7967abe55752aa90532e6bb4bd4663fe27a264cb" },
"lspsaga.nvim": { "branch": "main", "commit": "d027f8b9c7c55e26cf4030c8657a2fc8222ed762" },
"markview.nvim": { "branch": "main", "commit": "67b69cdaf9055bebac3682a070d7e5c8eecba29c" },
"mason-lspconfig.nvim": { "branch": "main", "commit": "4d0e5b49363cac187326998b96aa6a2884e0e89b" },
"friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" },
"gitsigns.nvim": { "branch": "main", "commit": "c6fedfd0b1715ee624384b134becec0a7b0a3d28" },
"indent-blankline.nvim": { "branch": "master", "commit": "e10626f7fcd51ccd56d7ffc00883ba7e0aa28f78" },
"lazy.nvim": { "branch": "main", "commit": "d8f26efd456190241afd1b0f5235fe6fdba13d4a" },
"lspsaga.nvim": { "branch": "main", "commit": "da8a66c53241876bba140980469876db3a183604" },
"markview.nvim": { "branch": "main", "commit": "d231b66c440dbd29f7f0142f6bba33dd131834b9" },
"mason-lspconfig.nvim": { "branch": "main", "commit": "e942edf5c85b6a2ab74059ea566cac5b3e1514a4" },
"mason-tool-installer.nvim": { "branch": "main", "commit": "c5e07b8ff54187716334d585db34282e46fa2932" },
"mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
"mini.nvim": { "branch": "main", "commit": "7b4d5d48b6b5a75009d63f8f3e4ef4819b7e8139" },
"neo-tree.nvim": { "branch": "main", "commit": "a77af2e764c5ed4038d27d1c463fa49cd4794e07" },
"nui.nvim": { "branch": "main", "commit": "b58e2bfda5cea347c9d58b7f11cf3012c7b3953f" },
"nvim-autopairs": { "branch": "master", "commit": "ee297f215e95a60b01fde33275cc3c820eddeebe" },
"nvim-cmp": { "branch": "main", "commit": "f17d9b4394027ff4442b298398dfcaab97e40c4f" },
"nvim-lspconfig": { "branch": "master", "commit": "4cb925e96288a71409a86c84fd97f4434a95453e" },
"nvim-treesitter": { "branch": "master", "commit": "bb06afa3f1111780932b3c5493ad65473ce85f9d" },
"nvim-web-devicons": { "branch": "master", "commit": "19d257cf889f79f4022163c3fbb5e08639077bd8" },
"plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" },
"telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" },
"mini.nvim": { "branch": "main", "commit": "12ebac8280869048c286d13bd35cfa6653e07642" },
"neo-tree.nvim": { "branch": "main", "commit": "5d172e8315444dbc32867d1c7b04d8e7e68ec4e1" },
"nui.nvim": { "branch": "main", "commit": "53e907ffe5eedebdca1cd503b00aa8692068ca46" },
"nvim-autopairs": { "branch": "master", "commit": "3d02855468f94bf435db41b661b58ec4f48a06b7" },
"nvim-cmp": { "branch": "main", "commit": "12509903a5723a876abd65953109f926f4634c30" },
"nvim-lspconfig": { "branch": "master", "commit": "bf81bef7d75a0f4a0cf61462b318ea00b3c97cc8" },
"nvim-treesitter": { "branch": "master", "commit": "13f4346876f394973ff676670304a2b734174538" },
"nvim-web-devicons": { "branch": "master", "commit": "1c9136332840edee0c593f2f4f89598c8ed97f5f" },
"plenary.nvim": { "branch": "master", "commit": "3707cdb1e43f5cea73afb6037e6494e7ce847a66" },
"telescope-fzf-native.nvim": { "branch": "main", "commit": "dae2eac9d91464448b584c7949a31df8faefec56" },
"telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" },
"telescope.nvim": { "branch": "0.1.x", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" },
"todo-comments.nvim": { "branch": "main", "commit": "ae0a2afb47cf7395dc400e5dc4e05274bf4fb9e0" },
"tokyonight.nvim": { "branch": "main", "commit": "ce91ba480070c95f40753e4663e32b4632ac6db3" },
"todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" },
"tokyonight.nvim": { "branch": "main", "commit": "dca4adba7dc5f09302a00b0e76078d54d82d2658" },
"venn.nvim": { "branch": "main", "commit": "b09c2f36ddf70b498281845109bedcf08a7e0de0" },
"which-key.nvim": { "branch": "main", "commit": "68e37e12913a66b60073906f5d3f14dee0de19f2" }
"which-key.nvim": { "branch": "main", "commit": "0e76a87ac51772569aec678dc74baa8e2a86100c" }
}

1
nvim/lua/config/init.lua
View File

@@ -1 +1,2 @@
require 'config.lsp'
require 'config.colorful_indent'

20
nvim/lua/config/lsp.lua
View File

@@ -1,10 +1,18 @@
-- Disable Virtual Text Warnings and Errors
vim.diagnostic.config({
virtual_text = false,
-- virtual_text = false,
signs = true,
float = { border = "single" },
})
local lsp = vim.lsp
local handlers = lsp.handlers
-- Hover doc popup
local pop_opts = { border = "rounded", max_width = 80 }
handlers["textDocument/hover"] = lsp.with(handlers.hover, pop_opts)
handlers["textDocument/signatureHelp"] = lsp.with(handlers.signature_help, pop_opts)
-- Quick Keybinds via g
vim.keymap.set('n', 'gr', "<cmd>Lspsaga rename<cr>", {silent = true, noremap = true, desc = 'Lsp Saga Rename'})
vim.keymap.set('n', 'gx', "<cmd>Lspsaga code_action<cr>", {silent = true, noremap = true, desc = 'Lsp Saga Code Action'})
@@ -23,4 +31,12 @@ vim.keymap.set('n', '<leader>da', "<cmd>Lspsaga show_workspace_diagnostics<cr>",
vim.keymap.set('n', '<leader>dd', "<cmd>Lspsaga show_line_diagnostics<cr>", { silent = true, noremap = true, desc = 'Lsp Saga Show Line Diagnostic' })
for _, method in ipairs({ 'textDocument/diagnostic', 'workspace/diagnostic' }) do
local default_diagnostic_handler = vim.lsp.handlers[method]
vim.lsp.handlers[method] = function(err, result, context, config)
if err ~= nil and err.code == -32802 then
return
end
return default_diagnostic_handler(err, result, context, config)
end
end

44
nvim/lua/plugins/blinkcmp.lua
View File

@@ -3,25 +3,43 @@ return {
lazy = false, -- lazy loading handled internally
-- optional: provides snippets for the snippet source
dependencies = 'rafamadriz/friendly-snippets',
-- use a release tag to download pre-built binaries
version = 'v0.*',
-- OR build from source, requires nightly: https://rust-lang.github.io/rustup/concepts/channels.html#working-with-nightly-rust
-- build = 'cargo build --release',
opts = {
highlight = {
-- sets the fallback highlight groups to nvim-cmp's highlight groups
-- useful for when your theme doesn't support blink.cmp
-- will be removed in a future release, assuming themes add support
use_nvim_cmp_as_default = true,
keymap = { preset = 'super-tab' },
completion = {
menu = {
-- min_width = 30,
-- max_width = 50,
-- max_height = 20,
border = 'rounded', -- Rounded corners for a fancy look
winblend = 10, -- Slight transparency for a modern look
winhighlight = 'Normal:BlinkCmpMenu,FloatBorder:BlinkCmpMenuBorder,CursorLine:BlinkCmpMenuSelection,Search:None',
scrolloff = 2,
},
documentation = {
auto_show = true,
window = {
border = 'rounded',
winblend = 10,
winhighlight = 'Normal:BlinkCmpDoc,FloatBorder:BlinkCmpDocBorder,CursorLine:BlinkCmpDocCursorLine,Search:None',
},
},
ghost_text = { enabled = true },
accept = { auto_brackets = { enabled = true } },
-- signature = {
-- enabled = true,
-- }
},
},
-- set to 'mono' for 'Nerd Font Mono' or 'normal' for 'Nerd Font'
-- adjusts spacing to ensure icons are aligned
nerd_font_variant = 'normal',
-- experimental auto-brackets support
-- accept = { auto_brackets = { enabled = true } }
-- experimental signature help support
trigger = { signature_help = { enabled = true } }
}
appearance = {
use_nvim_cmp_as_default = true,
nerd_font_variant = 'mono',
},
}

241
nvim/lua/plugins/lsp.lua
View File

@@ -5,17 +5,28 @@ local servers = {
"lua_ls",
'bashls',
'yamlls',
'gopls',
'html',
'cssls',
}
-- local capabilities = base.capabilities
-- local on_attach = base.on_attach
return {
{ "williamboman/mason.nvim" },
{
"williamboman/mason.nvim",
ensure_installed = {
"rust_analyzer",
"clangd",
"basedpyright",
"lua_ls",
'bashls',
'yamlls',
'gopls',
'html',
'cssls',
}
},
{
"williamboman/mason-lspconfig.nvim",
config = function ()
require('mason-lspconfig').setup({
ensure_installed = servers
@@ -36,8 +47,33 @@ return {
dependencies = {
{ 'williamboman/mason.nvim', config = true },
'williamboman/mason-lspconfig.nvim',
'WhoIsSethDaniel/mason-tool-installer.nvim',
'saghen/blink.cmp',
},
opts = {
servers = {
rust_analyzer = {},
clangd = {},
basedpyright = {},
lua_ls = {},
bashls = {},
yamlls = {},
gopls = {
cmd = {"gopls"},
filetypes = {"go", "gomod", "gowork", "gotmpl"},
},
html = {},
cssls = {},
},
},
config = function (_, opts)
local lspconfig = require('lspconfig')
for server, config in pairs(opts.servers) do
-- passing config.capabilities to blink.cmp merges with the capabilities in your
-- `opts[server].capabilities, if you've defined it
config.capabilities = require('blink.cmp').get_lsp_capabilities(config.capabilities)
lspconfig[server].setup(config)
end
end,
},
{
'nvimdev/lspsaga.nvim',
@@ -79,194 +115,3 @@ return {
}
}
}
-- return {
-- -- `lazydev` configures Lua LSP for your Neovim config, runtime and plugins
-- -- used for completion, annotations and signatures of Neovim apis
-- 'folke/lazydev.nvim',
-- ft = 'lua',
-- opts = {
-- library = {
-- -- Load luvit types when the `vim.uv` word is found
-- { path = 'luvit-meta/library', words = { 'vim%.uv' } },
-- },
-- },
-- },
-- { 'Bilal2453/luvit-meta', lazy = true },
-- {
-- -- Main LSP Configuration
-- 'neovim/nvim-lspconfig',
-- dependencies = {
-- -- Automatically install LSPs and related tools to stdpath for Neovim
-- { 'williamboman/mason.nvim', config = true }, -- NOTE: Must be loaded before dependants
-- 'williamboman/mason-lspconfig.nvim',
-- 'WhoIsSethDaniel/mason-tool-installer.nvim',
--
-- -- Useful status updates for LSP.
-- -- NOTE: `opts = {}` is the same as calling `require('fidget').setup({})`
-- { 'j-hui/fidget.nvim', opts = {} },
--
-- -- Allows extra capabilities provided by nvim-cmp
-- -- 'hrsh7th/cmp-nvim-lsp',
-- },
-- config = function()
-- vim.api.nvim_create_autocmd('LspAttach', {
-- group = vim.api.nvim_create_augroup('kickstart-lsp-attach', { clear = true }),
-- callback = function(event)
-- -- In this case, we create a function that lets us more easily define mappings specific
-- -- for LSP related items. It sets the mode, buffer and description for us each time.
-- local map = function(keys, func, desc, mode)
-- mode = mode or 'n'
-- vim.keymap.set(mode, keys, func, { buffer = event.buf, desc = 'LSP: ' .. desc })
-- end
--
-- -- Jump to the definition of the word under your cursor.
-- -- This is where a variable was first declared, or where a function is defined, etc.
-- -- To jump back, press <C-t>.
-- map('gd', require('telescope.builtin').lsp_definitions, '[G]oto [D]efinition')
--
-- -- Find references for the word under your cursor.
-- map('gr', require('telescope.builtin').lsp_references, '[G]oto [R]eferences')
--
-- -- Jump to the implementation of the word under your cursor.
-- -- Useful when your language has ways of declaring types without an actual implementation.
-- map('gI', require('telescope.builtin').lsp_implementations, '[G]oto [I]mplementation')
--
-- -- Jump to the type of the word under your cursor.
-- -- Useful when you're not sure what type a variable is and you want to see
-- -- the definition of its *type*, not where it was *defined*.
-- map('<leader>D', require('telescope.builtin').lsp_type_definitions, 'Type [D]efinition')
--
-- -- Fuzzy find all the symbols in your current document.
-- -- Symbols are things like variables, functions, types, etc.
-- map('<leader>ds', require('telescope.builtin').lsp_document_symbols, '[D]ocument [S]ymbols')
--
-- -- Fuzzy find all the symbols in your current workspace.
-- -- Similar to document symbols, except searches over your entire project.
-- map('<leader>ws', require('telescope.builtin').lsp_dynamic_workspace_symbols, '[W]orkspace [S]ymbols')
--
-- -- Rename the variable under your cursor.
-- -- Most Language Servers support renaming across files, etc.
-- map('<leader>rn', vim.lsp.buf.rename, '[R]e[n]ame')
--
-- -- Execute a code action, usually your cursor needs to be on top of an error
-- -- or a suggestion from your LSP for this to activate.
-- map('<leader>ca', vim.lsp.buf.code_action, '[C]ode [A]ction', { 'n', 'x' })
--
-- -- WARN: This is not Goto Definition, this is Goto Declaration.
-- -- For example, in C this would take you to the header.
-- map('gD', vim.lsp.buf.declaration, '[G]oto [D]eclaration')
--
-- -- The following two autocommands are used to highlight references of the
-- -- word under your cursor when your cursor rests there for a little while.
-- -- See `:help CursorHold` for information about when this is executed
-- --
-- -- When you move your cursor, the highlights will be cleared (the second autocommand).
-- local client = vim.lsp.get_client_by_id(event.data.client_id)
-- if client and client.supports_method(vim.lsp.protocol.Methods.textDocument_documentHighlight) then
-- local highlight_augroup = vim.api.nvim_create_augroup('kickstart-lsp-highlight', { clear = false })
-- vim.api.nvim_create_autocmd({ 'CursorHold', 'CursorHoldI' }, {
-- buffer = event.buf,
-- group = highlight_augroup,
-- callback = vim.lsp.buf.document_highlight,
-- })
--
-- vim.api.nvim_create_autocmd({ 'CursorMoved', 'CursorMovedI' }, {
-- buffer = event.buf,
-- group = highlight_augroup,
-- callback = vim.lsp.buf.clear_references,
-- })
--
-- vim.api.nvim_create_autocmd('LspDetach', {
-- group = vim.api.nvim_create_augroup('kickstart-lsp-detach', { clear = true }),
-- callback = function(event2)
-- vim.lsp.buf.clear_references()
-- vim.api.nvim_clear_autocmds { group = 'kickstart-lsp-highlight', buffer = event2.buf }
-- end,
-- })
-- end
--
-- -- The following code creates a keymap to toggle inlay hints in your
-- -- code, if the language server you are using supports them
-- --
-- -- This may be unwanted, since they displace some of your code
-- if client and client.supports_method(vim.lsp.protocol.Methods.textDocument_inlayHint) then
-- map('<leader>th', function()
-- vim.lsp.inlay_hint.enable(not vim.lsp.inlay_hint.is_enabled { bufnr = event.buf })
-- end, '[T]oggle Inlay [H]ints')
-- end
-- end,
-- })
--
-- local capabilities = vim.lsp.protocol.make_client_capabilities()
-- capabilities = vim.tbl_deep_extend('force', capabilities, require('cmp_nvim_lsp').default_capabilities())
--
-- -- Enable the following language servers
-- -- Feel free to add/remove any LSPs that you want here. They will automatically be installed.
-- --
-- -- Add any additional override configuration in the following tables. Available keys are:
-- -- - cmd (table): Override the default command used to start the server
-- -- - filetypes (table): Override the default list of associated filetypes for the server
-- -- - capabilities (table): Override fields in capabilities. Can be used to disable certain LSP features.
-- -- - settings (table): Override the default settings passed when initializing the server.
-- -- For example, to see the options for `lua_ls`, you could go to: https://luals.github.io/wiki/settings/
-- local servers = {
-- clangd = {},
-- -- gopls = {},
-- pyright = {},
-- rust_analyzer = {},
-- -- ... etc. See `:help lspconfig-all` for a list of all the pre-configured LSPs
-- --
-- -- Some languages (like typescript) have entire language plugins that can be useful:
-- -- https://github.com/pmizio/typescript-tools.nvim
-- --
-- -- But for many setups, the LSP (`ts_ls`) will work just fine
-- -- ts_ls = {},
-- --
--
-- lua_ls = {
-- -- cmd = {...},
-- -- filetypes = { ...},
-- -- capabilities = {},
-- settings = {
-- Lua = {
-- completion = {
-- callSnippet = 'Replace',
-- },
-- -- You can toggle below to ignore Lua_LS's noisy `missing-fields` warnings
-- -- diagnostics = { disable = { 'missing-fields' } },
-- },
-- },
-- },
-- }
--
-- -- Ensure the servers and tools above are installed
-- -- To check the current status of installed tools and/or manually install
-- -- other tools, you can run
-- -- :Mason
-- --
-- -- You can press `g?` for help in this menu.
-- require('mason').setup()
--
-- -- You can add other tools here that you want Mason to install
-- -- for you, so that they are available from within Neovim.
-- local ensure_installed = vim.tbl_keys(servers or {})
-- vim.list_extend(ensure_installed, {
-- 'stylua', -- Used to format Lua code
-- })
-- require('mason-tool-installer').setup { ensure_installed = ensure_installed }
--
-- require('mason-lspconfig').setup {
-- handlers = {
-- function(server_name)
-- local server = servers[server_name] or {}
-- -- This handles overriding only values explicitly passed
-- -- by the server configuration above. Useful when disabling
-- -- certain features of an LSP (for example, turning off formatting for ts_ls)
-- server.capabilities = vim.tbl_deep_extend('force', {}, capabilities, server.capabilities or {})
-- require('lspconfig')[server_name].setup(server)
-- end,
-- },
-- }
-- end,
-- }

2
zsh/.zshrc
View File

@@ -16,8 +16,8 @@ export projects="/media/shared/Projects/"
export classes=$(eza --absolute -1 $HOME/Documents/Classes | sort -t_ -k 1,1 -k 2,2r | tail -n 1)
export steam_loc="$HOME/.var/app/com.valvesoftware.Steam/.local/share/Steam/steamapps/compatdata"
export EDITOR="/usr/bin/nvim"
export GOPATH="$HOME/.go"
# Theme
ZSH_THEME="xiong-chiamiov"