1 files changed, 33 insertions, 3 deletions

@@ -9,7 +9,8 @@
 ;; - Be kind to yourself.
 ;; - Make good choices.
 
-(progn
+(yoke +emacs (locate-user-emacs-file "lisp/")
+  (require '+emacs)
   ;; Settings
   (setq truncate-string-ellipsis "…"
         ring-bell-function #'ignore
@@ -19,9 +20,23 @@
     "C-x C-k" #'kill-current-buffer
     "C-/" #'undo-only
     "C-?" #'undo-redo
+    "C-x C-c" #'+save-buffers-quit
+    "M-SPC" #'+cycle-spacing
+    "M-/" #'hippie-expand
+    "M-=" #'count-words
+    "C-x C-b" #'ibuffer
+"C-x 4 n" #'clone-buffer
+    "S-<down-mouse-1>" #'mouse-set-mark
+    "C-x 0" #'+delete-window-or-bury-buffer
     "M-j" nil
     "<Scroll_Lock>" nil)
+  ;; Hooks
+  (add-hook 'after-save-hook #'executable-make-buffer-file-executable-if-script-p)
+  (add-hook 'minibuffer-setup-hook #'cursor-intangible-mode)
+  (add-hook 'find-file-not-found-functions #'+auto-create-missing-dirs)
   ;; Advice
+  (add-function :after after-focus-change-function #'+save-some-buffers-debounce)
+  (advice-add 'keyboard-escape-quit :around #'keyboard-escape-quit-keep-window-open)
   (define-advice keyboard-escape-quit (:around (fn &rest r))
     "Don't close quits on `keyboard-escape-quit'."
     (let ((buffer-quit-function #'ignore))
@@ -29,6 +44,13 @@
   ;; Themes
   (load-theme 'modus-operandi))
 
+(yoke isearch nil
+  (define-keys (current-global-map)
+    "C-s" #'isearch-forward-regexp
+    "C-r" #'isearch-backward-regexp
+    "C-M-s" #'isearch-forward
+    "C-M-r" #'isearch-backward))
+
 (yoke auth-source nil
   (setq auth-sources `(default "secrets:passwords"))
   (setq-local-hook authinfo-mode-hook
@@ -52,7 +74,6 @@
     "C-c k" #'consult-kmacro
     ;; C-x bindings (ctl-x-map)
     "C-x M-:" #'consult-complex-command
-    "<f2>" #'consult-buffer
     "C-x b" #'consult-buffer
     "C-x 4 b" #'consult-buffer-other-window
     "C-x 5 b" #'consult-buffer-other-frame
@@ -97,7 +118,7 @@
     (define-key org-mode-map (kbd "M-g o") #'consult-org-heading)))
 
 (yoke orderless "https://github.com/oantolin/orderless"
-  (require 'orderless)
+(require 'orderless)
   (setq completion-styles '(substring orderless basic)
         completion-category-defaults nil
         completion-category-overrides '((file (styles basic partial-completion)))
@@ -174,3 +195,12 @@
 
 (yoke minions "https://github.com/tarsius/minions"
   (minions-mode))
+
+(yoke magit "https://github.com/magit/magit"
+  :load (locate-user-emacs-file "yoke/magit/lisp")
+  :depends ((transient "https://github.com/magit/transient"
+                       (locate-user-emacs-file "yoke/transient/lisp"))
+            (dash "https://github.com/magnars/dash.el")
+            (with-editor "https://github.com/magit/with-editor"
+                         (locate-user-emacs-file "yoke/with-editor/lisp")))
+  (autoload #'transient--with-suspended-override "transient"))