emmet/nixos-config
0
1
Fork 0
Code Issues Pull Requests Projects Wiki Activity

some emacs fixes

Browse Source
This commit is contained in:
Emmet
2025-07-13 20:05:45 -05:00
parent 0558047a7b
commit a98207c56a
2 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
modules/user/emacs/init.el
View File

@ -35,6 +35,9 @@
;; I want declarative config, no custom ;; I want declarative config, no custom
(setq custom-file "/dev/null") (setq custom-file "/dev/null")
;; Auto save errors are annoying
(setq auto-save-default nil)
;; Disable the menu bar ;; Disable the menu bar
(menu-bar-mode -1) (menu-bar-mode -1)
@ -75,7 +78,7 @@
(36 . ".\\(?:>\\)") (36 . ".\\(?:>\\)")
(37 . ".\\(?:\\(?:%%\\)\\|%\\)") (37 . ".\\(?:\\(?:%%\\)\\|%\\)")
(38 . ".\\(?:\\(?:&&\\)\\|&\\)") (38 . ".\\(?:\\(?:&&\\)\\|&\\)")
(42 . ".\\(?:\\(?:\\*\\*/\\)\\|\\(?:\\*[*/]\\)\\|[*/>]\\)") ;;(42 . ".\\(?:\\(?:\\*\\*/\\)\\|\\(?:\\*[*/]\\)\\|[*/>]\\)")
(43 . ".\\(?:\\(?:\\+\\+\\)\\|[+>]\\)") (43 . ".\\(?:\\(?:\\+\\+\\)\\|[+>]\\)")
(45 . ".\\(?:\\(?:-[>-]\\|<<\\|>>\\)\\|[<>}~-]\\)") (45 . ".\\(?:\\(?:-[>-]\\|<<\\|>>\\)\\|[<>}~-]\\)")
(46 . ".\\(?:\\(?:\\.[.<]\\)\\|[.=-]\\)") (46 . ".\\(?:\\(?:\\.[.<]\\)\\|[.=-]\\)")
@ -320,13 +323,15 @@
(global-flycheck-mode)) (global-flycheck-mode))
(use-package treemacs (use-package treemacs
:after (evil)
:config :config
(defun treemacs-display-current-project-exclusively-silently () (defun treemacs-display-current-project-exclusively-silently ()
(interactive)
"Display current project exclusively in treemacs without switching to treemacs buffer." "Display current project exclusively in treemacs without switching to treemacs buffer."
(let ((buffer (current-buffer))) (let ((buffer (current-buffer)))
(treemacs-add-and-display-current-project-exclusively) (treemacs-add-and-display-current-project-exclusively)
(switch-to-buffer buffer))) (switch-to-buffer buffer)))
(add-hook 'projectile-after-switch-project-hook 'treemacs-display-current-project-exclusively-silently)) (evil-define-key 'normal 'global (kbd "<leader>ot") 'treemacs-add-and-display-current-project-exclusively))
(use-package treemacs-evil (use-package treemacs-evil
:after (treemacs)) :after (treemacs))
@ -341,11 +346,15 @@
'((gdscript-mode . gdscript-ts-mode))) '((gdscript-mode . gdscript-ts-mode)))
:hook :hook
(lsp-mode . evil-normalize-keymaps) (lsp-mode . evil-normalize-keymaps)
(nix-mode . lsp-deferred)
(gdscript-mode . lsp-deferred) (gdscript-mode . lsp-deferred)
(gdscript-ts-mode . lsp-deferred)) (gdscript-ts-mode . lsp-deferred))
(use-package lsp-ui :commands lsp-ui-mode) (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 "<leader>os") 'lsp-treemacs-symbols))
(use-package treesit (use-package treesit
:config :config

8
modules/user/emacs/lib/line-wrapping-and-numbers.el
View File

@ -27,13 +27,13 @@
"Disable `visual-line-mode` in current buffer." "Disable `visual-line-mode` in current buffer."
(interactive) (interactive)
(visual-line-mode 0)) (visual-line-mode 0))
(add-hook 'org-mode-hook 'truncate-lines-off) (add-hook 'org-mode-hook 'truncate-lines-on)
(add-hook 'markdown-mode-hook 'truncate-lines-off) (add-hook 'markdown-mode-hook 'truncate-lines-on)
(add-hook 'org-mode-hook 'visual-line-mode) (add-hook 'org-mode-hook 'visual-line-mode)
(add-hook 'markdown-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 '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) (add-hook 'nix-mode-hook 'visual-line-mode-off)
(defun apply-proper-line-wrapping () (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`." "Apply proper line wrapping and visual line mode settings according to whether or not the current mode derives from `prog-mode`."