modified: desktop/hypr/hyprland.conf

modified:   desktop/nvim/lazy-lock.json
	modified:   desktop/nvim/lua/lspConfig.lua
	modified:   desktop/tmux/tmux.conf
	modified:   mimeapps.list
This commit is contained in:
Acid
2026-02-23 03:05:32 -05:00
parent 8398ff267c
commit db2ed062da
5 changed files with 188 additions and 166 deletions
+1
View File
@@ -223,6 +223,7 @@ windowrule = workspace 5, match:class ^(com.discordapp.Discord)$
windowrule = workspace 7, match:class ^(net.thunderbird.Thunderbird)$
windowrule = workspace 8, match:title ^(Jellyfin Media Player)$
windowrule = workspace 8, match:class ^(chrome-calendar.*)$
windowrule = workspace 8, match:class ^(affinity)$
windowrule = workspace 8, match:title ^(Tauon)$
windowrule = workspace 9, match:class ^(steam)$
windowrule = workspace 9, match:class ^(virt-manager)$
+11 -11
View File
@@ -2,7 +2,7 @@
"LuaSnip": { "branch": "master", "commit": "dae4f5aaa3574bd0c2b9dd20fb9542a02c10471c" },
"barbar.nvim": { "branch": "master", "commit": "539d73def39c9172b4d4d769f14090e08f37b29d" },
"buffer-vacuum": { "branch": "main", "commit": "917986d31cce6501c929ab6088c0887beff56b69" },
"catppuccin": { "branch": "main", "commit": "beaf41a30c26fd7d6c386d383155cbd65dd554cd" },
"catppuccin": { "branch": "main", "commit": "0a5de4da015a175f416d6ef1eda84661623e0500" },
"cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" },
"cmp-nvim-lsp": { "branch": "main", "commit": "cbc7b02bb99fae35cb42f514762b89b5126651ef" },
"cmp-nvim-lua": { "branch": "main", "commit": "e3a22cb071eb9d6508a156306b102c45cd2d573d" },
@@ -10,34 +10,34 @@
"cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" },
"friendly-snippets": { "branch": "main", "commit": "6cd7280adead7f586db6fccbd15d2cac7e2188b9" },
"harpoon": { "branch": "master", "commit": "1bc17e3e42ea3c46b33c0bbad6a880792692a1b3" },
"indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" },
"indent-blankline.nvim": { "branch": "master", "commit": "d28a3f70721c79e3c5f6693057ae929f3d9c0a03" },
"lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" },
"local-highlight.nvim": { "branch": "master", "commit": "bdf0e15df9164b507cb9e9ba781ba29f2dd3f4a6" },
"lualine.nvim": { "branch": "master", "commit": "47f91c416daef12db467145e16bed5bbfe00add8" },
"markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" },
"mason.nvim": { "branch": "main", "commit": "44d1e90e1f66e077268191e3ee9d2ac97cc18e65" },
"neo-tree.nvim": { "branch": "v3.x", "commit": "f3df514fff2bdd4318127c40470984137f87b62e" },
"none-ls-extras.nvim": { "branch": "main", "commit": "6ced4fc4072c7b269ba95bb596196cc76e00b280" },
"none-ls.nvim": { "branch": "main", "commit": "3c206dfedf5f1385e9d29f85ffaec7874358592a" },
"none-ls-extras.nvim": { "branch": "main", "commit": "517f87c1e6cd511e787d77127d7fdb12b7b79db3" },
"none-ls.nvim": { "branch": "main", "commit": "f61f46ded0ca9edce7a09b674f8e162d10921426" },
"nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
"nvim-autopairs": { "branch": "master", "commit": "59bce2eef357189c3305e25bc6dd2d138c1683f5" },
"nvim-cmp": { "branch": "main", "commit": "da88697d7f45d16852c6b2769dc52387d1ddc45f" },
"nvim-colorizer.lua": { "branch": "master", "commit": "338409dd8a6ed74767bad3eb5269f1b903ffb3cf" },
"nvim-lspconfig": { "branch": "master", "commit": "3f58aeca0c6ece8a9fb8782ea3fcb6024f285be3" },
"nvim-colorizer.lua": { "branch": "master", "commit": "fe9eed4d48f530fc9ffe4d785a936a49fa344e1a" },
"nvim-lspconfig": { "branch": "master", "commit": "5a855bcfec7973767a1a472335684bbd71d2fa2b" },
"nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
"nvim-treesitter-textobjects": { "branch": "master", "commit": "5ca4aaa6efdcc59be46b95a3e876300cfead05ef" },
"nvim-ts-autotag": { "branch": "main", "commit": "db15f2e0df2f5db916e511e3fffb682ef2f6354f" },
"nvim-web-devicons": { "branch": "master", "commit": "803353450c374192393f5387b6a0176d0972b848" },
"nvim-ts-autotag": { "branch": "main", "commit": "8e1c0a389f20bf7f5b0dd0e00306c1247bda2595" },
"nvim-web-devicons": { "branch": "master", "commit": "746ffbb17975ebd6c40142362eee1b0249969c5c" },
"oil.nvim": { "branch": "master", "commit": "f55b25e493a7df76371cfadd0ded5004cb9cd48a" },
"plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
"rainbow-delimiters.nvim": { "branch": "master", "commit": "d6b802552cbe7d643a3b6b31f419c248d1f1e220" },
"rainbow-delimiters.nvim": { "branch": "master", "commit": "e2858c43caafec291f915ef25fbed27bbe78abbd" },
"ruffer": { "branch": "plugin", "commit": "5248604605bf1039147f3f29dcd46aa296557e9c" },
"telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" },
"telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" },
"undotree": { "branch": "master", "commit": "fc28931fbfba66ab75d9af23fe46ffbbb9de6e8c" },
"undotree": { "branch": "master", "commit": "d8f99084d98c32f651860eb0baaf89759f91debc" },
"vim-commentary": { "branch": "master", "commit": "64a654ef4a20db1727938338310209b6a63f60c9" },
"vim-devicons": { "branch": "master", "commit": "71f239af28b7214eebb60d4ea5bd040291fb7e33" },
"vim-floaterm": { "branch": "master", "commit": "a11b930f55324e9b05e2ef16511fe713f1b456a7" },
"vim-floaterm": { "branch": "master", "commit": "0ab5eb8135dc884bc543a819ac7033c15e72a76b" },
"vim-signature": { "branch": "master", "commit": "6bc3dd1294a22e897f0dcf8dd72b85f350e306bc" },
"vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" }
}
+170 -151
View File
@@ -1,196 +1,215 @@
vim.diagnostic.config({
virtual_text = true,
signs = true,
update_in_insert = false,
underline = true,
severity_sort = false,
float = true,
virtual_text = true,
signs = true,
update_in_insert = false,
underline = true,
severity_sort = false,
float = true,
})
--"'''''''Mason''''''''''''''''''''''''''''''''''''''''''''''''''''''
require("mason").setup({
ui = {
icons = {
package_installed = "",
package_pending = "",
package_uninstalled = ""
}
}
ui = {
icons = {
package_installed = "",
package_pending = "",
package_uninstalled = "",
},
},
})
-- Define capabilities for LSP servers
local capabilities = vim.lsp.protocol.make_client_capabilities()
capabilities.textDocument.completion.completionItem.snippetSupport = true
-- LSP attach callback
local lsp_attach = function(client, bufnr)
-- Helper function to set buffer-local keymaps
local bufmap = function(mode, lhs, rhs, desc)
vim.keymap.set(mode, lhs, rhs, { buffer = bufnr, desc = desc })
end
-- Helper function to set buffer-local keymaps
local bufmap = function(mode, lhs, rhs, desc)
vim.keymap.set(mode, lhs, rhs, { buffer = bufnr, desc = desc })
end
-- Keymaps for LSP actions
bufmap("n", "gd", vim.lsp.buf.definition, "Go to definition")
bufmap("n", "gD", vim.lsp.buf.declaration, "Go to declaration")
bufmap("n", "K", function()
vim.lsp.buf.hover({
border = "rounded",
})
end, "Show hover documentation")
bufmap("n", "<leader>vws", vim.lsp.buf.workspace_symbol, "Search workspace symbols")
bufmap("n", "<leader>vd", vim.diagnostic.open_float, "Show diagnostics in float")
bufmap("n", "[d", vim.diagnostic.goto_prev, "Go to previous diagnostic")
bufmap("n", "]d", vim.diagnostic.goto_next, "Go to next diagnostic")
bufmap("n", "<leader>ca", vim.lsp.buf.code_action, "Code action")
bufmap("n", "gr", vim.lsp.buf.references, "Find references")
bufmap("n", "<F2>", vim.lsp.buf.rename, "Rename symbol")
bufmap("n", "<C-k>", vim.lsp.buf.signature_help, "Show signature help")
-- Keymaps for LSP actions
bufmap("n", "gd", vim.lsp.buf.definition, "Go to definition")
bufmap("n", "gD", vim.lsp.buf.declaration, "Go to declaration")
bufmap("n", "K", function()
vim.lsp.buf.hover({
border = "rounded",
})
end, "Show hover documentation")
bufmap("n", "<leader>vws", vim.lsp.buf.workspace_symbol, "Search workspace symbols")
bufmap("n", "<leader>vd", vim.diagnostic.open_float, "Show diagnostics in float")
bufmap("n", "[d", vim.diagnostic.goto_prev, "Go to previous diagnostic")
bufmap("n", "]d", vim.diagnostic.goto_next, "Go to next diagnostic")
bufmap("n", "<leader>ca", vim.lsp.buf.code_action, "Code action")
bufmap("n", "gr", vim.lsp.buf.references, "Find references")
bufmap("n", "<F2>", vim.lsp.buf.rename, "Rename symbol")
bufmap("n", "<C-k>", vim.lsp.buf.signature_help, "Show signature help")
end
-- Mason-LSPconfig setup
local servers = { "clangd", "vtsls", "pyright", "tailwindcss", "html", "stimulus_ls", "cssls",'gopls'
,'autotools-language-server'}
local servers = {
"stylua",
"clangd",
"vtsls",
"pyright",
"tailwindcss",
"html",
"stimulus_ls",
"cssls",
"gopls",
"autotools-language-server",
}
------Uncoment on first run
-- require("mason-lspconfig").setup({
-- ensure_installed = servers,
-- })
for _, server in ipairs(servers) do
vim.lsp.config(server, {
capabilities = capabilities,
on_attach = lsp_attach
})
vim.lsp.enable(server)
vim.lsp.config(server, {
capabilities = capabilities,
on_attach = lsp_attach,
})
vim.lsp.enable(server)
end
vim.lsp.config('pyright', {
capabilities = capabilities,
on_attach = lsp_attach,
settings = {
python = {
analysis = {
autoSearchPaths = true,
useLibraryCodeForTypes = true,
stubPath = "",
diagnosticMode = 'off',
autoImportCompletions = true,
},
},
},
vim.lsp.config("pyright", {
capabilities = capabilities,
on_attach = lsp_attach,
settings = {
python = {
analysis = {
autoSearchPaths = true,
useLibraryCodeForTypes = true,
stubPath = "",
diagnosticMode = "off",
autoImportCompletions = true,
},
},
},
})
vim.lsp.enable('pyright')
vim.lsp.enable("pyright")
-- RUFF
vim.lsp.config('ruff', {
filetypes = {'python'},
init_options = {
settings = {
configuration = "~/.config/ruff/pyproject.toml"
}
}
vim.lsp.config("ruff", {
filetypes = { "python" },
init_options = {
settings = {
configuration = "~/.config/ruff/pyproject.toml",
},
},
})
vim.api.nvim_create_autocmd("LspAttach", {
group = vim.api.nvim_create_augroup('lsp_attach_disable_ruff_hover', { clear = true }),
callback = function(args)
local client = vim.lsp.get_client_by_id(args.data.client_id)
if client == nil then
return
end
if client.name == 'ruff' then
client.server_capabilities.hoverProvider = false
end
end,
desc = 'LSP: Disable hover capability from Ruff',
group = vim.api.nvim_create_augroup("lsp_attach_disable_ruff_hover", { clear = true }),
callback = function(args)
local client = vim.lsp.get_client_by_id(args.data.client_id)
if client == nil then
return
end
if client.name == "ruff" then
client.server_capabilities.hoverProvider = false
end
end,
desc = "LSP: Disable hover capability from Ruff",
})
vim.lsp.enable('ruff')
vim.lsp.enable("ruff")
vim.lsp.config("r-languageserver",{
filetypes = {'r','rmd'},
cmd = {'R', '--slave', '-e', 'languageserver::run()'},
on_attach = lsp_attach,
capabilities = capabilities,
--django experimental
vim.lsp.config("djls", {
cmd = { "djls", "serve" },
filetypes = { "htmldjango", "html", "python" },
root_markers = { "manage.py" },
})
vim.lsp.enable("r-languageserver")
vim.lsp.enable("djls")
--''''''''''''''''Non-ls/null-ls''''''''''''''''
local null_ls = require("null-ls")
local helpers = require("null-ls.helpers")
local methods = require("null-ls.methods")
local ruff_format = helpers.make_builtin({
name = "ruff_format",
method = methods.internal.FORMATTING,
filetypes = { "python" },
generator_opts = {
command = "ruff",
args = { "format", "--stdin-filename", "$FILENAME", "-" },
to_stdin = true,
},
factory = helpers.formatter_factory,
})
null_ls.setup({
sources = {
null_ls.builtins.diagnostics.djlint,
null_ls.builtins.diagnostics.cppcheck,
null_ls.builtins.diagnostics.codespell,
null_ls.builtins.diagnostics.hadolint,
null_ls.builtins.formatting.prettierd.with({ extra_args = { "--single-quote" }, }),
null_ls.builtins.formatting.gofumpt,
},
on_attach = function(client, bufnr)
if client.supports_method("textDocument/formatting") then -- run formatters on save
vim.api.nvim_create_autocmd("BufWritePre", {
buffer = bufnr,
callback = function()
vim.lsp.buf.format({ bufnr = bufnr })
end,
})
end
end,
sources = {
null_ls.builtins.diagnostics.djlint,
null_ls.builtins.diagnostics.cppcheck,
null_ls.builtins.diagnostics.codespell,
null_ls.builtins.diagnostics.hadolint,
null_ls.builtins.formatting.prettierd.with({ extra_args = { "--single-quote" } }),
null_ls.builtins.formatting.gofumpt,
null_ls.builtins.formatting.stylua,
ruff_format,
},
on_attach = function(client, bufnr)
if client.supports_method("textDocument/formatting") then -- run formatters on save
vim.api.nvim_create_autocmd("BufWritePre", {
buffer = bufnr,
callback = function()
vim.lsp.buf.format({ bufnr = bufnr })
end,
})
end
end,
})
--"'''''''''''''''''''Tree sitter highlight''''''''''''''''''''''''''''''
require'nvim-treesitter.configs'.setup {
-- A list of parser names, or "all"
ensure_installed = { "lua","bash","python",'typescript','javascript','go'},
sync_install = false,
indent = {
enable = true,
disable = function(lang, bufnr)
local enabled_langs = { "html", "javascript", "tsx" } -- Enable auto indent only for these languages
return not vim.tbl_contains(enabled_langs, lang)
end,
},
auto_install = true,
highlight = {
enable = true,
additional_vim_regex_highlighting = false,
},
textobjects = {
select = {
enable = true,
lookahead = true,
keymaps = {
["af"] = "@function.outer",
["if"] = "@function.inner",
["ac"] = "@class.outer",
["ic"] = { query = "@class.inner", desc = "Select inner part of a class region" },
["as"] = { query = "@local.scope", query_group = "locals", desc = "Select language scope" },
},
selection_modes = {
['@parameter.outer'] = 'v', -- charwise
['@function.outer'] = 'V', -- linewise
['@class.outer'] = '<c-v>', -- blockwise
},
include_surrounding_whitespace = false,
},
move = {
enable = true,
set_jumps = true,
goto_next_start = {
["<C-f>"] = "@function.outer", -- jump to next function
},
goto_previous_start = {
["<A-f>"] = "@function.outer", -- jump to previous function
},
},
},
}
require("nvim-treesitter.configs").setup({
-- A list of parser names, or "all"
ensure_installed = { "lua", "bash", "python", "typescript", "javascript", "go" },
sync_install = false,
indent = {
enable = true,
disable = function(lang, bufnr)
local enabled_langs = { "html", "javascript", "tsx", "go" } -- Enable auto indent only for these languages
return not vim.tbl_contains(enabled_langs, lang)
end,
},
auto_install = true,
highlight = {
enable = true,
additional_vim_regex_highlighting = false,
},
textobjects = {
select = {
enable = true,
lookahead = true,
keymaps = {
["af"] = "@function.outer",
["if"] = "@function.inner",
["ac"] = "@class.outer",
["ic"] = { query = "@class.inner", desc = "Select inner part of a class region" },
["as"] = { query = "@local.scope", query_group = "locals", desc = "Select language scope" },
},
selection_modes = {
["@parameter.outer"] = "v", -- charwise
["@function.outer"] = "V", -- linewise
["@class.outer"] = "<c-v>", -- blockwise
},
include_surrounding_whitespace = false,
},
move = {
enable = true,
set_jumps = true,
goto_next_start = {
["<C-f>"] = "@function.outer", -- jump to next function
},
goto_previous_start = {
["<A-f>"] = "@function.outer", -- jump to previous function
},
},
},
})
+2 -2
View File
@@ -30,8 +30,8 @@ bind-key -T copy-mode-vi C-v send-keys -X rectangle-toggle
bind-key -T copy-mode-vi y send-keys -X copy-selection-and-cancel
# open in same dir as parent
bind '"' split-window -v -c "#{pane_current_path}"
bind % split-window -h -c "#{pane_current_path}"
bind v split-window -v -c "#{pane_current_path}"
bind h split-window -h -c "#{pane_current_path}"
+4 -2
View File
@@ -10,7 +10,7 @@ inode/directory=org.wezfurlong.wezterm.desktop
audio/flac=io.bassi.Amberol.desktop
audio/mpeg=io.bassi.Amberol.desktop
text/plain=org.gnome.TextEditor.desktop
text/markdown=org.gnome.TextEditor.desktop
text/markdown=org.gnome.gitlab.somas.Apostrophe.desktop
text/csv=org.gnome.TextEditor.desktop
video/webm=mpv.desktop
video/x-matroska=mpv.desktop
@@ -32,6 +32,7 @@ application/x-extension-xhtml=firefox.desktop
application/x-extension-xht=firefox.desktop
text/x-makefile=org.gnome.TextEditor.desktop
application/x-tiled-tsx=org.gnome.TextEditor.desktop
text/x-c++src=org.gnome.TextEditor.desktop
[Added Associations]
image/svg+xml=org.gnome.Loupe.desktop;
@@ -39,7 +40,7 @@ audio/flac=io.bassi.Amberol.desktop;
audio/mpeg=io.bassi.Amberol.desktop;
text/plain=org.gnome.TextEditor.desktop;
text/csv=org.gnome.TextEditor.desktop
text/markdown=org.gnome.TextEditor.desktop;
text/markdown=org.gnome.TextEditor.desktop;org.gnome.gitlab.somas.Apostrophe.desktop;
text/x-java=org.gnome.TextEditor.desktop;
application/x-shellscript=org.gnome.TextEditor.desktop;
application/json=org.gnome.TextEditor.desktop;
@@ -55,3 +56,4 @@ application/x-extension-xhtml=firefox.desktop;
application/x-extension-xht=firefox.desktop;
text/x-makefile=org.gnome.TextEditor.desktop;
application/x-tiled-tsx=org.gnome.TextEditor.desktop;
text/x-c++src=org.gnome.TextEditor.desktop;