diff options
| -rw-r--r-- | doom/config.el | 41 | ||||
| -rw-r--r-- | zed/keymap.json | 44 | ||||
| -rw-r--r-- | zed/settings.json | 33 |
3 files changed, 24 insertions, 94 deletions
diff --git a/doom/config.el b/doom/config.el index 242c32b..02c1997 100644 --- a/doom/config.el +++ b/doom/config.el @@ -45,23 +45,22 @@ (defun my/setup-syntax-highlighting (&rest _) "Apply a 5-color scheme to font-lock faces." - (custom-set-faces! - `(font-lock-comment-face :foreground ,my/syntax-comment :slant italic) - `(font-lock-comment-delimiter-face :foreground ,my/syntax-comment :slant italic) - `(font-lock-doc-face :foreground ,my/syntax-comment :slant italic) - `(font-lock-string-face :foreground ,my/syntax-string) - `(font-lock-doc-markup-face :foreground ,my/syntax-string) - `(font-lock-keyword-face :foreground ,my/syntax-keyword :weight bold) - `(font-lock-builtin-face :foreground ,my/syntax-keyword) - `(font-lock-preprocessor-face :foreground ,my/syntax-keyword) - `(font-lock-negation-char-face :foreground ,my/syntax-keyword) - `(font-lock-type-face :foreground ,my/syntax-type) - `(font-lock-constant-face :foreground ,my/syntax-type) - `(font-lock-function-name-face :foreground ,my/syntax-function) - `(font-lock-variable-name-face :foreground "#FCFCFC") - `(font-lock-warning-face :foreground ,my/syntax-function :weight bold) - `(font-lock-regexp-grouping-backslash :foreground ,my/syntax-function) - `(font-lock-regexp-grouping-construct :foreground ,my/syntax-function))) + (set-face-attribute 'font-lock-comment-face nil :foreground my/syntax-comment :slant 'italic) + (set-face-attribute 'font-lock-comment-delimiter-face nil :foreground my/syntax-comment :slant 'italic) + (set-face-attribute 'font-lock-doc-face nil :foreground my/syntax-comment :slant 'italic) + (set-face-attribute 'font-lock-string-face nil :foreground my/syntax-string) + (set-face-attribute 'font-lock-doc-markup-face nil :foreground my/syntax-string) + (set-face-attribute 'font-lock-keyword-face nil :foreground my/syntax-keyword :weight 'bold) + (set-face-attribute 'font-lock-builtin-face nil :foreground my/syntax-keyword) + (set-face-attribute 'font-lock-preprocessor-face nil :foreground my/syntax-keyword) + (set-face-attribute 'font-lock-negation-char-face nil :foreground my/syntax-keyword) + (set-face-attribute 'font-lock-type-face nil :foreground my/syntax-type) + (set-face-attribute 'font-lock-constant-face nil :foreground my/syntax-type) + (set-face-attribute 'font-lock-function-name-face nil :foreground my/syntax-function) + (set-face-attribute 'font-lock-variable-name-face nil :foreground "#FCFCFC") + (set-face-attribute 'font-lock-warning-face nil :foreground my/syntax-function :weight 'bold) + (set-face-attribute 'font-lock-regexp-grouping-backslash nil :foreground my/syntax-function) + (set-face-attribute 'font-lock-regexp-grouping-construct nil :foreground my/syntax-function)) (my/setup-syntax-highlighting) (add-hook 'doom-load-theme-hook #'my/setup-syntax-highlighting 40) @@ -293,3 +292,11 @@ my/dashboard-widget-loaded-centered)) (setq org-startup-with-inline-images t) + +;; Move visual-line selection up/down with J/K; preserve original behavior in other visual modes +(map! :v "J" (cmd! (if (eq evil-visual-selection 'line) + (drag-stuff-down 1) + (evil-join (region-beginning) (region-end)))) + :v "K" (cmd! (if (eq evil-visual-selection 'line) + (drag-stuff-up 1) + (evil-lookup)))) diff --git a/zed/keymap.json b/zed/keymap.json deleted file mode 100644 index ec685eb..0000000 --- a/zed/keymap.json +++ /dev/null @@ -1,44 +0,0 @@ -// 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. -[ - { - "context": "Workspace", - "bindings": { - "\\ f f": "file_finder::Toggle", - "\\ g": "workspace::NewSearch", - "\\ b": "tab_switcher::Toggle", - "\\ e": "project_panel::ToggleFocus", - "\\ a": "agent::ToggleFocus", - }, - }, - { - "context": "Editor && vim_mode == normal", - "bindings": { - "g d": "editor::GoToDefinition", - "g D": "editor::GoToDeclaration", - "g r": "editor::FindAllReferences", - "g i": "editor::GoToImplementation", - - "K": "editor::Hover", - "ctrl-k": "editor::ShowSignatureHelp", - - "\\ c a": "editor::ToggleCodeActions", - "\\ r n": "editor::Rename", - "\\ f m": "editor::Format", - - "\\ w": "workspace::Save", - }, - }, - { - "context": "Editor && vim_mode == visual", - "bindings": { - "J": "editor::MoveLineDown", - "K": "editor::MoveLineUp", - }, - }, -] diff --git a/zed/settings.json b/zed/settings.json deleted file mode 100644 index 84ddb61..0000000 --- a/zed/settings.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "which_key": { - "delay_ms": 1000, - }, - "autosave": "on_focus_change", - "agent_servers": { - "claude-acp": { - "type": "registry", - }, - }, - "show_edit_predictions": false, - "icon_theme": "Zed (Default)", - "vim_mode": true, - - "ui_font_size": 16, - "buffer_font_size": 15, - - "theme": { - "mode": "dark", - "light": "Ayu Light", - "dark": "macOS Classic Dark", - }, - - "relative_line_numbers": "enabled", - "cursor_blink": true, - - "wrap_guides": [100], - - "tab_size": 2, - "hard_tabs": false, - - "vertical_scroll_margin": 10, -} |