summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--init.el2
-rw-r--r--lisp/general.el6
-rw-r--r--lisp/text.el13
3 files changed, 7 insertions, 14 deletions
diff --git a/init.el b/init.el
index dbb8c79..05c3100 100644
--- a/init.el
+++ b/init.el
@@ -70,7 +70,7 @@
'(custom-safe-themes
'("f149d9986497e8877e0bd1981d1bef8c8a6d35be7d82cba193ad7e46f0989f6a" "3c83b3676d796422704082049fc38b6966bcad960f896669dfc21a7a37a748fa" "a27c00821ccfd5a78b01e4f35dc056706dd9ede09a8b90c6955ae6a390eb1c1e" default))
'(package-selected-packages
- '(org-download helm-rg htmlize mood-line org-super-agenda material-theme esup glsl-mode fast-scroll yasnippet-snippets jsdoc helm-slack slack smart-mode-line magit rust-mode xref-js2 web-mode vterm-toggle vscode-dark-plus-theme treemacs-projectile tree-sitter-langs tide tern smartparens rtags req-package rainbow-mode pythonic python-mode perfect-margin org-roam org-notify org-modern org-bullets org-alert minimap markdown-mode json-mode js2-refactor js2-highlight-vars js-doc ido-vertical-mode hl-todo highlight-thing highlight-indent-guides helm-projectile helm-posframe helm-ag good-scroll go-mode git-gutter-fringe git-commit flycheck-irony evil eslint-fix emojify eldoc-box eglot drag-stuff doom-themes dashboard css-eldoc counsel company-quickhelp company-irony cmake-mode cmake-ide auctex all-the-icons ac-js2))
+ '(perfect-margin-mode org-download helm-rg htmlize mood-line org-super-agenda material-theme esup glsl-mode fast-scroll yasnippet-snippets jsdoc helm-slack slack smart-mode-line magit rust-mode xref-js2 web-mode vterm-toggle vscode-dark-plus-theme treemacs-projectile tree-sitter-langs tide tern smartparens rtags req-package rainbow-mode pythonic python-mode perfect-margin org-roam org-notify org-modern org-bullets org-alert minimap markdown-mode json-mode js2-refactor js2-highlight-vars js-doc ido-vertical-mode hl-todo highlight-thing highlight-indent-guides helm-projectile helm-posframe helm-ag good-scroll go-mode git-gutter-fringe git-commit flycheck-irony evil eslint-fix emojify eldoc-box eglot drag-stuff doom-themes dashboard css-eldoc counsel company-quickhelp company-irony cmake-mode cmake-ide auctex all-the-icons ac-js2))
'(safe-local-variable-values '((js-indent-level . 4)))
'(warning-suppress-types '((comp))))
(custom-set-faces
diff --git a/lisp/general.el b/lisp/general.el
index 6a7a3a7..d7e74d4 100644
--- a/lisp/general.el
+++ b/lisp/general.el
@@ -82,6 +82,12 @@
;; Line numbers
(global-display-line-numbers-mode 1)
+;; Margin
+(use-package perfect-margin
+ :ensure t
+ :config
+ (perfect-margin-mode t))
+
;; Show number of matches
(setq isearch-lazy-highlight t)
(setq isearch-lazy-count t)
diff --git a/lisp/text.el b/lisp/text.el
index 6a9858c..8a0274c 100644
--- a/lisp/text.el
+++ b/lisp/text.el
@@ -2,22 +2,10 @@
;;; Code:
(defun setup-text-mode ()
"Disable word wrap in text mode."
- ;(perfect-margin-mode 1)
(setq word-wrap t)
(display-line-numbers-mode -1)
)
-(defun my-perfect-margin-mode-hook()
- (when (and (stringp buffer-file-name)
- (string-match "\\.txt\\'" buffer-file-name))
- (perfect-margin-mode 1))
- )
-
-(use-package perfect-margin
- :ensure t
- :config
- (add-hook 'text-mode-hook 'my-perfect-margin-mode-hook))
-
(add-hook 'text-mode-hook 'setup-text-mode)
(use-package ispell
:ensure t
@@ -26,7 +14,6 @@
ispell-dictionary "en_US")
)
-
(use-package flyspell
:ensure t
:hook (text-mode . flyspell-mode)