Update .emacs

This commit is contained in:
zongor 2025-04-06 13:46:28 -04:00
parent cc34efbda7
commit e5a6ad9743
1 changed files with 79 additions and 72 deletions

113
.emacs
View File

@ -37,12 +37,7 @@
(straight-use-package 'org) (straight-use-package 'org)
(global-set-key [f11] 'toggle-frame-fullscreen) (setq ring-bell-function 'ignore)
(global-set-key (kbd "C-s") 'ripgrep-regexp)
(global-set-key (kbd "C-,") 'move-to-previous-window)
(global-set-key (kbd "C-.") 'move-to-next-window)
(global-set-key (kbd "M-i") 'xref-find-definitions)
(global-set-key (kbd "C-M-i") 'xref-pop-marker-stack)
;; Auto-insert braces. Has some counter-intuitive behaviour, unfortunately. ;; Auto-insert braces. Has some counter-intuitive behaviour, unfortunately.
(electric-pair-mode 1) (electric-pair-mode 1)
@ -89,7 +84,7 @@
(menu-bar-mode -1) (menu-bar-mode -1)
(show-paren-mode 1) (show-paren-mode 1)
(blink-cursor-mode 0) (blink-cursor-mode 0)
(display-battery-mode 1) (display-battery-mode 0)
(display-time-mode 1) (display-time-mode 1)
(set-cursor-color "#ffffff") (set-cursor-color "#ffffff")
@ -164,6 +159,13 @@ and position the cursor inside the comment. Additionally insert the word under t
:config :config
(evil-mode 1) (evil-mode 1)
(global-set-key [f11] 'toggle-frame-fullscreen)
(global-set-key (kbd "C-s") 'ripgrep-regexp)
(global-set-key (kbd "C-,") 'move-to-previous-window)
(global-set-key (kbd "C-.") 'move-to-next-window)
(global-set-key (kbd "M-i") 'xref-find-definitions)
(global-set-key (kbd "C-M-i") 'xref-pop-marker-stack)
;; :q should kill the current buffer rather than quitting emacs entirely ;; :q should kill the current buffer rather than quitting emacs entirely
(evil-ex-define-cmd "q" 'kill-this-buffer) (evil-ex-define-cmd "q" 'kill-this-buffer)
;; Need to type out :quit to close emacs ;; Need to type out :quit to close emacs
@ -177,7 +179,7 @@ and position the cursor inside the comment. Additionally insert the word under t
(define-key evil-normal-state-map (kbd "K") 'backward-paragraph) (define-key evil-normal-state-map (kbd "K") 'backward-paragraph)
(define-key evil-normal-state-map (kbd "J") 'forward-paragraph) (define-key evil-normal-state-map (kbd "J") 'forward-paragraph)
(define-key evil-normal-state-map (kbd "C-x l") 'list-buffers) (define-key evil-normal-state-map (kbd "C-x l") 'list-buffers)
(define-key evil-normal-state-map (kbd "C-M-u") 'eval-buffer) (define-key evil-normal-state-map (kbd "C-.") 'move-to-next-window)
(define-key evil-normal-state-map (kbd "C-M-p") 'compile) (define-key evil-normal-state-map (kbd "C-M-p") 'compile)
(define-key evil-normal-state-map (kbd "C-M-k") 'compile) (define-key evil-normal-state-map (kbd "C-M-k") 'compile)
(define-key evil-normal-state-map (kbd "M-/") 'dabbrev-expand) (define-key evil-normal-state-map (kbd "M-/") 'dabbrev-expand)
@ -498,6 +500,8 @@ Other buffer group by `centaur-tabs-get-group-name' with project name."
(use-package org-modern (use-package org-modern
:config :config
(setq (setq
org-startup-with-inline-images t
;; Edit settings ;; Edit settings
org-auto-align-tags nil org-auto-align-tags nil
org-tags-column 0 org-tags-column 0
@ -555,46 +559,57 @@ Other buffer group by `centaur-tabs-get-group-name' with project name."
org-roam-ui-update-on-save t org-roam-ui-update-on-save t
org-roam-ui-open-on-start t)) org-roam-ui-open-on-start t))
(use-package restclient) (use-package verb
(use-package markdown-mode :init
:ensure t (with-eval-after-load 'org
:mode ("README\\.md\\'" . gfm-mode) (define-key org-mode-map (kbd "C-c C-r") verb-command-map)))
:init (setq markdown-command "multimarkdown"))
(use-package docker (use-package restclient)
:ensure t ;; (use-package markdown-mode
:bind ("C-c d" . docker)) ;; :ensure t
(use-package docker-compose-mode) ;; :mode ("README\\.md\\'" . gfm-mode)
;; :init (setq markdown-command "multimarkdown"))
;; (use-package docker
;; :ensure t
;; :bind ("C-c d" . docker))
;; (use-package docker-compose-mode)
(use-package web-mode (use-package web-mode
:config :config
(add-to-list 'auto-mode-alist '("\\.jsx?$" . web-mode)) (add-to-list 'auto-mode-alist '("\\.jsx?$" . web-mode))
(setq web-mode-content-types-alist '(("jsx" . "\\.js[x]?\\'")))) (setq web-mode-content-types-alist '(("jsx" . "\\.js[x]?\\'"))))
(use-package typescript-mode) ;; (use-package typescript-mode)
(use-package tide ;; (use-package tide
:ensure t ;; :ensure t
:after (typescript-mode company flycheck) ;; :after (typescript-mode company flycheck)
:hook ((typescript-mode . tide-setup) ;; :hook ((typescript-mode . tide-setup)
(typescript-mode . tide-hl-identifier-mode) ;; (typescript-mode . tide-hl-identifier-mode)
(before-save . tide-format-before-save))) ;; (before-save . tide-format-before-save)))
(use-package uxntal-mode)
(use-package uxntal-mode
:bind ("C-M-u" . uxntal-compile-and-run))
;(use-package hy-mode) ;(use-package hy-mode)
(use-package lua-mode) (use-package lua-mode)
;(use-package elm-mode) ;(use-package elm-mode)
(use-package go-mode) (use-package go-mode)
;(use-package rust-mode) ;(use-package rust-mode)
;(use-package cargo) ;(use-package cargo)
(use-package gdscript-mode
:hook (gdscript-mode . eglot-ensure))
(use-package ccls (use-package ccls
:ensure t :ensure t
:init (setq ccls-executable "/usr/bin/ccls") :init (setq ccls-executable "/usr/bin/ccls")
:hook ((c-mode c++-mode objc-mode cuda-mode) . :hook ((c-mode c++-mode objc-mode cuda-mode) .
(lambda () (require 'ccls) (lsp)))) (lambda () (require 'ccls) (lsp))))
(use-package elixir-mode ;; (use-package elixir-mode
:ensure t ;; :ensure t
:hook ;; :hook
(elixir-mode . inf-elixir-minor-mode)) ;; (elixir-mode . inf-elixir-minor-mode))
(use-package inf-elixir (use-package inf-elixir
:ensure t) :ensure t)
@ -605,9 +620,10 @@ Other buffer group by `centaur-tabs-get-group-name' with project name."
:diminish lsp-mode :diminish lsp-mode
:init :init
(setq lsp-keymap-prefix "C-c l") (setq lsp-keymap-prefix "C-c l")
(add-to-list 'exec-path "/home/zongor/lib/elixir-ls") ;; (add-to-list 'exec-path "/home/zongor/lib/elixir-ls")
:hook :hook
((elixir-mode . lsp) (
;; (elixir-mode . lsp)
;(rust-mode . lsp) ;(rust-mode . lsp)
(go-mode . lsp))) (go-mode . lsp)))
@ -621,34 +637,25 @@ Other buffer group by `centaur-tabs-get-group-name' with project name."
; :config ; :config
; (setq inferior-lisp-program "sbcl")) ; (setq inferior-lisp-program "sbcl"))
;; (use-package elpy
;; :ensure t
;; :init
;; (elpy-enable))
(use-package vterm (use-package vterm
:ensure t) :ensure t)
(use-package dash) (use-package dash)
(use-package column-enforce-mode)
(use-package desktop) (use-package desktop)
(use-package magit) ;; (use-package column-enforce-mode)
(use-package magit-lfs ;; (use-package magit)
:ensure t ;; (use-package magit-lfs
:pin melpa) ;; :ensure t
(use-package forge ;; :pin melpa)
:after magit) ;; (use-package forge
(use-package ripgrep) ;; :after magit)
;; (use-package ripgrep)
(use-package git-gutter (use-package git-gutter
:ensure t :ensure t
:init (global-git-gutter-mode t)) :init (global-git-gutter-mode t))
(custom-set-variables
;; custom-set-variables was added by Custom.
;; If you edit it by hand, you could mess it up, so be careful.
;; Your init file should contain only one such instance.
;; If there is more than one, they won't work right.
'(inhibit-startup-screen t)
'(neo-theme 'icons))
(custom-set-faces
;; custom-set-faces was added by Custom.
;; If you edit it by hand, you could mess it up, so be careful.
;; Your init file should contain only one such instance.
;; If there is more than one, they won't work right.
)