From 0e22c8ba89a40bc28eabe9fbcfce64a55ac8790a Mon Sep 17 00:00:00 2001 From: steven-na Date: Fri, 2 Oct 2026 01:23:16 -0700 Subject: Small changes --- arch/alpvim/.config/alpvim/init.lua | 154 ++++++++++++++++++++++++------- arch/alpvim/.config/alpvim/init.lua.old | 10 ++ arch/hyprland/.config/hypr/keybinds.conf | 5 + 3 files changed, 136 insertions(+), 33 deletions(-) (limited to 'arch') diff --git a/arch/alpvim/.config/alpvim/init.lua b/arch/alpvim/.config/alpvim/init.lua index 96b073f..dd03da2 100644 --- a/arch/alpvim/.config/alpvim/init.lua +++ b/arch/alpvim/.config/alpvim/init.lua @@ -1,7 +1,14 @@ -- Bootstrap lazy.nvim local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" if not vim.uv.fs_stat(lazypath) then - vim.fn.system({ "git", "clone", "--filter=blob:none", "https://github.com/folke/lazy.nvim.git", "--branch=stable", lazypath }) + vim.fn.system({ + "git", + "clone", + "--filter=blob:none", + "https://github.com/folke/lazy.nvim.git", + "--branch=stable", + lazypath, + }) end vim.opt.rtp:prepend(lazypath) @@ -147,10 +154,23 @@ require("lazy").setup({ { -- Buffer-based file explorer "stevearc/oil.nvim", lazy = false, - keys = { { "e", "Oil", desc = "File explorer" }, { "-", "Oil", desc = "Open parent dir" } }, + keys = { + { "e", "Oil", desc = "File explorer" }, + { "-", "Oil", desc = "Open parent dir" }, + }, opts = { default_file_explorer = true, view_options = { show_hidden = true }, constrain_cursor = false }, }, + { + "nvim-telescope/telescope.nvim", + dependencies = { "nvim-lua/plenary.nvim" }, + config = function() + local builtin = require("telescope.builtin") + + vim.keymap.set("n", "ff", builtin.find_files, { desc = "Telescope Find Files" }) + vim.keymap.set("n", "fg", builtin.live_grep, { desc = "Telescope Live Grep" }) + end, + }, { -- Treesitter (syntax highlighting + textobjects) "nvim-treesitter/nvim-treesitter", branch = "main", @@ -182,12 +202,18 @@ require("lazy").setup({ local tmap = vim.keymap.set local objs = { -- text objects: { keymap suffix, query, description } - { "af", "@function.outer", "around function" }, { "if", "@function.inner", "inside function" }, - { "ac", "@class.outer", "around class" }, { "ic", "@class.inner", "inside class" }, - { "aa", "@parameter.outer", "around argument" }, { "ia", "@parameter.inner", "inside argument" }, - { "ab", "@block.outer", "around block" }, { "ib", "@block.inner", "inside block" }, - { "ai", "@conditional.outer", "around conditional" }, { "ii", "@conditional.inner", "inside conditional" }, - { "al", "@loop.outer", "around loop" }, { "il", "@loop.inner", "inside loop" }, + { "af", "@function.outer", "around function" }, + { "if", "@function.inner", "inside function" }, + { "ac", "@class.outer", "around class" }, + { "ic", "@class.inner", "inside class" }, + { "aa", "@parameter.outer", "around argument" }, + { "ia", "@parameter.inner", "inside argument" }, + { "ab", "@block.outer", "around block" }, + { "ib", "@block.inner", "inside block" }, + { "ai", "@conditional.outer", "around conditional" }, + { "ii", "@conditional.inner", "inside conditional" }, + { "al", "@loop.outer", "around loop" }, + { "il", "@loop.inner", "inside loop" }, } for _, o in ipairs(objs) do local lhs, q, d = o[1], o[2], o[3] @@ -198,10 +224,14 @@ require("lazy").setup({ local nmo = { "n", "x", "o" } local moves = { -- { keymap, move method, query, description } - { "]m", "goto_next_start", "@function.outer", "next func start" }, { "[m", "goto_previous_start", "@function.outer", "prev func start" }, - { "]M", "goto_next_end", "@function.outer", "next func end" }, { "[M", "goto_previous_end", "@function.outer", "prev func end" }, - { "]]", "goto_next_start", "@class.outer", "next class start" }, { "[[", "goto_previous_start", "@class.outer", "prev class start" }, - { "][", "goto_next_end", "@class.outer", "next class end" }, { "[]", "goto_previous_end", "@class.outer", "prev class end" }, + { "]m", "goto_next_start", "@function.outer", "next func start" }, + { "[m", "goto_previous_start", "@function.outer", "prev func start" }, + { "]M", "goto_next_end", "@function.outer", "next func end" }, + { "[M", "goto_previous_end", "@function.outer", "prev func end" }, + { "]]", "goto_next_start", "@class.outer", "next class start" }, + { "[[", "goto_previous_start", "@class.outer", "prev class start" }, + { "][", "goto_next_end", "@class.outer", "next class end" }, + { "[]", "goto_previous_end", "@class.outer", "prev class end" }, } for _, mv in ipairs(moves) do local lhs, method, q, d = mv[1], mv[2], mv[3], mv[4] @@ -238,8 +268,20 @@ require("lazy").setup({ dependencies = { "kevinhwang91/promise-async" }, event = "BufReadPost", keys = { - { "zR", function() require("ufo").openAllFolds() end, desc = "Open all folds" }, - { "zM", function() require("ufo").closeAllFolds() end, desc = "Close all folds" }, + { + "zR", + function() + require("ufo").openAllFolds() + end, + desc = "Open all folds", + }, + { + "zM", + function() + require("ufo").closeAllFolds() + end, + desc = "Close all folds", + }, }, opts = { provider_selector = function() @@ -258,11 +300,16 @@ require("lazy").setup({ opts = { keymap = { preset = "none", - [""] = { "show", "show_documentation", "hide_documentation" }, [""] = { "hide" }, - [""] = { "accept", "fallback" }, [""] = { expand_menu, "select_next", "fallback" }, - [""] = { "select_prev", "fallback" }, [""] = { "scroll_documentation_up", "fallback" }, - [""] = { "scroll_documentation_down", "fallback" }, [""] = { "select_next", "fallback" }, - [""] = { "select_prev", "fallback" }, [""] = { "snippet_forward", "fallback" }, + [""] = { "show", "show_documentation", "hide_documentation" }, + [""] = { "hide" }, + [""] = { "accept", "fallback" }, + [""] = { expand_menu, "select_next", "fallback" }, + [""] = { "select_prev", "fallback" }, + [""] = { "scroll_documentation_up", "fallback" }, + [""] = { "scroll_documentation_down", "fallback" }, + [""] = { "select_next", "fallback" }, + [""] = { "select_prev", "fallback" }, + [""] = { "snippet_forward", "fallback" }, [""] = { "snippet_backward", "fallback" }, }, sources = { default = { "lsp", "path", "snippets", "buffer" } }, @@ -296,10 +343,22 @@ require("lazy").setup({ config = function() local palette_path = vim.fn.expand("~/.cache/wallust/nvim.lua") local fallback = { - base00 = "#1e1e2e", base01 = "#181825", base02 = "#313244", base03 = "#45475a", - base04 = "#585b70", base05 = "#cdd6f4", base06 = "#f5c2e7", base07 = "#b4befe", - base08 = "#f38ba8", base09 = "#fab387", base0A = "#f9e2af", base0B = "#a6e3a1", - base0C = "#94e2d5", base0D = "#89b4fa", base0E = "#cba6f7", base0F = "#f2cdcd", + base00 = "#1e1e2e", + base01 = "#181825", + base02 = "#313244", + base03 = "#45475a", + base04 = "#585b70", + base05 = "#cdd6f4", + base06 = "#f5c2e7", + base07 = "#b4befe", + base08 = "#f38ba8", + base09 = "#fab387", + base0A = "#f9e2af", + base0B = "#a6e3a1", + base0C = "#94e2d5", + base0D = "#89b4fa", + base0E = "#cba6f7", + base0F = "#f2cdcd", } local function load_palette() local ok, p = pcall(dofile, palette_path) @@ -308,11 +367,34 @@ require("lazy").setup({ -- groups cleared to guibg=NONE when transparency is toggled on local transparent_groups = { - "Normal", "NormalNC", "NormalFloat", "SignColumn", "FoldColumn", "EndOfBuffer", - "LineNr", "LineNrAbove", "LineNrBelow", "CursorLineNr", "CursorLine", "StatusLine", - "StatusLineNC", "TabLine", "TabLineFill", "TabLineSel", "VertSplit", "WinSeparator", - "Pmenu", "PmenuSbar", "PmenuThumb", "FloatBorder", "FloatTitle", "CursorLineSign", - "DiagnosticSignError", "DiagnosticSignWarn", "DiagnosticSignInfo", "DiagnosticSignHint", + "Normal", + "NormalNC", + "NormalFloat", + "SignColumn", + "FoldColumn", + "EndOfBuffer", + "LineNr", + "LineNrAbove", + "LineNrBelow", + "CursorLineNr", + "CursorLine", + "StatusLine", + "StatusLineNC", + "TabLine", + "TabLineFill", + "TabLineSel", + "VertSplit", + "WinSeparator", + "Pmenu", + "PmenuSbar", + "PmenuThumb", + "FloatBorder", + "FloatTitle", + "CursorLineSign", + "DiagnosticSignError", + "DiagnosticSignWarn", + "DiagnosticSignInfo", + "DiagnosticSignHint", } local function apply_transparent() for _, grp in ipairs(transparent_groups) do @@ -349,9 +431,13 @@ require("lazy").setup({ local watcher = vim.uv.new_fs_event() -- live-reload palette on wallust regen if watcher then - watcher:start(palette_path, {}, vim.schedule_wrap(function() - apply(load_palette()) - end)) + watcher:start( + palette_path, + {}, + vim.schedule_wrap(function() + apply(load_palette()) + end) + ) end vim.keymap.set("n", "tt", function() @@ -397,8 +483,10 @@ require("lazy").setup({ virtual_text = true, signs = { text = { - [vim.diagnostic.severity.ERROR] = "E", [vim.diagnostic.severity.WARN] = "W", - [vim.diagnostic.severity.INFO] = "I", [vim.diagnostic.severity.HINT] = "H", + [vim.diagnostic.severity.ERROR] = "E", + [vim.diagnostic.severity.WARN] = "W", + [vim.diagnostic.severity.INFO] = "I", + [vim.diagnostic.severity.HINT] = "H", }, }, underline = true, diff --git a/arch/alpvim/.config/alpvim/init.lua.old b/arch/alpvim/.config/alpvim/init.lua.old index 46a4ef3..f6d4c07 100644 --- a/arch/alpvim/.config/alpvim/init.lua.old +++ b/arch/alpvim/.config/alpvim/init.lua.old @@ -207,6 +207,16 @@ require("lazy").setup({ constrain_cursor = false, }, }, + { + "nvim-telescope/telescope.nvim", + dependencies = { "nvim-lua/plenary.nvim" }, + config = function() + local builtin = require("telescope.builtin") + + vim.keymap.set("n", "ff", builtin.find_files, { desc = "Telescope Find Files" }) + vim.keymap.set("n", "fg", builtin.live_grep, { desc = "Telescope Live Grep" }) + end + }, -- Treesitter (syntax highlighting + textobjects) { diff --git a/arch/hyprland/.config/hypr/keybinds.conf b/arch/hyprland/.config/hypr/keybinds.conf index 47ab084..3323ca5 100644 --- a/arch/hyprland/.config/hypr/keybinds.conf +++ b/arch/hyprland/.config/hypr/keybinds.conf @@ -13,10 +13,15 @@ bind = $mainMod SHIFT, F, exec, zen-browser # Keyboard pointer modes (wl-kbptr) bind = $mainMod, G, exec, pkill wl-kbptr || true; wl-kbptr -o modes=floating,click -o mode_floating.source=detect +bind = $mainMod SHIFT, G, exec, pkill wl-kbptr || true; wl-kbptr -o modes=floating,click -o mode_floating.source=detect -o mode_click.button=right bind = $mainMod, M, exec, pkill wl-kbptr || true; wl-kbptr -o modes=tile,bisect,click # Clipboard bind = $mainMod SHIFT, V, exec, cliphist list | bemenu | cliphist decode | wl-copy +bindr= $mainMod, V, exec, sleep 0.25 && wl-paste --primary | wtype - + +# Morse +bind = $mainMod, O, exec, morse-train # ── Focus movement ──────────────────────────────────────────────────────────── bind = $mainMod, left, movefocus, l -- cgit v1.2.3