diff --git a/bindings.el b/bindings.el index af6f77e..cb0f943 100644 --- a/bindings.el +++ b/bindings.el @@ -2,22 +2,22 @@ (map! (:when (modulep! :ui popup) "C-`" #'+popup/toggle - "C-~" #'+popup/raise - "C-x p" #'+popup/other) + "C-~" #'+popup/raise) + (:when (modulep! :ui workspaces) - "s-t" #'+workspace/new - "s-T" #'+workspace/display - "s-1" #'+workspace/switch-to-0 - "s-2" #'+workspace/switch-to-1 - "s-3" #'+workspace/switch-to-2 - "s-4" #'+workspace/switch-to-3 - "s-5" #'+workspace/switch-to-4 - "s-6" #'+workspace/switch-to-5 - "s-7" #'+workspace/switch-to-6 - "s-8" #'+workspace/switch-to-7 - "s-9" #'+workspace/switch-to-8 - "s-0" #'+workspace/switch-to-final)) + "C-t" #'+workspace/new + "C-S-T" #'+workspace/display + "C-1" #'+workspace/switch-to-0 + "C-2" #'+workspace/switch-to-1 + "C-3" #'+workspace/switch-to-2 + "C-4" #'+workspace/switch-to-3 + "C-5" #'+workspace/switch-to-4 + "C-6" #'+workspace/switch-to-5 + "C-7" #'+workspace/switch-to-6 + "C-8" #'+workspace/switch-to-7 + "C-9" #'+workspace/switch-to-8 + "C-0" #'+workspace/switch-to-final)) (map! :leader "`" nil @@ -377,28 +377,34 @@ ;; some helpful general keys -(map! "s-c" #'kill-ring-save - "s-v" #'yank - "s-V" #'consult-yank-from-kill-ring ; paste from previous copdied text - "s-x" #'kill-region - "s-a" #'mark-whole-buffer - "s-z" #'undo - "s-Z" #'undo-redo - "s-w" #'kill-buffer - "s-f" #'+default/search-buffer - "s-g" #'vertico-repeat - "s-s" #'save-buffer - "s-;" #'comment-dwim - "M-s-" #'next-window-any-frame - "M-s-" #'previous-window-any-frame - "s-M-h" #'windmove-left - "s-M-j" #'windmove-up - "s-M-k" #'windmove-down - "s-M-l" #'windmove-right - "s-" #'beginning-of-buffer - "s-" #'end-of-buffer - "s-" #'split-window-vertically - "s-S-" #'split-window-horizontally +(map! :map 'override + "C-c" #'kill-ring-save + "C-v" #'yank + "C-S-V" #'consult-yank-from-kill-ring ; paste from previous copdied text + "C-x" #'kill-region + "C-S-a" #'mark-whole-buffer + "C-z" #'undo + "C-S-Z" #'undo-redo + "C-w" #'kill-buffer + "C-f" #'+default/search-buffer + "C-g" #'vertico-repeat + "C-s" #'save-buffer + "C-;" #'comment-dwim + "C-q" #'kill-emacs + "C-" #'beginning-of-visual-line + "C-" #'end-of-visual-line + "C-M-" #'next-window-any-frame + "C-H-" #'previous-window-any-frame + "s-" #'backward-paragraph + "s-" #'forward-paragraph + "C-M-h" #'windmove-left + "C-M-j" #'windmove-up + "C-M-k" #'windmove-down + "C-M-l" #'windmove-right + "C-" #'beginning-of-buffer + "C-" #'end-of-buffer + "C-" #'split-window-vertically + "C-S-" #'split-window-horizontally "C-M-S-s-" #'+fold/toggle) (map! :localleader @@ -412,12 +418,12 @@ "M-}" #'sp-backward-barf-sexp "M-)" #'sp-split-sexp "M-(" #'sp-splice-sexp - "s-(" #'sp-wrap-round - "s-)" #'sp-unwrap-sexp - "s-[" #'sp-wrap-square - "s-]" #'sp-unwrap-sexp - "s-{" #'sp-wrap-curly - "s-}" #'sp-unwrap-sexp) + "C-(" #'sp-wrap-round + "C-)" #'sp-unwrap-sexp + "C-[" #'sp-wrap-square + "C-]" #'sp-unwrap-sexp + "C-{" #'sp-wrap-curly + "C-}" #'sp-unwrap-sexp) ;; platform io local leader bindings (map! :map platformio-mode-map @@ -457,8 +463,12 @@ "H" #'sclang-open-help-gui "s" #'sclang-start) +(map! :map centaur-tabs-mode-map + "C-M-" 'centaur-tabs-forward + "C-M-" 'centaur-tabs-backward) + (map! :map web-mode-map - "s-<" #'web-mode-element-wrap) + "C-S-<" #'web-mode-element-wrap) (map! :map chezmoi-mode-map :localleader diff --git a/config.el b/config.el index e904974..c71785c 100644 --- a/config.el +++ b/config.el @@ -161,10 +161,8 @@ ;; fix centaur tabs to show at the right times and add my muscle memory keybind (after! centaur-tabs (setq centaur-tabs-set-bar 'right) - (setq centaur-tabs-cycle-scope 'tabs) - (map! :map centaur-tabs-mode-map - "s-M-" 'centaur-tabs-forward - "s-M-" 'centaur-tabs-backward)) + (setq centaur-tabs-cycle-scope 'tabs)) + ;; use kitty for terminal-here ;; (setq terminal-here-mac-terminal-command '("kitty" "@" "launch" "--type=tab")) @@ -204,9 +202,9 @@ (lambda (path) (load (concat path "res/emacs/cl-patterns-helpers") nil nil nil t) (load (concat path "res/emacs/cl-patterns-skeletons") nil nil nil t))) - (define-key sly-mode-map (kbd "C-c p") 'cl-patterns-play-or-end-context-or-select-pdef) - (define-key sly-mode-map (kbd "C-c P") 'cl-patterns-play-or-stop-context-or-select-pdef) - (define-key sly-mode-map (kbd "C-c s") 'cl-patterns-stop-all) + ;; (define-key sly-mode-map (kbd "C-c p") 'cl-patterns-play-or-end-context-or-select-pdef) + ;; (define-key sly-mode-map (kbd "C-c P") 'cl-patterns-play-or-stop-context-or-select-pdef) + ;; (define-key sly-mode-map (kbd "C-c s") 'cl-patterns-stop-all) (define-key sly-doc-map (kbd "s") 'cl-patterns-supercollider-documentation) (add-hook! 'sly-connected-hook 'cl-patterns-helpers-load)))