config changes

This commit is contained in:
Matt Nish-Lapidus 2024-05-13 14:52:42 -04:00
parent b4df8f3b50
commit d8f685b1e0
3 changed files with 50 additions and 38 deletions

View file

@ -23,7 +23,7 @@
(map! :leader
"`" nil
(:prefix ("m" . "<localleader>")) ; bound locally
(: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
@ -43,10 +43,9 @@
:desc "help" "h" help-map
:desc "Toggle last popup" "~" #'+popup/toggle
:desc "Find file" "." #'find-file
:desc "Switch buffer" "," #'switch-to-buffer
:desc "Switch workspace buffer" "," #'persp-switch-to-buffer
:desc "Switch buffer" "<" #'switch-to-buffer
:desc "Resume last search" "'" #'vertico-repeat
:desc "Repeat" "'" #'vertico-repeat
:desc "Search for symbol in project" "*" #'+default/search-project-for-symbol-at-point
:desc "Search project" "/" #'+default/search-project
@ -59,12 +58,9 @@
: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 "Switch workspace buffer" "b" #'persp-switch-to-buffer
:desc "Switch buffer" "B" #'switch-to-buffer
:desc "ibuffer workspace" "I" #'+ibuffer/open-for-current-workspace
: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
@ -121,7 +117,6 @@
:desc "Browse emacs.d" "E" #'doom/browse-in-emacsd
:desc "Find file" "f" #'find-file
:desc "Find file from here" "F" #'+default/find-file-under-here
:desc "Locate file" "l" #'locate
:desc "Find file in private config" "p" #'doom/find-file-in-private-config
:desc "Browse private config" "P" #'doom/open-private-config
:desc "Recent files" "r" #'recentf-open-files
@ -159,11 +154,7 @@
:desc "Test project" "T" #'projectile-test-project
:desc "Pop up scratch buffer" "x" #'doom/open-project-scratch-buffer
:desc "Switch to scratch buffer" "X" #'doom/switch-to-project-scratch-buffer
:desc "Justfile Commands" "j" #'justl
(:when (and (modulep! :tools taskrunner)
(or (modulep! :completion ivy)
(modulep! :completion helm)))
:desc "List project tasks" "z" #'+taskrunner/project-tasks))
:desc "Justfile Commands" "j" #'justl)
;;; <leader> i --- insert
(:prefix-map ("i" . "insert")
@ -185,7 +176,6 @@
:desc "Search current directory" "d" #'+default/search-cwd
:desc "Search other directory" "D" #'+default/search-other-cwd
:desc "Search .emacs.d" "e" #'+default/search-emacsd
:desc "Locate file" "f" #'locate
:desc "Jump to symbol" "i" #'imenu
:desc "Jump to visible link" "l" #'link-hint-open-link
:desc "Jump to link" "L" #'ffap-menu
@ -230,29 +220,23 @@
:desc "Soft line wrapping" "w" #'visual-line-mode
(:when (modulep! :editor word-wrap)
:desc "Soft line wrapping" "w" #'+word-wrap-mode)
(:when (modulep! :ui zen)
:desc "Zen mode" "z" #'+zen/toggle
:desc "Zen mode (fullscreen)" "Z" #'+zen/toggle-fullscreen))
:desc "PlatformIO Mode Toggle" "o" #'platformio-mode)
(:prefix-map ("o" . "open")
:desc "Process List" "a" #'list-processes
:desc "Start debugger" "d" #'+debugger/start
:desc "New frame" "f" #'make-frame
:desc "Select frame" "F" #'select-frame-by-name
:desc "REPL" "r" #'+eval/open-repl-other-window
:desc "REPL (same window)" "R" #'+eval/open-repl-same-window
:desc "Dired" "-" #'dired-jump
(:when (modulep! :ui neotree)
:desc "Project sidebar" "p" #'+neotree/open
:desc "Find file in project sidebar" "P" #'+neotree/find-this-file)
(:when (modulep! :ui treemacs)
:desc "Project sidebar" "p" #'+treemacs/toggle
:desc "Find file in project sidebar" "P" #'treemacs-find-file)
(:when (modulep! :term vterm)
:desc "Toggle vterm popup" "v" #'+vterm/toggle
:desc "Open vterm here" "V" #'+vterm/here)
(:when (modulep! :term eshell)
:desc "Toggle eshell popup" "e" #'+eshell/toggle
:desc "Open eshell here" "E" #'+eshell/here)
(:when (modulep! :os macos)
:desc "Reveal in Finder" "o" #'+macos/reveal-in-finder
:desc "Reveal project in Finder" "O" #'+macos/reveal-project-in-finder
@ -313,8 +297,6 @@
:desc "Browse issues" "I" #'forge-browse-issues
:desc "Browse pull requests" "P" #'forge-browse-pullreqs)
(:prefix ("l" . "list")
(:when (modulep! :tools gist)
:desc "List gists" "g" #'+gist:list)
:desc "List repositories" "r" #'magit-list-repositories
:desc "List submodules" "s" #'magit-list-submodules
:desc "List issues" "i" #'forge-list-issues
@ -350,7 +332,6 @@
:desc "LSP Find declaration" "j" #'eglot-find-declaration
(:when (modulep! :completion vertico)
:desc "Jump to symbol in current workspace" "j" #'consult-eglot-symbols))
:desc "PlatformIO Mode Toggle" "p" #'platformio-mode
:desc "Compile" "c" #'compile
:desc "Recompile" "C" #'recompile
:desc "Jump to definition" "d" #'+lookup/definition
@ -396,6 +377,7 @@
"s-w" #'kill-buffer
"s-f" #'+default/search-buffer
"s-g" #'vertico-repeat
"C-M-s-b" #'bookmark-set
"M-s-<up>" #'next-window-any-frame
"M-s-<down>" #'previous-window-any-frame
;; "s-<up>" #'beginning-of-buffer

View file

@ -67,11 +67,10 @@
(after! vterm
(setq-default vterm-shell (executable-find "fish"))
(setq-default explicit-shell-file-name (executable-find "fish"))
(setq vterm-kill-buffer-on-exit t))
(after! meow
(meow-vterm-enable))
(setq vterm-kill-buffer-on-exit t)
(after! meow
(meow-vterm-enable))
)
;; remove org agenda from the splash screen
(assoc-delete-all "Open org-agenda" +doom-dashboard-menu-sections)
@ -208,6 +207,22 @@
(set-popup-rule! "*sly-description*" :side 'right :size '0.52)
(use-package! ajrepl
:after janet-mode
:config
(add-hook 'a-janet-mode-hook
#'ajrepl-interaction-mode))
(after! lsp-mode
(add-to-list 'lsp-language-id-configuration '(a-janet-mode . "janet"))
(lsp-register-client (make-lsp-client :new-connection (lsp-stdio-connection "janet-lsp")
:activation-fn (lsp-activate-on "janet")
:server-id 'janet-ls)))
(after! lisp-markup
(add-hook! 'lisp-mode 'lisp-markup-minor-mode))
(add-to-list 'auto-mode-alist '("\\.lsx\\'" . lisp-mode))
;; adding supercollider path
(setq exec-path (append exec-path '("/Applications/SuperCollider.app/Contents/MacOS/")))

View file

@ -38,7 +38,7 @@
(package! nerd-icons-dired)
(package! treemacs-nerd-icons)
(package! kind-icon)
(package! caddyfile-mode)
(package! obsidian)
(package! w3m)
(package! terminal-here)
@ -49,10 +49,6 @@
(package! smart-tabs-mode)
(package! sclang
:recipe (:local-repo "/Users/emenel/Library/Application Support/SuperCollider/downloaded-quarks/scel/el"))
(package! ijanet
:recipe (:type git
:host github
:repo "serialdev/ijanet-mode"))
(package! platformio-mode)
(package! scad-mode)
(package! consult-yasnippet)
@ -60,6 +56,25 @@
(package! sly-asdf)
(package! sly-quicklisp)
(package! a-janet-mode
:recipe (:type git
:host nil
:repo "https://codeberg.org/sogaiu/a-janet-mode"
:branch "main"
:files ("*.el" "*.janet" "highlights")))
(package! ajrepl
:recipe (:type git
:host github
:repo "sogaiu/ajrepl"
:files (:defaults ("ajrepl/"
"ajrepl/*"))))
(package! lisp-markup
:recipe (:local-repo "/Users/emenel/Source/_cl/markup"
:files ("*.el")))
;; To install SOME-PACKAGE from MELPA, ELPA or emacsmirror:
;(package! some-package)