diff --git a/bindings.el b/bindings.el index b3160b6..5eb36b7 100644 --- a/bindings.el +++ b/bindings.el @@ -549,6 +549,14 @@ ;; make esc close completion from corfu (map! :map corfu-map [escape] 'corfu-quit) +(map! :map sly-mode-map + "" #'sly-mrepl-previous-input-or-button + "" #'sly-mrepl-next-input-or-button) + +(map! :map vterm-mode-map + "" #'vterm--self-insert + "" #'vterm--self-insert) + ;; main meow normal mode keymap (map! :map meow-normal-state-keymap "<" #'meow-beginning-of-thing diff --git a/config.el b/config.el index ec0c7a2..f1f9a91 100644 --- a/config.el +++ b/config.el @@ -10,7 +10,7 @@ ;; See 'C-h v doom-font' for documentation and more examples of what they ;; accept. For example: -(setq doom-font (font-spec :family "JetBrains Mono" :size 22)) +(setq doom-font (font-spec :family "JetBrains Mono" :size 20)) (setq fancy-splash-image (concat doom-user-dir "splash.png")) (setq doom-theme 'doom-monokai-pro) @@ -29,9 +29,6 @@ (scroll-bar-mode -1)))) (scroll-bar-mode -1)) -;; (custom-set-faces! -;; '(line-number :foreground "#424242")) - (setq locale-coding-system 'utf-8) (set-terminal-coding-system 'utf-8) (set-keyboard-coding-system 'utf-8) @@ -59,10 +56,10 @@ (setq default-frame-alist '( (left . 0) (top . 0) (height . 48) (width . 160))) ;; some global settings -(setq tab-always-indent t) ; don't autocomplete with tab +;; (setq tab-always-indent t) ; don't autocomplete with tab (+global-word-wrap-mode +1) ; default to soft word wrap (delete-selection-mode 1) ; delete stuff! -(setq delete-active-region t) ; delete selected stuff! +;; (setq delete-active-region t) ; delete selected stuff! (setq shell-file-name (executable-find "bash")) (setq dired-vc-rename-file t) ; renaming and changing files in dired now integrates with magit @@ -256,9 +253,8 @@ (setq backup-enable-predicate (lambda (name) nil))) -;; (use-package! ready-player -;; :config -;; (ready-player-add-to-auto-mode-alist)) +;; (after! gpastel +;; (gpastel-mode)) ;; override aggressive key shortcuts for alt-l/r (use-package! drag-stuff diff --git a/init.el b/init.el index 5c29c67..d2b3187 100644 --- a/init.el +++ b/init.el @@ -15,8 +15,8 @@ ;; directory (for easy access to its source code). (doom! :completion - (vertico +orderless) ; the search engine of the future - (corfu +orderless +icons) + (vertico +orderless +icons) ; the search engine of the future + (corfu +orderless +icons +dabbrev) :ui doom ; what makes DOOM look the way it does @@ -25,7 +25,7 @@ (emoji +unicode) ; 🙂 hl-todo ; highlight TODO/FIXME/NOTE/DEPRECATED/HACK/REVIEW ;; indent-guides ; highlighted indent columns - ligatures ; ligatures and symbols to make your code pretty again + (ligatures +extra) ; ligatures and symbols to make your code pretty again minimap ; show a map of the code on the side modeline ; snazzy, Atom-inspired modeline, plus API nav-flash ; blink cursor line after big motions @@ -160,7 +160,7 @@ :app calendar ;;emms - ;;everywhere ; *leave* Emacs!? You must be joking + everywhere ; *leave* Emacs!? You must be joking ;;irc ; how neckbeards socialize ;; (rss +org) ; emacs as an RSS reader diff --git a/modules/private/meow/config.el b/modules/private/meow/config.el index c772cb6..43f2a4a 100644 --- a/modules/private/meow/config.el +++ b/modules/private/meow/config.el @@ -47,5 +47,8 @@ (meow-tree-sitter-register-defaults) (pushnew! meow-mode-state-list '(sly-db-mode . motion)) (pushnew! meow-mode-state-list '(sly-inspector-mode . motion)) - (pushnew! meow-mode-state-list '(mu4e-main-mode . motion))) + (pushnew! meow-mode-state-list '(mu4e-main-mode . motion)) + (pushnew! meow-mode-state-list '(vterm-mode . insert)) + (pushnew! meow-mode-state-list '(sly-mode . insert)) + ) ;; (pushnew! meow-mode-state-list '(custom-mode . motion))) diff --git a/packages.el b/packages.el index b07efd3..987ae24 100644 --- a/packages.el +++ b/packages.el @@ -25,6 +25,8 @@ ;;(unpin! mu4e) +(package! gpastel) + (package! bookmark-in-project) (package! meow-vterm @@ -95,52 +97,3 @@ :files ("*.el"))) (package! bookmark-in-project) - -(package! ready-player - :recipe (:type git - :host github - :repo "xenodium/ready-player")) - - -;; To install SOME-PACKAGE from MELPA, ELPA or emacsmirror: -;(package! some-package) - -;; To install a package directly from a remote git repo, you must specify a -;; `:recipe'. You'll find documentation on what `:recipe' accepts here: -;; https://github.com/radian-software/straight.el#the-recipe-format -;(package! another-package -; :recipe (:host github :repo "username/repo")) - -;; If the package you are trying to install does not contain a PACKAGENAME.el -;; file, or is located in a subdirectory of the repo, you'll need to specify -;; `:files' in the `:recipe': -;(package! this-package -; :recipe (:host github :repo "username/repo" -; :files ("some-file.el" "src/lisp/*.el"))) - -;; If you'd like to disable a package included with Doom, you can do so here -;; with the `:disable' property: -;(package! builtin-package :disable t) - -;; You can override the recipe of a built in package without having to specify -;; all the properties for `:recipe'. These will inherit the rest of its recipe -;; from Doom or MELPA/ELPA/Emacsmirror: -;(package! builtin-package :recipe (:nonrecursive t)) -;(package! builtin-package-2 :recipe (:repo "myfork/package")) - -;; Specify a `:branch' to install a package from a particular branch or tag. -;; This is required for some packages whose default branch isn't 'master' (which -;; our package manager can't deal with; see radian-software/straight.el#279) -;(package! builtin-package :recipe (:branch "develop")) - -;; Use `:pin' to specify a particular commit to install. -;(package! builtin-package :pin "1a2b3c4d5e") - - -;; Doom's packages are pinned to a specific commit and updated from release to -;; release. The `unpin!' macro allows you to unpin single packages... -;(unpin! pinned-package) -;; ...or multiple packages -;(unpin! pinned-package another-pinned-package) -;; ...Or *all* packages (NOT RECOMMENDED; will likely break things) -;(unpin! t)