From c6ad959982620d31d0cc5fa802d40f5ef9ad1dc8 Mon Sep 17 00:00:00 2001 From: js0ny Date: Thu, 13 Mar 2025 10:31:31 +0000 Subject: [PATCH] minor fix --- bootstrap/components/requirements.txt | 112 +++++++++++++++++++++++++ platforms/linux/kde/kglobalshortcutsrc | 2 +- tools/browser/surfingkeys.js | 40 +++++++-- tools/doom/config.el | 14 ++-- tools/doom/init.el | 2 +- tools/nvim/lua/config/servers.lua | 44 +++++----- tools/nvim/lua/keymaps/lspkeys.lua | 1 + tools/nvim/lua/plugins/fileutils.lua | 5 +- tools/zed/keymap.json | 8 +- tools/zed/keymap_backup.json | 91 ++++++++++++++++++++ tools/zed/settings.json | 8 ++ 11 files changed, 282 insertions(+), 45 deletions(-) create mode 100644 bootstrap/components/requirements.txt mode change 100755 => 100644 tools/zed/keymap.json create mode 100644 tools/zed/keymap_backup.json diff --git a/bootstrap/components/requirements.txt b/bootstrap/components/requirements.txt new file mode 100644 index 0000000..fa5157a --- /dev/null +++ b/bootstrap/components/requirements.txt @@ -0,0 +1,112 @@ +anyio==4.8.0 +argon2-cffi==23.1.0 +argon2-cffi-bindings==21.2.0 +arrow==1.3.0 +asttokens==3.0.0 +async-lru==2.0.4 +attrs==25.1.0 +babel==2.17.0 +beautifulsoup4==4.13.3 +bleach==6.2.0 +certifi==2025.1.31 +cffi==1.17.1 +charset-normalizer==3.4.1 +comm==0.2.2 +contourpy==1.3.1 +cycler==0.12.1 +debugpy==1.8.13 +decorator==5.2.1 +defusedxml==0.7.1 +executing==2.2.0 +fastjsonschema==2.21.1 +fonttools==4.56.0 +fqdn==1.5.1 +h11==0.14.0 +httpcore==1.0.7 +httpx==0.28.1 +idna==3.10 +ipykernel==6.29.5 +ipython==9.0.2 +ipython-pygments-lexers==1.1.1 +ipywidgets==8.1.5 +isoduration==20.11.0 +jedi==0.19.2 +jinja2==3.1.6 +joblib==1.4.2 +json5==0.10.0 +jsonpointer==3.0.0 +jsonschema==4.23.0 +jsonschema-specifications==2024.10.1 +jupyter==1.1.1 +jupyter-client==8.6.3 +jupyter-console==6.6.3 +jupyter-core==5.7.2 +jupyter-events==0.12.0 +jupyter-lsp==2.2.5 +jupyter-server==2.15.0 +jupyter-server-terminals==0.5.3 +jupyterlab==4.3.5 +jupyterlab-pygments==0.3.0 +jupyterlab-server==2.27.3 +jupyterlab-widgets==3.0.13 +kiwisolver==1.4.8 +markupsafe==3.0.2 +matplotlib==3.10.1 +matplotlib-inline==0.1.7 +mistune==3.1.2 +nbclient==0.10.2 +nbconvert==7.16.6 +nbformat==5.10.4 +nest-asyncio==1.6.0 +notebook==7.3.2 +notebook-shim==0.2.4 +numpy==2.2.3 +overrides==7.7.0 +packaging==24.2 +pandas==2.2.3 +pandocfilters==1.5.1 +parso==0.8.4 +pexpect==4.9.0 +pillow==11.1.0 +platformdirs==4.3.6 +prometheus-client==0.21.1 +prompt-toolkit==3.0.50 +psutil==7.0.0 +ptyprocess==0.7.0 +pure-eval==0.2.3 +pycparser==2.22 +pygments==2.19.1 +pyparsing==3.2.1 +python-dateutil==2.9.0.post0 +python-json-logger==3.3.0 +pytz==2025.1 +pyyaml==6.0.2 +pyzmq==26.2.1 +referencing==0.36.2 +requests==2.32.3 +rfc3339-validator==0.1.4 +rfc3986-validator==0.1.1 +rpds-py==0.23.1 +scikit-learn==1.6.1 +scipy==1.15.2 +send2trash==1.8.3 +setuptools==76.0.0 +six==1.17.0 +sniffio==1.3.1 +soupsieve==2.6 +stack-data==0.6.3 +terminado==0.18.1 +threadpoolctl==3.5.0 +tinycss2==1.4.0 +tornado==6.4.2 +traitlets==5.14.3 +types-python-dateutil==2.9.0.20241206 +typing-extensions==4.12.2 +tzdata==2025.1 +uri-template==1.3.0 +urllib3==2.3.0 +wcwidth==0.2.13 +webcolors==24.11.1 +webencodings==0.5.1 +websocket-client==1.8.0 +widgetsnbextension==4.0.13 diff --git a/platforms/linux/kde/kglobalshortcutsrc b/platforms/linux/kde/kglobalshortcutsrc index f11d47d..6f43911 100644 --- a/platforms/linux/kde/kglobalshortcutsrc +++ b/platforms/linux/kde/kglobalshortcutsrc @@ -78,7 +78,7 @@ KrohnkiteFocusRight=Meta+I,none,Krohnkite: Focus Right KrohnkiteFocusUp=Meta+E,none,Krohnkite: Focus Up KrohnkiteGrowHeight=Meta+Ctrl+N,none,Krohnkite: Grow Height KrohnkiteIncrease=none,none,Krohnkite: Increase -KrohnkiteMonocleLayout=Meta+M,none,Krohnkite: Monocle Layout +KrohnkiteMonocleLayout=none,none,Krohnkite: Monocle Layout KrohnkiteNextLayout=Meta+\\\\,none,Krohnkite: Next Layout KrohnkitePreviousLayout=Meta+|,none,Krohnkite: Previous Layout KrohnkiteQuarterLayout=none,none,Krohnkite: Quarter Layout diff --git a/tools/browser/surfingkeys.js b/tools/browser/surfingkeys.js index c5042cb..adb94ec 100644 --- a/tools/browser/surfingkeys.js +++ b/tools/browser/surfingkeys.js @@ -325,7 +325,7 @@ const searchAliases = [ ["yt", "YouTube", "https://www.youtube.com/results?search_query="], ]; -api.unmap("on") +api.unmap("on"); // Add all search aliases searchAliases.forEach(([alias, name, url]) => { @@ -657,11 +657,35 @@ mapkey( }, { domain: /perplexity.ai/ }, ); +mapkey( + ",M", + "Toggle [M]odel switching", + function () { + q("div.rounded-md").querySelectorAll("span")[2].click(); + //setTimeout(() => { + // // Wait for the DOM to update + // qs("div.shadow-subtle div.group\\/item")[0].click(); + //}, 100); + }, + { domain: /perplexity.ai/ }, +); +mapkey( + ",m", + "Toggle default [m]odel (Claude 3.7 Sonnet)", + function () { + q("div.rounded-md").querySelectorAll("span")[1].click(); + setTimeout(() => { + // Wait for the DOM to update + qs("div.shadow-subtle div.group\\/item")[3].click(); + }, 100); + }, + { domain: /perplexity.ai/ }, +); mapkey( ",w", "Toggle [w]riting/[w]eb Search", function () { - q("div.rounded-md").querySelectorAll("span")[1].click(); + q("div.rounded-md").querySelectorAll("span")[2].click(); setTimeout(() => { // Wait for the DOM to update qs("div.shadow-subtle div.group\\/item")[0].click(); @@ -690,8 +714,8 @@ mapkey( { domain: /perplexity.ai/ }, ); mapkey( - ",r", - "Change model to [r]egenerate last output", + ",R", + "Change model to [R]egenerate last output", function () { var toolbars = qs("div.mt-sm"); var last = toolbars[toolbars.length - 1]; @@ -701,15 +725,13 @@ mapkey( { domain: /perplexity.ai/ }, ); mapkey( - ",R", - "Toggle [R]easoning with [R]1", + ",r", + "Toggle [r]easoning", function () { - var btns = qs("span.grow button"); - btns[0].click(); + q("div.rounded-md").querySelectorAll("span")[0].click(); setTimeout(() => { // Wait for the DOM to update qs("div.shadow-subtle div.group\\/item")[2].click(); - qs("div.group\\/item")[2].click(); // Mobile view }, 100); }, { domain: /perplexity.ai/ }, diff --git a/tools/doom/config.el b/tools/doom/config.el index a266d41..6bd836c 100644 --- a/tools/doom/config.el +++ b/tools/doom/config.el @@ -22,7 +22,7 @@ ;; accept. For example: ;; ;; https://emacs-china.org/t/doom-emacs/23513/13 -(setq doom-font (font-spec :family "LXGW WenKai Mono" :size 14) +(setq doom-font (font-spec :family "Iosevka Nerd Font Propo" :size 14) doom-serif-font doom-font doom-symbol-font (font-spec :family "LXGW WenKai Mono") doom-variable-pitch-font (font-spec :family "LXGW WenKai Mono" :weight 'extra-bold)) @@ -103,7 +103,7 @@ (add-to-list 'recentf-exclude "\\.#.+$") (add-to-list 'recentf-exclude "^/tmp/") (add-to-list 'recentf-exclude "COMMIT_EDITMSG\\'") -)[1][2] + )[1][2] @@ -133,11 +133,11 @@ (if (not (eq system-type 'windows-nt)) (use-package! rime - :config - (setq default-input-method "rime") - (add-hook! (org-mode markdown-mode) (activate-input-method default-input-method)) - (setq rime-user-data-dir (expand-file-name "emacs-rime" (getenv "XDG_CONFIG_HOME"))) - )) + :config + (setq default-input-method "rime") + (add-hook! (org-mode markdown-mode) (activate-input-method default-input-method)) + (setq rime-user-data-dir (expand-file-name "emacs-rime" (getenv "XDG_CONFIG_HOME"))) + )) (load! "calendar.el") diff --git a/tools/doom/init.el b/tools/doom/init.el index 12f2295..f11c6fc 100644 --- a/tools/doom/init.el +++ b/tools/doom/init.el @@ -193,7 +193,7 @@ ;;emms ;;everywhere ; *leave* Emacs!? You must be joking ;;irc ; how neckbeards socialize - ;;(rss +org) ; emacs as an RSS reader + (rss +org) ; emacs as an RSS reader :config ;;literate diff --git a/tools/nvim/lua/config/servers.lua b/tools/nvim/lua/config/servers.lua index 2a499b0..3508981 100644 --- a/tools/nvim/lua/config/servers.lua +++ b/tools/nvim/lua/config/servers.lua @@ -6,32 +6,32 @@ local M = {} -- Use :Mason to list all available servers M.servers = { "ast_grep", - "bashls", -- Bash - "clangd", -- C/C++ - "cssls", -- CSS - "denols", -- Deno + "bashls", -- Bash + "clangd", -- C/C++ + "cssls", -- CSS + "denols", -- Deno -- "cmake", -- CMake - "eslint", -- JavaScript - "gopls", -- Go - "hls", -- Haskell - "html", -- HTML - "jsonls", -- JSON - "lua_ls", -- Lua + "eslint", -- JavaScript + "gopls", -- Go + "hls", -- Haskell + "html", -- HTML + "jsonls", -- JSON + "lua_ls", -- Lua "markdown_oxide", -- Markdown - "omnisharp", -- C# & F# - "powershell_es", -- PowerShell - "pyright", -- Python - "rust_analyzer", -- Rust - "svelte", -- Svelte - "svlangserver", -- SystemVerilog - "tailwindcss", -- TailwindCSS - "taplo", -- TOML - "ts_ls", -- TypeScript - "vimls", -- vimscript - "yamlls", -- YAML + "omnisharp", -- C# & F# + "powershell_es", -- PowerShell + "pyright", -- Python + "rust_analyzer", -- Rust + "svelte", -- Svelte + "svlangserver", -- SystemVerilog + "tailwindcss", -- TailwindCSS + "taplo", -- TOML + "ts_ls", -- TypeScript + "vimls", -- vimscript + "yamlls", -- YAML + "beancount", -- Beancount } - -- Configuration for each server defines here M.server_config = { lua_ls = { diff --git a/tools/nvim/lua/keymaps/lspkeys.lua b/tools/nvim/lua/keymaps/lspkeys.lua index 3200597..737d4fe 100644 --- a/tools/nvim/lua/keymaps/lspkeys.lua +++ b/tools/nvim/lua/keymaps/lspkeys.lua @@ -6,6 +6,7 @@ local M = { { keys = "gi", cmd = vim.lsp.buf.implementation, opts = { desc = "Goto Implementation" } }, { keys = ",", cmd = vim.lsp.buf.code_action, opts = { desc = "Code Action" } }, { keys = "ga", cmd = vim.lsp.buf.code_action, opts = { desc = "Code Action" } }, + { keys = "gh", cmd = vim.lsp.buf.hover, opts = { desc = "Show hover" } }, } return M diff --git a/tools/nvim/lua/plugins/fileutils.lua b/tools/nvim/lua/plugins/fileutils.lua index 39bca40..d195e48 100644 --- a/tools/nvim/lua/plugins/fileutils.lua +++ b/tools/nvim/lua/plugins/fileutils.lua @@ -24,7 +24,6 @@ return { end, dependencies = { "nvim-telescope/telescope.nvim" }, }, - { import = "plugins.mod.hover-nvim" }, -- { -- "kdheepak/lazygit.nvim", -- lazy = true, @@ -46,6 +45,6 @@ return { -- }, -- }, { - "NeogitOrg/neogit" - } + "NeogitOrg/neogit", + }, } diff --git a/tools/zed/keymap.json b/tools/zed/keymap.json old mode 100755 new mode 100644 index 2791e19..5d66f96 --- a/tools/zed/keymap.json +++ b/tools/zed/keymap.json @@ -53,14 +53,18 @@ } }, { - "context": "vim_mode == normal || not_editing || EmptyPane", + "context": "GitPanel || ProjectPanel || CollabPanel || OutlinePanel || ChatPanel || VimControl || EmptyPane || SharedScreen || MarkdownPreview || KeyContextView", "bindings": { "space space": "file_finder::Toggle", "space ;": "command_palette::Toggle", "space f c": "zed::OpenSettings", "space f e c": "zed::OpenSettings", - "space f t": "project_panel::ToggleFocus" + "space f t": "project_panel::ToggleFocus", + "ctrl-w h": "workspace::ActivatePaneLeft", + "ctrl-w i": "workspace::ActivatePaneRight", + "ctrl-w e": "workspace::ActivatePaneUp", + "ctrl-w n": "workspace::ActivatePaneDown" } }, { diff --git a/tools/zed/keymap_backup.json b/tools/zed/keymap_backup.json new file mode 100644 index 0000000..2791e19 --- /dev/null +++ b/tools/zed/keymap_backup.json @@ -0,0 +1,91 @@ +// $DOTFILES/tools/zed/keymaps.json +// Date: 2025-01-25 +// Author: js0ny +// Description: Zed keymaps + +// Location: +// GNU/Linux: ~/.config/zed/keymaps.json +// Windows: %APPDATA%\Zed\keymaps.json +// Linking: (link the whole directory) +// ln -sf $DOTFILES/tools/zed ~/.config/zed + +// Zed keymap + +// + +// For information on binding keys, see the Zed + +// documentation: https://zed.dev/docs/key-bindings + +// + +// To see the default key bindings run `zed: open default keymap` + +// from the command palette. + +// https://github.com/zed-industries/zed/tree/main/assets/keymaps +// Sequence: https://zed.dev/docs/key-bindings#remapping-keys +[ + { + "context": "Workspace", + + "bindings": { + // "shift shift": "file_finder::Toggle" + } + }, + + { + "context": "Editor", + + "bindings": { + // "j k": ["workspace::SendKeystrokes", "escape"] + } + }, + { + "context": "vim_mode == normal || vim_mode == visual", + + "bindings": { + "N": "vim::JoinLines", + "l": "vim::InsertBefore", + "L": "vim::InsertFirstNonWhitespace", + "H": "pane::ActivatePrevItem", + "I": "pane::ActivateNextItem" + } + }, + { + "context": "vim_mode == normal || not_editing || EmptyPane", + + "bindings": { + "space space": "file_finder::Toggle", + "space ;": "command_palette::Toggle", + "space f c": "zed::OpenSettings", + "space f e c": "zed::OpenSettings", + "space f t": "project_panel::ToggleFocus" + } + }, + { + "context": "vim_mode == normal || vim_mode == visual || vim_mode == operator", + + "bindings": { + "n": "vim::Down", + "e": "vim::Up", + "i": "vim::Right", + "k": "search::SelectNextMatch", + "K": "search::SelectPrevMatch", + "N": ["workspace::SendKeystrokes", "n n n n n"], + "E": ["workspace::SendKeystrokes", "e e e e e"] + } + }, + { + "context": "ProjectPanel && not_editing", + + "bindings": { + "n": "menu::SelectNext", + "e": "menu::SelectPrev", + "i": "project_panel::ExpandSelectedEntry", + "A": "project_panel::NewDirectory", + "a": "project_panel::NewFile", + "d": "project_panel::Delete" + } + } +] diff --git a/tools/zed/settings.json b/tools/zed/settings.json index 16f799c..fc127f3 100644 --- a/tools/zed/settings.json +++ b/tools/zed/settings.json @@ -18,6 +18,14 @@ // custom settings, run `zed: open default settings` from the // command palette (cmd-shift-p / ctrl-shift-p) { + "edit_predictions": { + "disabled_globs": ["*.bean"], + "mode": "eager_preview", + "copilot": { + "proxy": null, + "proxy_no_verify": null + } + }, "base_keymap": "VSCode", "vim_mode": true, "ui_font_size": 16,