summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitmodules12
-rw-r--r--init.org273
m---------lib/evil0
m---------lib/evil-escape0
m---------lib/evil-nerd-commenter0
m---------lib/evil-surround0
6 files changed, 41 insertions, 244 deletions
diff --git a/.gitmodules b/.gitmodules
index ac00f35..72e0ae2 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -86,18 +86,6 @@
[submodule "eshell-up"]
path = lib/eshell-up
url = git@github.com:peterwvj/eshell-up.git
-[submodule "evil"]
- path = lib/evil
- url = git@github.com:emacs-evil/evil.git
-[submodule "evil-escape"]
- path = lib/evil-escape
- url = git@github.com:syl20bnr/evil-escape.git
-[submodule "evil-nerd-commenter"]
- path = lib/evil-nerd-commenter
- url = git@github.com:redguardtoo/evil-nerd-commenter.git
-[submodule "evil-surround"]
- path = lib/evil-surround
- url = git@github.com:emacs-evil/evil-surround.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 7c49ca2..da1d297 100644
--- a/init.org
+++ b/init.org
@@ -682,8 +682,23 @@ for this.
#+begin_src emacs-lisp
(bind-keys
- ("s-c e b" . eval-buffer)
- ("s-c e r" . eval-region)
+ ("C-c a i" . ielm)
+
+ ("C-c e b" . eval-buffer)
+ ("C-c e r" . eval-region)
+
+ ("C-c F m" . make-frame-command)
+ ("C-c F d" . delete-frame)
+ ("C-c F D" . delete-other-frames)
+
+ ("C-c o" . other-window)
+
+ ("C-c Q" . save-buffers-kill-terminal)
+
+ ("C-S-h C" . describe-char)
+ ("C-S-h F" . describe-face)
+
+ ("C-x K" . kill-this-buffer)
("s-p" . beginning-of-buffer)
("s-n" . end-of-buffer))
@@ -713,151 +728,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--leader-keys
- :keymaps 'override
- :states '(emacs normal visual motion insert)
- :non-normal-prefix "M-m"
- :prefix "SPC"))
-#+end_src
-
-*** [[https://github.com/emacs-evil/evil][evil]]
-
-#+begin_src emacs-lisp
-(use-package evil
- :demand t
- ;; :hook (org-src-mode . evil-motion-state)
- :config
- (evil-mode 1)
- (general-swap-key nil '(normal motion) ";" ":")
-
- (setq evil-want-visual-char-semi-exclusive t
- evil-cross-lines t)
-
- ;; custom mode state mappings
- (dolist (mspair '((ebdb-mode . emacs)
- (term-mode . emacs)
- (helpful-mode . motion)
- (magit-blame-mode . motion)
- (view-mode . motion)))
- (evil-set-initial-state (car mspair) (cdr mspair)))
-
- ;; fix tab and indentation in src blocks inside org-mode buffer
- ;; also see https://git.sr.ht/~bandali/dotfiles/commit/0e2ffd584aafdd4cf256bcdf2473f01c3aaaed55
- (unbind-key "TAB" evil-motion-state-map)
-
- (unbind-key "C-d" evil-insert-state-map)
- (unbind-key "C-v" evil-insert-state-map)
- (unbind-key "C-y" evil-insert-state-map)
- (unbind-key "C-a" evil-insert-state-map)
- (unbind-key "C-e" evil-insert-state-map)
- (unbind-key "C-p" evil-insert-state-map)
- (unbind-key "C-n" evil-insert-state-map)
- (unbind-key "C-k" evil-insert-state-map)
- (bind-keys
- :map evil-insert-state-map
- ("C-k" . kill-line)
- ("C-S-k" . evil-insert-digraph)
- :map evil-motion-state-map
- ([down-mouse-1] . nil)))
-#+end_src
-
-#+begin_src emacs-lisp
-(use-package evil-escape
- :after evil
- :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-nerd-commenter
- :after evil
- :general
- (nmap
- "gc" 'evilnc-comment-operator
- "gy" 'evilnc-copy-and-comment-lines))
-#+end_src
-
-#+begin_src emacs-lisp
-(use-package evil-surround
- :after evil
- :general
- (omap
- "s" 'evil-surround-edit
- "S" 'evil-Surround-edit)
- (vmap
- "S" 'evil-surround-region
- "gS" 'evil-Surround-region))
-#+end_src
-
-#+begin_src emacs-lisp
-(amin--leader-keys
- "/" '(:ignore t :wk "search")
-
- "a" '(:ignore t :wk "apps")
- "a i" 'ielm
-
- "a s" '(:ignore t :wk "shells/terms")
-
- "b" '(:ignore t :wk "buffers")
- "b k" 'kill-this-buffer
- "b s" 'save-buffer
-
- "e" '(:ignore t :wk "eval")
- "e b" 'eval-buffer
- "e r" 'eval-region
-
- "f" '(:ignore t :wk "files")
-
- "F" '(:ignore t :wk "frames")
- "F m" 'make-frame-command
- "F d" 'delete-frame
- "F D" 'delete-other-frames
-
- "h" '(:ignore t :wk "help(ful)")
- "h c" 'describe-char
- "h f" 'describe-function
- "h F" 'describe-face
- "h H" 'view-hello-file
- "h i" 'info
- "h k" 'describe-key
- "h l" 'view-lossage
- "h v" 'describe-variable
-
- "o" 'other-window
-
- "w" '(:ignore t :wk "window")
- "w o" 'other-window
- "w 0" 'delete-window
- "w 1" 'delete-other-windows
- "w 2" 'split-window-below
- "w 3" 'split-window-right
- "w u" 'winner-undo
- "w r" 'winner-redo
-
- "q" '(:ignore t :wk "quit")
- "q q" 'save-buffers-kill-terminal)
-#+end_src
-
*** [[https://orgmode.org/][Org mode]]
#+begin_quote
@@ -871,22 +741,6 @@ In short, my favourite way of life.
#+begin_src emacs-lisp
(use-package org
:defer 1
- :general
- (amin--leader-keys
- :states 'normal
- :keymaps 'org-mode-map
- "'" 'org-edit-special)
- (amin--leader-keys
- :definer 'minor-mode
- :states 'normal
- :keymaps 'org-src-mode
- "'" 'org-edit-src-exit
- "k" 'org-edit-src-abort)
- (general-define-key
- :definer 'minor-mode
- :states 'normal
- :keymaps 'org-src-mode
- "q" 'org-edit-src-exit)
:config
(setq org-src-tab-acts-natively t
org-src-preserve-indentation nil
@@ -895,17 +749,6 @@ In short, my favourite way of life.
org-highlight-latex-and-related '(entities)
org-log-done 'time)
(add-to-list 'org-structure-template-alist '("L" . "src emacs-lisp") t)
- (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)))
- (define-key org-src-mode-map [remap evil-quit] 'org-edit-src-abort))
(font-lock-add-keywords
'org-mode
'(("[ \t]*\\(#\\+\\(BEGIN\\|END\\|begin\\|end\\)_\\(\\S-+\\)\\)[ \t]*\\([^\n:]*\\)"
@@ -944,13 +787,6 @@ In short, my favourite way of life.
(use-package ox-beamer
:after ox)
-(use-package ob-tangle
- :general
- (amin--leader-keys
- :states 'normal
- :keymaps 'org-mode-map
- "b t" 'org-babel-tangle))
-
(use-package orgalist
:after message
:hook (message-mode . orgalist-mode))
@@ -1015,11 +851,9 @@ Not just how I do git, but /the/ way to do git.
#+begin_src emacs-lisp
(use-package magit
:defer 1
- :general
- (amin--leader-keys
- "g s" 'magit-status
- "g l" 'magit-log-buffer-file)
- :bind ("s-g" . magit-status)
+ :bind (("C-x g" . magit-status)
+ ("s-g s" . magit-status)
+ ("s-g l" . magit-log-buffer-file))
:config
(magit-add-section-hook 'magit-status-sections-hook
'magit-insert-modules
@@ -1048,7 +882,6 @@ There's no way I could top that, so I won't attempt to.
#+begin_src emacs-lisp
(use-package ivy
:defer 1
- :general (amin--leader-keys "," 'ivy-switch-buffer)
:bind
(:map ivy-minibuffer-map
([escape] . keyboard-escape-quit)
@@ -1069,7 +902,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)
:bind (("C-s" . swiper)
("C-r" . swiper)))
#+end_src
@@ -1079,11 +911,6 @@ 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
- "r" '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)
@@ -1136,7 +963,6 @@ There's no way I could top that, so I won't attempt to.
#+begin_src emacs-lisp
(use-package ibuffer
:defer t
- :general (amin--leader-keys "b b" 'ibuffer-other-window)
:bind
(("C-x C-b" . ibuffer-other-window)
:map ibuffer-mode-map
@@ -1784,10 +1610,9 @@ Emacs package that displays available keybindings in popup
(mapc #'disable-theme custom-enabled-themes)
(load-theme 'doom-tomorrow-night t)))
-(amin--leader-keys
- "t" '(:ignore t :wk "theme")
- "t d" 'amin/lights-off
- "t l" 'amin/lights-on)
+(bind-keys
+ ("s-t d" . amin/lights-off)
+ ("s-t l" . amin/lights-on))
#+end_src
** [[https://github.com/bbatsov/crux][crux]]
@@ -1795,28 +1620,20 @@ Emacs package that displays available keybindings in popup
#+begin_src emacs-lisp
(use-package crux
:defer 1
- :general
- (amin--leader-keys
- "b K" 'crux-kill-other-buffers
- "c d" 'crux-duplicate-current-line-or-region
- "c D" 'crux-duplicate-and-comment-current-line-or-region
- "f c" 'crux-copy-file-preserve-attributes
- "f d" 'crux-delete-file-and-buffer
- "f r" 'crux-rename-file-and-buffer)
- :bind (("C-c d" . crux-duplicate-current-line-or-region)
- ("C-c D" . crux-duplicate-and-comment-current-line-or-region)
- ("C-S-j" . crux-top-join-line)
- ("C-c j" . crux-top-join-line)))
+ :bind (("C-c b k" . crux-kill-other-buffers)
+ ("C-c d" . crux-duplicate-current-line-or-region)
+ ("C-c D" . crux-duplicate-and-comment-current-line-or-region)
+ ("C-c f c" . crux-copy-file-preserve-attributes)
+ ("C-c f d" . crux-delete-file-and-buffer)
+ ("C-c f r" . crux-rename-file-and-buffer)
+ ("C-c j" . crux-top-join-line)
+ ("C-S-j" . crux-top-join-line)))
#+end_src
** [[https://github.com/alezost/mwim.el][mwim]]
#+begin_src emacs-lisp
(use-package mwim
- :general
- (:states '(normal visual)
- "0" 'mwim-beginning-of-code-or-line
- "$" 'mwim-end-of-code-or-line)
:bind (("C-a" . mwim-beginning-of-code-or-line)
("C-e" . mwim-end-of-code-or-line)
("<home>" . mwim-beginning-of-line-or-code)
@@ -1849,14 +1666,12 @@ Emacs package that displays available keybindings in popup
#+begin_src emacs-lisp
(use-package helpful
:defer 1
- :general
- (amin--leader-keys
- "h h" '(:ignore t :wk "helpful")
- "h h c" 'helpful-command
- "h h f" 'helpful-callable ; helpful-function
- "h h v" 'helpful-variable
- "h h k" 'helpful-key
- "h h p" 'helpful-at-point))
+ :bind
+ (("C-S-h c" . helpful-command)
+ ("C-S-h f" . helpful-callable) ; helpful-function
+ ("C-S-h v" . helpful-variable)
+ ("C-S-h k" . helpful-key)
+ ("C-S-h p" . helpful-at-point)))
#+end_src
** [[https://github.com/knu/shell-toggle.el][shell-toggle]]
@@ -1864,8 +1679,7 @@ Emacs package that displays available keybindings in popup
#+begin_src emacs-lisp
(use-package shell-toggle
:after eshell
- :general (amin--leader-keys "a s e" 'amin/shell-toggle)
- :bind ("C-c e" . amin/shell-toggle)
+ :bind ("C-c a s e" . amin/shell-toggle)
:config
(defun amin/shell-toggle (make-cd)
"Toggle between the shell buffer and whatever buffer you are editing.
@@ -2140,10 +1954,9 @@ For when I /have to/ use GH.
#+begin_src emacs-lisp
(use-package multi-term
:defer 1
- :general (amin--leader-keys
- "a s m" 'multi-term
- "a s p" 'multi-term-dedicated-toggle)
- :bind ("C-c C-j" . term-line-mode)
+ :bind (("C-c C-j" . term-line-mode)
+ ("C-c m m" . multi-term)
+ ("C-c m p" . multi-term-dedicated-toggle))
:config
(setq multi-term-program "/bin/screen"
;; TODO: add separate bindings for connecting to existing
@@ -2186,10 +1999,6 @@ For when I /have to/ use GH.
read-mail-command 'gnus)
(use-package gnus
- :general
- (amin--leader-keys
- "m" 'gnus
- "M" 'gnus-unplugged)
:bind (("s-m" . gnus)
("s-M" . gnus-unplugged))
:init
diff --git a/lib/evil b/lib/evil
deleted file mode 160000
-Subproject 82c65dcfe23aff3d764cafc78124d92940c5bd5
diff --git a/lib/evil-escape b/lib/evil-escape
deleted file mode 160000
-Subproject f4e9116bfbaac8c9d210c17ad488e0982291245
diff --git a/lib/evil-nerd-commenter b/lib/evil-nerd-commenter
deleted file mode 160000
-Subproject 29990d314cd0aa0c34d1614153404006c4b97c4
diff --git a/lib/evil-surround b/lib/evil-surround
deleted file mode 160000
-Subproject 9e445b7ab1b2381a1882804553af2789c228298