commit 9a2c830185717f343572a3a49c306fdbcc9be752
parent ea750827354041e0715248d638432ce95b17cbf3
Author: Ryan Jeffrey <ryan@ryanmj.xyz>
Date: Sun, 3 Oct 2021 13:52:13 -0700
indentation, ox, leader key
Diffstat:
2 files changed, 51 insertions(+), 25 deletions(-)
diff --git a/.config/emacs/config.org b/.config/emacs/config.org
@@ -40,10 +40,11 @@
(add-to-list 'load-path (concat user-emacs-directory "/themes/"))
(setq custom-safe-themes t) ; Treat all themes as safe
-
-(use-package replace-colorthemes
-:quelpa (replace-colorthemes :fetcher github :repo "emacs-jp/replace-colorthemes")
-:init (load-theme 'hober ))
+(quelpa
+ '(replace-colorthemes
+ :fetcher git
+ :url "https://github.com/emacs-jp/replace-colorthemes"))
+(load-theme 'hober)
#+END_SRC
** swiper
@@ -111,6 +112,10 @@
(search-forward "<++>")
(delete-backward-char 4)))
+(use-package command-log-mode
+ :ensure t
+ :init
+ (global-command-log-mode))
#+END_SRC
@@ -149,7 +154,7 @@
(use-package evil
:ensure t
:init
-(setq evil-want-keybinding nil)
+ (setq evil-want-keybinding nil)
(global-undo-tree-mode)
(setq evil-undo-system 'undo-tree)
(evil-mode 1)
@@ -157,25 +162,40 @@
:ensure t
:init
(evil-collection-init))
-(setq-default evil-cross-lines t)
-(setq evil-normal-state-tag (propertize " COMMAND " 'face '((:background "dark khaki" :foreground "black")))
- evil-emacs-state-tag (propertize " EMACS " 'face '((:background "turquoise" :foreground "black")))
- evil-insert-state-tag (propertize " ------- " 'face '((:background "dark sea green" :foreground "black")))
- evil-replace-state-tag (propertize " REPLACE " 'face '((:background "dark orange" :foreground "black")))
- evil-motion-state-tag (propertize " MOTION " 'face '((:background "khaki" :foreground "black")))
- evil-visual-state-tag (propertize " VISUAL " 'face '((:background "light salmon" :foreground "black")))
- evil-operator-state-tag (propertize " OPERATE " 'face '((:background "sandy brown" :foreground "black"))))
-(setq evil-insert-state-cursor '(bar "green")
- evil-normal-state-cursor '(box "magenta"))
-
-(use-package evil-terminal-cursor-changer
-:ensure t
-:init
-(evil-terminal-cursor-changer-activate))
-(define-key evil-visual-state-map (kbd "<tab>") #'indent-region)
-(add-hook 'evil-insert-state-exit-hook
- (lambda ()
- (call-interactively #'save-buffer))))
+ (setq-default evil-cross-lines t)
+ (setq evil-normal-state-tag (propertize " COMMAND " 'face '((:background "dark khaki" :foreground "black")))
+ evil-emacs-state-tag (propertize " EMACS " 'face '((:background "turquoise" :foreground "black")))
+ evil-insert-state-tag (propertize " ------- " 'face '((:background "dark sea green" :foreground "black")))
+ evil-replace-state-tag (propertize " REPLACE " 'face '((:background "dark orange" :foreground "black")))
+ evil-motion-state-tag (propertize " MOTION " 'face '((:background "khaki" :foreground "black")))
+ evil-visual-state-tag (propertize " VISUAL " 'face '((:background "light salmon" :foreground "black")))
+ evil-operator-state-tag (propertize " OPERATE " 'face '((:background "sandy brown" :foreground "black"))))
+ (setq evil-insert-state-cursor '(bar "green")
+ evil-normal-state-cursor '(box "magenta"))
+
+ (use-package evil-terminal-cursor-changer
+ :ensure t
+ :init
+ (evil-terminal-cursor-changer-activate))
+ (global-unset-key (kbd "C-SPC"))
+ (define-key evil-normal-state-map (kbd "SPC") nil)
+
+ (evil-define-key 'normal 'globas (kbd "<leader>e") #'eval-region)
+ (evil-define-key 'normal 'global (kbd "<leader>o") #'eval-region)
+ (evil-define-key 'normal 'global (kbd "<leader>ss") #'split-window-horizontally)
+ (evil-define-key 'normal 'global (kbd "<leader>so") #'split-window-vertically)
+ (evil-define-key 'normal 'global (kbd "<leader>x") #'execute-extended-command)
+ ;; set leader key in all states
+ (evil-set-leader 'visual (kbd "C-SPC"))
+ (evil-set-leader 'insert (kbd "C-SPC"))
+ ;; set leader key in normal state
+ (evil-set-leader 'normal (kbd "SPC"))
+
+ (define-key evil-visual-state-map (kbd "<tab>") #'indent-region)
+ (add-hook 'evil-insert-state-exit-hook
+ (lambda ()
+ (if buffer-file-name
+ (call-interactively #'save-buffer)))))
;; global move window keys so non joestar buffers can still have these bindings
(global-set-key (kbd "M-<left>") #'(lambda ()
@@ -217,6 +237,11 @@
(org-indent-mode t)
:hook org-mode)
+(quelpa
+ '(ox-thtml
+ :fetcher git
+ :url "https://github.com/Ma11ock/org-thtml"))
+
(use-package org-bullets
:ensure t)
@@ -224,6 +249,7 @@
:ensure t
:hook org-mode)
+
(use-package display-line-numbers-mode
:hook (prog-mode org-mode LaTex-mode)
:init
diff --git a/.config/emacs/init.el b/.config/emacs/init.el
@@ -49,7 +49,7 @@
'(org-export-with-sub-superscripts '{})
'(org-time-stamp-custom-formats '("<%b %e %G>" . "<%m/%d/%y %a %H:%M>"))
'(package-selected-packages
- '(evil-terminal-cursor-changer evil-collection evil-magit lsp-mode gdscript-mode cmake-ide ivy-rtags rtags unicode-fonts py-autopep8 blacken elpy lua-mode luarocks modus-themes highlight-doxygen org-plus-contrib f company-c-headers cmake-font-lock auctex-cluttex auctex-latexmk auctex-lua company-auctex auctex inf-clojure cider clojure-mode clojure-mode-extra-font-locking clojure-quick-repls clojure-snippets json-mode crontab-mode rainbow-mode impatient-mode vterm rust-mode systemd yasnippet-snippets yasnippet gitignore-mode company flycheck wc-mode htmlize fic-mode emojify org-bullets use-package-hydra use-package-ensure-system-package use-package-el-get use-package-chords undo-tree quelpa-use-package mu4e-query-fragments mu4e-overview mu4e-maildirs-extension mu4e-jump-to-list mu4e-conversation mu4e-alert modus-vivendi-theme modus-operandi-theme ivy-ycmd ivy-avy highlight fish-mode elfeed-web elfeed-score elfeed-protocol elfeed-org elfeed-goodies csgo-conf-mode counsel))
+ '(command-log-mode evil-iedit-state evil-multiedit iedit evil-terminal-cursor-changer evil-collection evil-magit lsp-mode gdscript-mode cmake-ide ivy-rtags rtags unicode-fonts py-autopep8 blacken elpy lua-mode luarocks modus-themes highlight-doxygen org-plus-contrib f company-c-headers cmake-font-lock auctex-cluttex auctex-latexmk auctex-lua company-auctex auctex inf-clojure cider clojure-mode clojure-mode-extra-font-locking clojure-quick-repls clojure-snippets json-mode crontab-mode rainbow-mode impatient-mode vterm rust-mode systemd yasnippet-snippets yasnippet gitignore-mode company flycheck wc-mode htmlize fic-mode emojify org-bullets use-package-hydra use-package-ensure-system-package use-package-el-get use-package-chords undo-tree quelpa-use-package mu4e-query-fragments mu4e-overview mu4e-maildirs-extension mu4e-jump-to-list mu4e-conversation mu4e-alert modus-vivendi-theme modus-operandi-theme ivy-ycmd ivy-avy highlight fish-mode elfeed-web elfeed-score elfeed-protocol elfeed-org elfeed-goodies csgo-conf-mode counsel))
'(safe-local-variable-values
'((eval add-to-list 'company-clang-arguments '"-std=c++17")
(eval add-to-list 'company-clang-arguments "-std=c++17")
