diff --git a/modules/user/emacs/init.el b/modules/user/emacs/init.el index 5ed6bb5b..b1fd139d 100644 --- a/modules/user/emacs/init.el +++ b/modules/user/emacs/init.el @@ -35,6 +35,9 @@ ;; I want declarative config, no custom (setq custom-file "/dev/null") + + ;; Auto save errors are annoying + (setq auto-save-default nil) ;; Disable the menu bar (menu-bar-mode -1) @@ -75,7 +78,7 @@ (36 . ".\\(?:>\\)") (37 . ".\\(?:\\(?:%%\\)\\|%\\)") (38 . ".\\(?:\\(?:&&\\)\\|&\\)") - (42 . ".\\(?:\\(?:\\*\\*/\\)\\|\\(?:\\*[*/]\\)\\|[*/>]\\)") + ;;(42 . ".\\(?:\\(?:\\*\\*/\\)\\|\\(?:\\*[*/]\\)\\|[*/>]\\)") (43 . ".\\(?:\\(?:\\+\\+\\)\\|[+>]\\)") (45 . ".\\(?:\\(?:-[>-]\\|<<\\|>>\\)\\|[<>}~-]\\)") (46 . ".\\(?:\\(?:\\.[.<]\\)\\|[.=-]\\)") @@ -320,13 +323,15 @@ (global-flycheck-mode)) (use-package treemacs + :after (evil) :config (defun treemacs-display-current-project-exclusively-silently () + (interactive) "Display current project exclusively in treemacs without switching to treemacs buffer." (let ((buffer (current-buffer))) (treemacs-add-and-display-current-project-exclusively) (switch-to-buffer buffer))) - (add-hook 'projectile-after-switch-project-hook 'treemacs-display-current-project-exclusively-silently)) + (evil-define-key 'normal 'global (kbd "ot") 'treemacs-add-and-display-current-project-exclusively)) (use-package treemacs-evil :after (treemacs)) @@ -341,11 +346,15 @@ '((gdscript-mode . gdscript-ts-mode))) :hook (lsp-mode . evil-normalize-keymaps) + (nix-mode . lsp-deferred) (gdscript-mode . lsp-deferred) (gdscript-ts-mode . lsp-deferred)) (use-package lsp-ui :commands lsp-ui-mode) -(use-package lsp-treemacs :commands lsp-treemacs-errors-list) +(use-package lsp-treemacs + :after (evil) + :config + (evil-define-key 'normal 'global (kbd "os") 'lsp-treemacs-symbols)) (use-package treesit :config diff --git a/modules/user/emacs/lib/line-wrapping-and-numbers.el b/modules/user/emacs/lib/line-wrapping-and-numbers.el index cc85951f..feb5617e 100644 --- a/modules/user/emacs/lib/line-wrapping-and-numbers.el +++ b/modules/user/emacs/lib/line-wrapping-and-numbers.el @@ -27,13 +27,13 @@ "Disable `visual-line-mode` in current buffer." (interactive) (visual-line-mode 0)) -(add-hook 'org-mode-hook 'truncate-lines-off) -(add-hook 'markdown-mode-hook 'truncate-lines-off) +(add-hook 'org-mode-hook 'truncate-lines-on) +(add-hook 'markdown-mode-hook 'truncate-lines-on) (add-hook 'org-mode-hook 'visual-line-mode) (add-hook 'markdown-mode-hook 'visual-line-mode) -(add-hook 'prog-mode-hook 'truncate-lines-on) +(add-hook 'prog-mode-hook 'truncate-lines-off) (add-hook 'prog-mode-hook 'visual-line-mode-off) -(add-hook 'nix-mode-hook 'truncate-lines-on) +(add-hook 'nix-mode-hook 'truncate-lines-off) (add-hook 'nix-mode-hook 'visual-line-mode-off) (defun apply-proper-line-wrapping () "Apply proper line wrapping and visual line mode settings according to whether or not the current mode derives from `prog-mode`."