From b9888fa856e054293c6e1f200a887f7c17b44f14 Mon Sep 17 00:00:00 2001 From: Josue Zamudio Date: Tue, 20 Jan 2026 09:13:03 -0800 Subject: [PATCH] fix: nvim treesitter error, add hyperland lock keybind and some other cosmetic settings --- .config/hypr/hyprland.conf | 11 ++-- .config/nvim/lua/plugins/mason.lua | 82 ++++++++++++------------- .config/nvim/lua/plugins/treesitter.lua | 73 +++++++++++----------- 3 files changed, 86 insertions(+), 80 deletions(-) diff --git a/.config/hypr/hyprland.conf b/.config/hypr/hyprland.conf index b8ad20c..81b8ff0 100644 --- a/.config/hypr/hyprland.conf +++ b/.config/hypr/hyprland.conf @@ -36,7 +36,7 @@ monitor=,preferred,auto,auto # Set programs that you use $terminal = kitty $fileManager = nautilus -$menu = wofi --show drun -Gn -L 4 +$menu = wofi --show drun -GI ################# @@ -58,6 +58,7 @@ exec-once = flatpak run com.github.wwmm.easyeffects -w exec-once = powertop --auto-tune exec-once = systemctl --user start hyprpolkitagent exec-once = xrdb -merge ~/.Xresources +exec-once = gsettings set org.gnome.desktop.interface color-scheme "prefer-dark" ############################# @@ -95,8 +96,8 @@ permission = /usr/(bin|local/bin)/hyprpm, plugin, allow # https://wiki.hypr.land/Configuring/Variables/#general general { - gaps_in = 4 - gaps_out = 4 + gaps_in = 2 + gaps_out = 2 border_size = 1 @@ -117,7 +118,7 @@ general { # https://wiki.hypr.land/Configuring/Variables/#decoration decoration { - rounding = 6 + rounding = 4 rounding_power = 2 # Change transparency of focused and unfocused windows @@ -253,6 +254,8 @@ $mainMod = SUPER # Sets "Windows" key as main modifier bind = $mainMod, RETURN, exec, $terminal bind = $mainMod, D, exec, $menu bind = $mainMod, F, fullscreen +bind = $mainMod, M, exec, swaylock -c 0x000000; playerctl pause + bind = $mainMod SHIFT, SPACE, togglefloating, bind = $mainMod SHIFT, Q, hy3:killactive, bind = $mainMod SHIFT, M, exit, diff --git a/.config/nvim/lua/plugins/mason.lua b/.config/nvim/lua/plugins/mason.lua index cd7b751..81bf4f0 100644 --- a/.config/nvim/lua/plugins/mason.lua +++ b/.config/nvim/lua/plugins/mason.lua @@ -1,54 +1,54 @@ return { "mason-org/mason-lspconfig.nvim", - dependencies = { - {"mason-org/mason.nvim"}, - {'neovim/nvim-lspconfig'}, + dependencies = { + {"mason-org/mason.nvim"}, + {'neovim/nvim-lspconfig'}, - {'nvim-mini/mini.nvim'}, + {'nvim-mini/mini.nvim'}, {'nvim-mini/mini.completion'}, - }, - config = function() - require("mason").setup() + }, + config = function() + require("mason").setup() require("mason-lspconfig").setup {} - - -- NOTE: this is meant to be backwards compatible with Neovim v0.9 - --- - -- Autocompletion - --- - require('mini.snippets').setup() - require('mini.completion').setup() + -- NOTE: this is meant to be backwards compatible with Neovim v0.9 + --- + -- Autocompletion + --- - --- - -- Language server configuration - --- + --require('mini.snippets').setup() + require('mini.completion').setup() - -- These keymaps are the defaults in Neovim v0.10 - if vim.fn.has('nvim-0.11') == 0 then - -- NOTE: vim.diagnostic.goto_* methods are deprecated in v0.11 - -- that's why we put these under a conditional block - vim.keymap.set('n', '[d', 'lua vim.diagnostic.goto_prev()') - vim.keymap.set('n', ']d', 'lua vim.diagnostic.goto_next()') - vim.keymap.set('n', 'd', 'lua vim.diagnostic.open_float()') - vim.keymap.set('n', '', 'lua vim.diagnostic.open_float()') - end + --- + -- Language server configuration + --- - vim.api.nvim_create_autocmd('LspAttach', { - callback = function(event) - local bufmap = function(mode, rhs, lhs) - vim.keymap.set(mode, rhs, lhs, {buffer = event.buf}) - end + -- These keymaps are the defaults in Neovim v0.10 + if vim.fn.has('nvim-0.11') == 0 then + -- NOTE: vim.diagnostic.goto_* methods are deprecated in v0.11 + -- that's why we put these under a conditional block + vim.keymap.set('n', '[d', 'lua vim.diagnostic.goto_prev()') + vim.keymap.set('n', ']d', 'lua vim.diagnostic.goto_next()') + vim.keymap.set('n', 'd', 'lua vim.diagnostic.open_float()') + vim.keymap.set('n', '', 'lua vim.diagnostic.open_float()') + end - -- These keymaps are the defaults in Neovim v0.11 - bufmap('n', 'K', 'lua vim.lsp.buf.hover()') - bufmap('n', 'grr', 'lua vim.lsp.buf.references()') - bufmap('n', 'gri', 'lua vim.lsp.buf.implementation()') - bufmap('n', 'grn', 'lua vim.lsp.buf.rename()') - bufmap('n', 'gra', 'lua vim.lsp.buf.code_action()') - bufmap('n', 'gO', 'lua vim.lsp.buf.document_symbol()') - bufmap({'i', 's'}, '', 'lua vim.lsp.buf.signature_help()') - end, - }) + vim.api.nvim_create_autocmd('LspAttach', { + callback = function(event) + local bufmap = function(mode, rhs, lhs) + vim.keymap.set(mode, rhs, lhs, {buffer = event.buf}) + end + + -- These keymaps are the defaults in Neovim v0.11 + bufmap('n', 'K', 'lua vim.lsp.buf.hover()') + bufmap('n', 'grr', 'lua vim.lsp.buf.references()') + bufmap('n', 'gri', 'lua vim.lsp.buf.implementation()') + bufmap('n', 'grn', 'lua vim.lsp.buf.rename()') + bufmap('n', 'gra', 'lua vim.lsp.buf.code_action()') + bufmap('n', 'gO', 'lua vim.lsp.buf.document_symbol()') + bufmap({'i', 's'}, '', 'lua vim.lsp.buf.signature_help()') + end, + }) end } diff --git a/.config/nvim/lua/plugins/treesitter.lua b/.config/nvim/lua/plugins/treesitter.lua index 5beadcf..1fd2852 100644 --- a/.config/nvim/lua/plugins/treesitter.lua +++ b/.config/nvim/lua/plugins/treesitter.lua @@ -2,45 +2,48 @@ return { "nvim-treesitter/nvim-treesitter", build = ":TSUpdate", config = function() - require("nvim-treesitter.configs").setup { - -- A list of parser names, or "all" (the five listed parsers should always be installed) - ensure_installed = { "c", "lua", "vim", "vimdoc", "python", "bash", "make" }, + require("nvim-treesitter").install({}) - -- Install parsers synchronously (only applied to `ensure_installed`) - sync_install = false, + --require("nvim-treesitter.configs").setup ({ + -- -- A list of parser names, or "all" (the five listed parsers should always be installed) + -- ensure_installed = { "c", "lua", "vim", "vimdoc", "python", "bash", "make" }, - -- Automatically install missing parsers when entering buffer - -- Recommendation: set to false if you don't have `tree-sitter` CLI installed locally - auto_install = true, + -- -- Install parsers synchronously (only applied to `ensure_installed`) + -- sync_install = false, - -- List of parsers to ignore installing (for "all") - ignore_install = { "javascript" }, + -- -- Automatically install missing parsers when entering buffer + -- -- Recommendation: set to false if you don't have `tree-sitter` CLI installed locally + -- auto_install = true, - ---- If you need to change the installation directory of the parsers (see -> Advanced Setup) - -- parser_install_dir = "/some/path/to/store/parsers", -- Remember to run vim.opt.runtimepath:append("/some/path/to/store/parsers")! + -- -- List of parsers to ignore installing (for "all") + -- ignore_install = { "javascript" }, - highlight = { - enable = true, + -- ---- If you need to change the installation directory of the parsers (see -> Advanced Setup) + -- -- parser_install_dir = "/some/path/to/store/parsers", -- Remember to run vim.opt.runtimepath:append("/some/path/to/store/parsers")! - -- NOTE: these are the names of the parsers and not the filetype. (for example if you want to - -- disable highlighting for the `tex` filetype, you need to include `latex` in this list as this is - -- the name of the parser) - -- list of language that will be disabled - -- disable = { "c", "rust" }, - -- Or use a function for more flexibility, e.g. to disable slow treesitter highlight for large files - disable = function(lang, buf) - local max_filesize = 100 * 1024 -- 100 KB - local ok, stats = pcall(vim.loop.fs_stat, vim.api.nvim_buf_get_name(buf)) - if ok and stats and stats.size > max_filesize then - return true - end - end, + -- highlight = { + -- enable = true, - -- Setting this to true will run `:h syntax` and tree-sitter at the same time. - -- Set this to `true` if you depend on 'syntax' being enabled (like for indentation). - -- Using this option may slow down your editor, and you may see some duplicate highlights. - -- Instead of true it can also be a list of languages - additional_vim_regex_highlighting = false, - }, - } -end } + -- -- NOTE: these are the names of the parsers and not the filetype. (for example if you want to + -- -- disable highlighting for the `tex` filetype, you need to include `latex` in this list as this is + -- -- the name of the parser) + -- -- list of language that will be disabled + -- -- disable = { "c", "rust" }, + -- -- Or use a function for more flexibility, e.g. to disable slow treesitter highlight for large files + -- disable = function(lang, buf) + -- local max_filesize = 100 * 1024 -- 100 KB + -- local ok, stats = pcall(vim.loop.fs_stat, vim.api.nvim_buf_get_name(buf)) + -- if ok and stats and stats.size > max_filesize then + -- return true + -- end + -- end, + + -- -- Setting this to true will run `:h syntax` and tree-sitter at the same time. + -- -- Set this to `true` if you depend on 'syntax' being enabled (like for indentation). + -- -- Using this option may slow down your editor, and you may see some duplicate highlights. + -- -- Instead of true it can also be a list of languages + -- additional_vim_regex_highlighting = false, + -- }, + --}) + end +}