summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitmodules15
-rw-r--r--init.org296
m---------lib/evil0
m---------lib/evil-collection0
m---------lib/evil-escape0
m---------lib/evil-magit0
m---------lib/evil-org0
7 files changed, 95 insertions, 216 deletions
diff --git a/.gitmodules b/.gitmodules
index 555302a..6f90e8d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -62,21 +62,6 @@
[submodule "epl"]
path = lib/epl
url = git@github.com:cask/epl.git
-[submodule "evil"]
- path = lib/evil
- url = git@github.com:emacs-evil/evil.git
-[submodule "evil-collection"]
- path = lib/evil-collection
- url = git@github.com:emacs-evil/evil-collection.git
-[submodule "evil-escape"]
- path = lib/evil-escape
- url = git@github.com:syl20bnr/evil-escape.git
-[submodule "evil-magit"]
- path = lib/evil-magit
- url = git@github.com:emacs-evil/evil-magit.git
-[submodule "evil-org"]
- path = lib/evil-org
- url = git@github.com:Somelauw/evil-org-mode.git
[submodule "exec-path-from-shell"]
path = lib/exec-path-from-shell
url = git@github.com:purcell/exec-path-from-shell.git
diff --git a/init.org b/init.org
index 2374cac..b6d853c 100644
--- a/init.org
+++ b/init.org
@@ -233,6 +233,18 @@ can then be managed with the help of Magit or other tools.
(expand-file-name "lib/borg" user-emacs-directory))
(require 'borg)
(borg-initialize)
+
+(with-eval-after-load 'bind-key
+ ; unbind M-m for use as a personal prefix
+ (unbind-key "M-m" global-map)
+ (bind-key "M-m M-m" 'back-to-indentation)
+ ; add some bindings for Borg
+ (bind-keys
+ :package borg
+ ("M-m B A" . borg-activate)
+ ("M-m B a" . borg-assimilate)
+ ("M-m B b" . borg-build)
+ ("M-m B c" . borg-clone)))
#+end_src
*** =use-package=
@@ -268,7 +280,12 @@ database, low-level functions for querying the database, and a
#+begin_src emacs-lisp
(use-package epkg
- :defer t)
+ :defer t
+ :bind
+ (("M-m B d" . epkg-describe-package)
+ ("M-m B p" . epkg-list-packages)
+ ("M-m B r" . borg-remove)
+ ("M-m B u" . epkg-update)))
#+end_src
** No littering in =~/.emacs.d=
@@ -445,14 +462,12 @@ Note: using =i3status= on sway at the moment, so disabling this.
#+begin_src emacs-lisp :tangle no
(use-package time
- :ensure nil
:init
(setq display-time-default-load-average nil)
:config
(display-time-mode))
(use-package battery
- :ensure nil
:config
(display-battery-mode))
#+end_src
@@ -585,6 +600,39 @@ Enable automatic reloading of changed buffers and files.
tab-width 4)
#+end_src
+*** Winner mode
+
+Enable =winner-mode=.
+
+#+begin_src emacs-lisp
+(winner-mode 1)
+#+end_src
+
+** Bindings
+
+#+begin_src emacs-lisp :tangle no
+(bind-keys
+ ; buffers
+ ("M-m b b" . ibuffer-list-buffers)
+ ("M-m b k" . kill-this-buffer)
+ ("M-m b s" . save-buffer)
+
+ ; help
+ ("M-m h c" . describe-char)
+ ("M-m h f" . describe-function)
+ ("M-m h F" . describe-face)
+ ("M-m h i" . info)
+ ("M-m h k" . describe-key)
+ ("M-m h l" . view-lossage)
+ ("M-m h m" . describe-mode)
+ ("M-m h v" . describe-variable)
+
+ ("M-m o" . other-window)
+ ("M-m w o" . other-window)
+
+ ("M-m q q" . save-buffers-kill-terminal))
+#+end_src
+
** Packages
The packages in this section are absolutely essential to my everyday
@@ -609,140 +657,6 @@ customizing it.
'auto-compile-inhibit-compile-detached-git-head))
#+end_src
-*** [[https://github.com/noctuid/general.el][general]]
-
- #+begin_src emacs-lisp
-(use-package general
- :demand t
- :config
- (general-evil-setup t)
-
- (general-override-mode)
-
- (general-create-definer
- amin--mode-leader-keys
- :keymaps 'override
- :states '(emacs normal visual motion insert)
- :non-normal-prefix "C-,"
- :prefix ",")
-
- (general-create-definer
- amin--leader-keys
- :keymaps 'override
- :states '(emacs normal visual motion insert)
- :non-normal-prefix "M-m"
- :prefix "SPC"))
-#+end_src
-
-*** evil
-
-#+begin_src emacs-lisp
-(use-package evil
- :demand t
- :hook ((view-mode . evil-motion-state)
- (org-src-mode . evil-insert-state))
- :init
- (setq evil-want-integration nil)
- :config (evil-mode 1)
- (general-swap-key nil '(normal motion) ";" ":")
- (setq evil-want-visual-char-semi-exclusive t))
-#+end_src
-
-#+begin_src emacs-lisp
-(use-package evil-collection
- :after evil
- :config
- (evil-collection-init))
-#+end_src
-
-#+begin_src emacs-lisp
-(use-package evil-escape
- :demand t
- :init
- (setq evil-escape-excluded-states '(normal visual multiedit emacs motion)
- evil-escape-excluded-major-modes '(neotree-mode)
- evil-escape-key-sequence "jk"
- evil-escape-delay 0.25)
- :general
- (:states '(insert replace visual operator)
- "C-g" #'evil-escape)
- :config
- (evil-escape-mode 1)
- ;; no `evil-escape' in minibuffer
- (push #'minibufferp evil-escape-inhibit-functions))
-#+end_src
-
-#+begin_src emacs-lisp
-(use-package evil-magit
- :after magit
- :config
- (evil-set-initial-state 'git-commit-mode 'insert))
-#+end_src
-
-#+begin_src emacs-lisp
-(use-package evil-org
- :hook (org-mode . evil-org-mode)
- :general
- (nvmap evil-org-mode-map
- "TAB" 'org-cycle
- "S-TAB" 'org-cycle)
- :config
- (evil-org-set-key-theme)
- (require 'evil-org-agenda)
- (evil-org-agenda-set-keys)
- (nmap evil-org-mode-map
- [backtab] 'org-shifttab)
- (after! org-src
- (define-key org-src-mode-map [remap evil-write] 'org-edit-src-save)
- (define-key org-src-mode-map [remap evil-save-and-close]
- (lambda () (interactive)
- (org-edit-src-save)
- (org-edit-src-exit)))
- (define-key org-src-mode-map [remap evil-save-modified-and-close]
- (lambda () (interactive)
- (org-edit-src-save)
- (org-edit-src-exit)))))
-#+end_src
-
-#+begin_src emacs-lisp
-(amin--leader-keys
- "/" '(:ignore t :wk "search")
-
- "B" '(:ignore t :wk "Borg")
- "BA" 'borg-activate
- "Ba" 'borg-assimilate
- "Bb" 'borg-build
- "Bc" 'borg-clone
- "Bd" 'epkg-describe-package
- "Bp" 'epkg-list-packages
- "Br" 'borg-remove
- "Bu" 'epkg-update
-
- "b" '(:ignore t :wk "buffers")
- "bb" 'ibuffer-list-buffers
- "bk" 'kill-this-buffer
- "bs" 'save-buffer
-
- "f" '(:ignore t :wk "files")
-
- "h" '(:ignore t :wk "help")
- "hc" 'describe-char
- "hf" 'describe-function
- "hF" 'describe-face
- "hi" 'info
- "hk" 'describe-key
- "hl" 'view-lossage
- "hv" 'describe-variable
-
- "o" 'other-window
-
- "w" '(:ignore t :wk "window")
- "wo" 'other-window
-
- "q" '(:ignore t :wk "quit")
- "qq" 'save-buffers-kill-terminal)
-#+end_src
-
*** [[https://orgmode.org/][Org mode]]
#+begin_quote
@@ -755,9 +669,6 @@ In short, my favourite way of life.
#+begin_src emacs-lisp
(use-package org
- :general
- (amin--leader-keys "bt" 'org-babel-tangle)
- (amin--leader-keys org-mode-map "i" 'org-edit-special)
:config
(setq org-src-tab-acts-natively t
org-src-preserve-indentation nil
@@ -778,25 +689,24 @@ Not just how I do git, but /the/ way to do git.
#+begin_src emacs-lisp
(use-package magit
- :general
- (amin--leader-keys
- "g" '(:ignore t :wk "magit")
- "g SPC" 'magit-status
- "gs" 'magit-status
- "gS" 'magit-status-prefix
- "gB" 'magit-blame
- "gC" 'magit-clone
- "gf" 'magit-fetch
- "gF" 'magit-pull
- "gP" 'magit-push
- "gcc" 'magit-commit
- "gca" 'magit-commit-amend
- "gbb" 'magit-checkout
- "gbc" 'magit-branch)
:defer t
- :bind (("s-g" . magit-status)
- ("C-x g" . magit-status)
- ("C-x M-g" . magit-dispatch-popup))
+ :bind
+ (("s-g" . magit-dispatch-popup)
+ ("C-x g" . magit-status)
+ :prefix-map amin--magit-prefix-map
+ :prefix "M-m g"
+ ("SPC" . magit-status)
+ ("s" . magit-status)
+ ("S" . magit-status-prefix)
+ ("B" . magit-blame)
+ ("C" . magit-clone)
+ ("f" . magit-fetch)
+ ("F" . magit-pull)
+ ("P" . magit-push)
+ ("c c" . magit-commit)
+ ("c a" . magit-commit-amend)
+ ("b b" . magit-checkout)
+ ("b c" . magit-branch))
:config
(magit-add-section-hook 'magit-status-sections-hook
'magit-insert-modules
@@ -819,14 +729,12 @@ There's no way I could top that, so I won't attempt to.
(use-package ivy
:defer 1
:bind
- (:map ivy-minibuffer-map
- ([escape] . keyboard-escape-quit)
- ;; ("C-j" . ivy-next-line)
- ;; ("C-k" . ivy-previous-line)
- ([S-up] . ivy-previous-history-element)
- ([S-down] . ivy-next-history-element)
- ("DEL" . ivy-backward-delete-char))
- :general (amin--leader-keys "," 'ivy-switch-buffer)
+ (("M-m ," . ivy-switch-buffer)
+ :map ivy-minibuffer-map
+ ([escape] . keyboard-escape-quit)
+ ([S-up] . ivy-previous-history-element)
+ ([S-down] . ivy-next-history-element)
+ ("DEL" . ivy-backward-delete-char))
:config
(setq ivy-wrap t)
(ivy-mode 1))
@@ -836,8 +744,6 @@ There's no way I could top that, so I won't attempt to.
#+begin_src emacs-lisp
(use-package swiper
- :general (:states '(normal motion) "/" 'swiper)
- (amin--leader-keys "//" 'swiper)
:bind (([remap isearch-forward] . swiper)
([remap isearch-backward] . swiper)))
#+end_src
@@ -847,14 +753,12 @@ There's no way I could top that, so I won't attempt to.
#+begin_src emacs-lisp
(use-package counsel
:defer 1
- :general
- (amin--leader-keys
- "fr" 'counsel-recentf
- "SPC" 'counsel-M-x
- "." 'counsel-find-file)
:bind (([remap execute-extended-command] . counsel-M-x)
- ([remap find-file] . counsel-find-file)
- ("s-r" . counsel-recentf)
+ ([remap find-file] . counsel-find-file)
+ ("s-r" . counsel-recentf)
+ ("M-m SPC" . counsel-M-x)
+ ("M-m ." . counsel-find-file)
+ ("M-m f r" . counsel-recentf)
:map minibuffer-local-map
("C-r" . counsel-minibuffer-history))
:config
@@ -1226,14 +1130,12 @@ Emacs package that displays available keybindings in popup
#+begin_src emacs-lisp
(use-package crux
- :bind (("C-c d" . crux-duplicate-current-line-or-region)
- ("C-c M-d" . crux-duplicate-and-comment-current-line-or-region))
- :general
- (amin--leader-keys
- "bK" 'crux-kill-other-buffers
- "fc" 'crux-copy-file-preserve-attributes
- "fD" 'crux-delete-file-and-buffer
- "fR" 'crux-rename-file-and-buffer))
+ :bind (("C-c d" . crux-duplicate-current-line-or-region)
+ ("C-c M-d" . crux-duplicate-and-comment-current-line-or-region)
+ ("M-m b K" . crux-kill-other-buffers)
+ ("M-m f c" . crux-copy-file-preserve-attributes)
+ ("M-m f D" . crux-delete-file-and-buffer)
+ ("M-m f R" . crux-rename-file-and-buffer)))
#+end_src
** [[https://github.com/alezost/mwim.el][mwim]]
@@ -1243,10 +1145,7 @@ Emacs package that displays available keybindings in popup
:bind (("C-a" . mwim-beginning-of-code-or-line)
("C-e" . mwim-end-of-code-or-line)
("<home>" . mwim-beginning-of-line-or-code)
- ("<end>" . mwim-end-of-line-or-code))
- :general (:states '(normal visual)
- "0" 'mwim-beginning-of-code-or-line
- "$" 'mwim-end-of-code-or-line))
+ ("<end>" . mwim-end-of-line-or-code)))
#+end_src
* Email
@@ -1301,8 +1200,9 @@ See [[notmuch:id:87muuqsvci.fsf@fencepost.gnu.org][bug follow-up]].
(notmuch))
(use-package notmuch
- :general (amin--leader-keys "m" 'amin/notmuch)
:commands notmuch
+ :bind (("C-c m" . amin/notmuch)
+ ("M-m m" . amin/notmuch))
:config
(setq notmuch-hello-sections
'(notmuch-hello-insert-header
@@ -1343,12 +1243,12 @@ See [[notmuch:id:87muuqsvci.fsf@fencepost.gnu.org][bug follow-up]].
;; (set! :evil-state 'notmuch-message-mode 'insert)
;; (advice-add #'notmuch-bury-or-kill-this-buffer
;; :override #'kill-this-buffer)
- (evil-collection-define-key 'normal 'notmuch-common-keymap
- "c" (lambda ()
- "Compose new mail and prompt for sender"
- (interactive)
- (let ((current-prefix-arg t))
- (call-interactively #'notmuch-mua-new-mail))))
+ ;; (evil-collection-define-key 'normal 'notmuch-common-keymap
+ ;; "c" (lambda ()
+ ;; "Compose new mail and prompt for sender"
+ ;; (interactive)
+ ;; (let ((current-prefix-arg t))
+ ;; (call-interactively #'notmuch-mua-new-mail))))
:bind
(:map notmuch-search-mode-map
("k" . (lambda ()
@@ -1381,17 +1281,11 @@ See [[notmuch:id:87muuqsvci.fsf@fencepost.gnu.org][bug follow-up]].
)
(use-package counsel-notmuch
- :general (amin--leader-keys "/m" 'counsel-notmuch))
+ :bind ("M-m / m" . counsel-notmuch))
(after! notmuch-crypto
(setq notmuch-crypto-process-mime t))
-;; (after! evil
-;; (mapc (lambda (str) (evil-set-initial-state (car str) (cdr str)))
-;; '((notmuch-hello-mode . emacs)
-;; (notmuch-search-mode . emacs)
-;; (notmuch-tree-mode . emacs))))
-
(after! recentf
(add-to-list 'recentf-exclude (expand-file-name amin-maildir)))
#+end_src
diff --git a/lib/evil b/lib/evil
deleted file mode 160000
-Subproject 3d9f76f3add56f670042af9421b36dfb8574ad0
diff --git a/lib/evil-collection b/lib/evil-collection
deleted file mode 160000
-Subproject 5db4a9ab274e8cb9b8bcb06118db7f79671a248
diff --git a/lib/evil-escape b/lib/evil-escape
deleted file mode 160000
-Subproject 73b30bfd912f40657b1306ee5849d215f0f9ffb
diff --git a/lib/evil-magit b/lib/evil-magit
deleted file mode 160000
-Subproject 9e2275b14807168451e10b93d69e420e435f21e
diff --git a/lib/evil-org b/lib/evil-org
deleted file mode 160000
-Subproject b6d652a9163d3430a9e0933a554bdbee5244bbf