More emacs configuration

This commit is contained in:
Charlotte Van Petegem 2021-03-18 14:46:46 +01:00
parent 26bf12e0b1
commit 996efba357
No known key found for this signature in database
GPG key ID: 019E764B7184435A

View file

@ -4,115 +4,185 @@
(eval-when-compile
(require 'use-package)
(require 'use-package-ensure)
(setq use-package-verbose t)
(setq use-package-verbose nil)
(setq use-package-always-ensure t))
;; For :diminish in (use-package).
(require 'diminish)
;; For :general in (use-package).
(use-package general
:config
(general-evil-setup t)
(nmap
:prefix "SPC"
"b" '(:ignore t :which-key "buffer")
"bd" '(kill-this-buffer :which-key "kill")
"f" '(:ignore t :which-key "file")
"fs" '(save-buffer :which-key "save")
"h" '(:ignore t :which-key "help")
"m" '(:ignore t :which-key "mode")
"q" '(:ignore t :which-key "quit")
"qq" '(save-buffers-kill-emacs :which-key "quit"))
"s" '(:ignore t :which-key "search")
"w" '(:ignore t :which-key "window")
"wv" '(split-window-vertically :which-key "split vertical")
"ws" '(split-window-horizontally :which-key "split horizontal")
"wd" '(delete-window :which-key "delete")
)
(use-package better-defaults)
(use-package company
:diminish (company-mode)
:config (global-company-mode)
)
:diminish (company-mode)
:config (global-company-mode)
)
(use-package counsel
:diminish (counsel-mode)
:config (counsel-mode 1)
:general
(nmap
:prefix "SPC"
"SPC" '(counsel-M-x :which-key "execute")
"bb" '(counsel-switch-buffer :which-key "switch")
"ff" '(counsel-find-file :which-key "find")
"fr" '(counsel-recentf :which-key "recent")
"ha" '(counsel-apropos :which-key "apropos")
"hd" '(counsel-descbinds :which-key "bindings")
"hf" '(counsel-describe-function :which-key "function")
"hv" '(counsel-describe-variable :which-key "variable")
)
)
(use-package direnv :config (direnv-mode))
(use-package evil
;; Disable default evil keybindings, since evil-collection is a superset
;; See https://github.com/emacs-evil/evil-collection/issues/60
:custom (evil-want-keybinding nil)
:config (evil-mode 1)
)
;; Disable default evil keybindings, since evil-collection is a superset
;; See https://github.com/emacs-evil/evil-collection/issues/60
:custom
(evil-want-keybinding nil)
(evil-want-integration t)
:config (evil-mode 1)
)
(use-package evil-collection
:after (evil)
)
:after (evil)
:config (evil-collection-init)
)
(use-package fira-code-mode
:config (when window-system (global-fira-code-mode))
)
:config (when window-system (global-fira-code-mode))
)
(use-package flycheck
:diminish (flycheck-mode)
:config (global-flycheck-mode)
)
:diminish (flycheck-mode)
:config (global-flycheck-mode)
)
(use-package general
:after (evil which-key)
:config
(general-evil-setup)
(general-mmap
:prefix "SPC"
"" nil ;; space is next character by default
"b" '(:ignore t :which-key "buffer")
"bd" '(kill-this-buffer :which-key "kill")
"f" '(:ignore t :which-key "file")
"ff" '(find-file :which-key "find")
"fs" '(save-buffer :which-key "save")
"m" '(:ignore t :which-key "mode")
"w" '(:ignore t :which-key "window")
"wv" '(split-window-vertically :which-key "split vertical")
"ws" '(split-window-horizontally :which-key "split horizontal")
"wd" '(delete-window :which-key "delete")
"q" '(:ignore t :which-key "quit")
"qq" '(save-buffers-kill-emacs :which-key "quit"))
)
(use-package ivy
:custom
(ivy-use-virtual-buffers t)
(ivy-count-format "(%d/%d) ")
:config (ivy-mode 1)
:diminish (ivy-mode)
)
(use-package ledger-mode
:mode "\\.journal\\'"
:custom
(ledger-binary-path "hledger")
(ledger-highlight-xact-under-point nil)
(ledger-post-account-alignment-column 4)
(ledger-post-amount-alignment-at :decimal)
(ledger-post-amount-alignment-column 59)
(ledger-post-auto-align t)
)
:mode "\\.journal\\'"
:custom
(ledger-binary-path "hledger")
(ledger-highlight-xact-under-point nil)
(ledger-post-account-alignment-column 4)
(ledger-post-amount-alignment-at :decimal)
(ledger-post-amount-alignment-column 59)
(ledger-post-auto-align t)
)
(use-package lsp-mode
:commands (lsp)
)
(use-package lsp-mode :commands (lsp))
(use-package magit)
(use-package magit
:general
(nmap
:prefix "SPC"
"g" '(:ignore t :which-key "git")
"gs" '(magit-status :which-key "status")
)
)
(use-package markdown-mode
:commands (markdown-mode gfm-mode)
:mode ("README\\.md\\'" . gfm-mode)
:mode ("\\.md\\'" . markdown-mode)
:mode ("\\.markdown\\'" . markdown-mode)
)
:commands (markdown-mode gfm-mode)
:mode ("README\\.md\\'" . gfm-mode)
:mode ("\\.md\\'" . markdown-mode)
:mode ("\\.markdown\\'" . markdown-mode)
)
(use-package modus-themes
:config
(setq modus-themes-bold-constructs t
modus-themes-syntax 'alt-syntax-yellow-comments
modus-themes-promts 'intense-accented
modus-themes-mode-line 'borderless
modus-themes-region 'bg-only)
(modus-themes-load-themes)
(modus-themes-load-operandi)
)
:custom
(modus-themes-bold-constructs t)
(modus-themes-syntax 'alt-syntax-yellow-comments)
(modus-themes-promts 'intense-accented)
(modus-themes-mode-line 'borderless)
(modus-themes-region 'bg-only)
:config
(modus-themes-load-themes)
(modus-themes-load-operandi)
)
(use-package nix-mode
:mode "\\.nix\\'"
)
(use-package nix-mode :mode "\\.nix\\'")
(use-package projectile
:after (ripgrep)
:diminish (projectile-mode)
:custom
(projectile-completion-system 'ivy)
(projectile-switch-project-action #'projectile-dired)
:config (projectile-mode 1)
:general
(nmap
:prefix "SPC"
"p" '(:ignore t :which-key "project")
"pf" '(projectile-find-file :which-key "find")
"pp" '(projectile-switch-project :which-key "switch")
"pr" '(projectile-replace :which-key "replace")
"ps" '(projectile-ripgrep :which-key "search")
"p!" '(projectile-run-shell-command-in-root :which-key "shell")
)
)
(use-package python-mode
:mode "\\.py\\'"
)
:mode "\\.py\\'"
)
(use-package ripgrep)
(use-package swiper
:general
(nmap
:prefix "SPC"
"ss" '(swiper :which-key "search")
)
(nmap "/" 'swiper)
)
(use-package web-mode
:mode "\\.html\\.erb\\'")
:mode "\\.html\\.erb\\'")
(use-package which-key
:diminish (which-key-mode)
:config (which-key-mode)
)
:diminish (which-key-mode)
:config (which-key-mode)
)
(use-package yaml-mode
:mode "\\.yml\\'"
:mode "\\.yaml\\'"
)
(setq inhibit-startup-screen t)