diff --git a/bindings.el b/bindings.el index ba5827c..6d91b8e 100644 --- a/bindings.el +++ b/bindings.el @@ -4,7 +4,7 @@ (map! :leader "`" nil - (:prefix-map ("!" . "checkers")) ; bound by flycheck + (:prefix-map ("!" . "checkers")) ; bound by flycheck :desc "M-x" ":" #'execute-extended-command :desc "Pop up scratch buffer" "x" #'doom/open-scratch-buffer @@ -34,6 +34,39 @@ :desc "Find file in project" "SPC" #'projectile-find-file :desc "Jump to bookmark" "RET" #'bookmark-jump +;;; b --- buffer + (:prefix-map ("b" . "buffer") + :desc "Toggle narrowing" "-" #'doom/toggle-narrow-buffer + :desc "Previous buffer" "[" #'previous-buffer + :desc "Next buffer" "]" #'next-buffer + (:when (modulep! :ui workspaces) + :desc "Switch workspace buffer" "b" #'persp-switch-to-buffer + :desc "Switch buffer" "B" #'switch-to-buffer + :desc "ibuffer workspace" "I" #'+ibuffer/open-for-current-workspace) + (:unless (modulep! :ui workspaces) + :desc "Switch buffer" "b" #'switch-to-buffer) + :desc "Clone buffer" "c" #'clone-indirect-buffer + :desc "Clone buffer other window" "C" #'clone-indirect-buffer-other-window + :desc "Kill buffer" "d" #'kill-current-buffer + :desc "ibuffer" "i" #'ibuffer + :desc "Kill buffer" "k" #'kill-current-buffer + :desc "Kill all buffers" "K" #'doom/kill-all-buffers + :desc "Set bookmark" "m" #'bookmark-set + :desc "Delete bookmark" "M" #'bookmark-delete + :desc "Next buffer" "n" #'next-buffer + :desc "New empty buffer" "N" #'+default/new-buffer + :desc "Kill other buffers" "O" #'doom/kill-other-buffers + :desc "Previous buffer" "p" #'previous-buffer + :desc "Revert buffer" "r" #'revert-buffer + :desc "Rename buffer" "R" #'rename-buffer + :desc "Save buffer" "s" #'basic-save-buffer + :desc "Save buffer as root" "u" #'doom/sudo-save-buffer + :desc "Pop up scratch buffer" "x" #'doom/open-scratch-buffer + :desc "Switch to scratch buffer" "X" #'doom/switch-to-scratch-buffer + :desc "Yank buffer" "y" #'+default/yank-buffer-contents + :desc "Bury buffer" "z" #'bury-buffer + :desc "Kill buried buffers" "Z" #'doom/kill-buried-buffers) + (:prefix-map ("TAB" . "workspace") :desc "Display tab bar" "TAB" #'+workspace/display :desc "Switch workspace" "." #'+workspace/switch-to @@ -111,7 +144,7 @@ (modulep! :completion helm))) :desc "List project tasks" "z" #'+taskrunner/project-tasks)) - ;;; s --- search +;;; s --- search (:prefix-map ("s" . "search") :desc "Search buffer" "b" #'+default/search-buffer :desc "Search all open buffers" "B" (cmd!! #'consult-line-multi 'all-buffers) @@ -135,7 +168,7 @@ :desc "Thesaurus" "T" #'+lookup/synonyms) - ;;; t --- toggle +;;; t --- toggle (:prefix-map ("t" . "toggle") :desc "Big mode" "b" #'doom-big-font-mode :desc "Fill Column Indicator" "c" #'global-display-fill-column-indicator-mode @@ -280,8 +313,8 @@ (:when (and (modulep! :tools lsp) (not (modulep! :tools lsp +eglot))) :desc "LSP Execute code action" "a" #'lsp-execute-code-action :desc "LSP Organize imports" "o" #'lsp-organize-imports - :desc "Jump to symbol in current workspace" "j" #'consult-lsp-symbols - :desc "Jump to symbol in any workspace" "J" (cmd!! #'consult-lsp-symbols 'all-workspaces) + :desc "Jump to symbol in current workspace" "j" #'consult-lsp-symbols + :desc "Jump to symbol in any workspace" "J" (cmd!! #'consult-lsp-symbols 'all-workspaces) (:when (modulep! :ui treemacs +lsp) :desc "Errors list" "X" #'lsp-treemacs-errors-list :desc "Incoming call hierarchy" "y" #'lsp-treemacs-call-hierarchy diff --git a/config.el b/config.el index 38146f3..f8ae1f8 100644 --- a/config.el +++ b/config.el @@ -126,26 +126,6 @@ "s-M-" 'centaur-tabs-forward "s-M-" 'centaur-tabs-backward)) -;; configure moom for easy frame management -(use-package! moom - :load-path "/Users/emenel/Source/_src/moom" - :after-call doom-after-init-hook - :config - (setq moom-use-font-module nil) - (moom-recommended-keybindings '(all wof)) - (setq moom-user-margin '(50 50 50 50)) - (setq moom-command-with-centering '(single double delete split)) - (map! :leader - :prefix "t" - :desc "Moom Mode" - "m" #'moom-mode) - (when (display-graphic-p) - (defun my-moom-default-frame-size () - (set-frame-width (selected-frame) 150) - (set-frame-height (selected-frame) 48) - (moom-move-frame-to-center)) - (add-hook! 'moom-mode-hook #'my-moom-default-frame-size))) - (setq default-frame-alist '( (left . 0) (top . 0) (height . 48) (width . 150) )) ;; use kitty for terminal-here @@ -172,6 +152,10 @@ ;; better completions for sly (after! sly + (setq sly-lisp-implementations + '((sbcl ("sbcl")) + (ciel ("sbcl" "--core" "/Users/emenel/quicklisp/local-projects/CIEL/ciel-core" "--eval" "(in-package :ciel-user)")))) + (setq sly-default-lisp 'ciel) (setq sly-complete-symbol-function 'sly-flex-completions)) ;; make esc close completion from corfu @@ -194,10 +178,4 @@ ;; tidal cycles! (setq tidal-boot-script-path "~/.cabal/share/aarch64-osx-ghc-9.4.2/tidal-1.9.3/BootTidal.hs") -;; TODO update this for sly to use ciel by default -;; (setq slime-lisp-implementations -;; `((sbcl ("sbcl")) ;; default. Adapt if needed. -;; (ciel-sbcl ("sbcl" "--core" "/path/to/ciel/ciel-core" "--eval" "(in-package :ciel-user)")))) -;; (setq slime-default-lisp 'ciel-sbcl) - (load! "obsidian-config.el") diff --git a/init.el b/init.el index 960c3f5..107160a 100644 --- a/init.el +++ b/init.el @@ -60,7 +60,7 @@ fold ; (nigh) universal code folding format ; automated prettiness ;;god ; run Emacs commands without modifier keys - lispy ; vim for lisp, for people who don't like vim + ;; lispy ; vim for lisp, for people who don't like vim ;; multiple-cursors ; editing in many places at once ;; objed ; text object editing for the innocent parinfer ; turn lisp into python, sort of @@ -142,7 +142,7 @@ (haskell +lsp) ; a language that's lazier than I am ;;hy ; readability of scheme w/ speed of python ;;idris ; a language you can depend on - (json) ; At least it ain't XML + (json +lsp) ; At least it ain't XML (java +lsp) ; the poster child for carpal tunnel syndrome (javascript +lsp) ; all(hope(abandon(ye(who(enter(here)))))) ;;julia ; a better, faster MATLAB diff --git a/modules/editor/meow/config.el b/modules/editor/meow/config.el index dafb800..b8ba5ed 100644 --- a/modules/editor/meow/config.el +++ b/modules/editor/meow/config.el @@ -312,20 +312,21 @@ :demand t :config (cond - ((modulep! +colemak) (meow/setup-colemak)) - ((modulep! +dvorak) (meow/setup-dvorak)) - ((modulep! +qwerty) (meow/setup-qwerty)) - ((modulep! +dvp) (meow/setup-dvp))) + ((modulep! +colemak) (meow/setup-colemak)) + ((modulep! +dvorak) (meow/setup-dvorak)) + ((modulep! +qwerty) (meow/setup-qwerty)) + ((modulep! +dvp) (meow/setup-dvp))) (cond ((modulep! +leader) (map! :map meow-normal-state-keymap - doom-leader-key doom-leader-map) + doom-leader-key doom-leader-map) (map! :map meow-motion-state-keymap - doom-leader-key doom-leader-map) + doom-leader-key doom-leader-map) (map! :map meow-beacon-state-keymap - doom-leader-key nil) + doom-leader-key nil) (meow/setup-leader)) (t (meow/setup-keypad))) + (pushnew! meow-mode-state-list '(sly-db-mode . motion)) (map! :map meow-keymap [remap describe-key] #'helpful-key)) (if (modulep! :editor evil) diff --git a/packages.el b/packages.el index 819f6f7..4c9523b 100644 --- a/packages.el +++ b/packages.el @@ -7,9 +7,9 @@ ;; (unpin! compat) ;; (:host github :repo "emacs-compat/compat") -;; (unpin! doom-themes) -;; (unpin! lsp-mode) -;; (unpin! sly) +(unpin! doom-themes) +(unpin! lsp-mode) +(unpin! sly) ;; (unpin! corfu) ;; (unpin! cape) ;; (unpin! markdown-mode)