diff --git a/extraFiles/config/emacs/early-init.el b/extraFiles/config/emacs/early-init.el index 26925a0..67becc5 100644 --- a/extraFiles/config/emacs/early-init.el +++ b/extraFiles/config/emacs/early-init.el @@ -13,8 +13,8 @@ (unless (daemonp) (setq gc-cons-threshold most-positive-fixnum ; 2^61 bytes gc-cons-percentage 0.6) - - + + (advice-add #'tty-run-terminal-initialization :override #'ignore) (add-hook 'window-setup-hook (lambda () diff --git a/extraFiles/config/emacs/emacs-materus-config.org b/extraFiles/config/emacs/emacs-materus-config.org index 2335518..4723e9f 100644 --- a/extraFiles/config/emacs/emacs-materus-config.org +++ b/extraFiles/config/emacs/emacs-materus-config.org @@ -1 +1 @@ -:PROPERTIES: :header-args: :tangle etc/materus/emacs-config.el :END: #+TITLE Emacs Cfg #+DESCRIPTION: materus emacs configuration #+STARTUP: overview #+AUTHOR: materus #+LANGUAGE: en #+auto_tangle: t * Table of Contents :noexport:TOC_3_gh: - [[#init-files][Init Files]] - [[#early-init][Early Init]] - [[#init][Init]] - [[#byte-compile][Byte compile]] - [[#packages][Packages]] - [[#init-1][Init]] - [[#packages-1][Packages]] - [[#configuration][Configuration]] - [[#no-littering][No Littering]] - [[#graphical][Graphical]] - [[#mouse][Mouse]] - [[#misc][Misc]] - [[#dashboard][Dashboard]] - [[#modeline][Modeline]] - [[#org-mode][Org-mode]] - [[#completions][Completions]] - [[#minibuffer][Minibuffer]] - [[#company][Company]] - [[#miscellaneous][Miscellaneous]] - [[#defaults][Defaults]] - [[#elcord][Elcord]] - [[#undo-tree][Undo-Tree]] - [[#projectile][Projectile]] - [[#treemacs][Treemacs]] - [[#programming][Programming]] - [[#lsp][LSP]] - [[#nix][Nix]] - [[#emacs-lisp][Emacs Lisp]] - [[#cc][C/C++]] - [[#java][Java]] - [[#keybindings][Keybindings]] - [[#test][Test]] * Init Files ** Early Init :PROPERTIES: :header-args: :tangle early-init.el :END: Early init file, setting for GC and some paths. #+begin_src emacs-lisp (defvar materus/init-early t) ; Var to ensure early-init loaded (setq materus/init-early t) ; Probably useless (setq initial-major-mode 'fundamental-mode) (setq native-comp-async-report-warnings-errors nil) (setq package-enable-at-startup nil) (setq native-comp-speed 3) (add-hook 'emacs-startup-hook (lambda () (package-initialize) (setq gc-cons-threshold 100000000 ; ~100mb gc-cons-percentage 0.1) )) (unless (daemonp) (setq gc-cons-threshold most-positive-fixnum ; 2^61 bytes gc-cons-percentage 0.6) (advice-add #'tty-run-terminal-initialization :override #'ignore) (add-hook 'window-setup-hook (lambda () (advice-remove #'tty-run-terminal-initialization #'ignore) (tty-run-terminal-initialization (selected-frame) nil t) ) ) ) (when (boundp 'native-comp-eln-load-path) ; Change dir for eln-cache (startup-redirect-eln-cache (expand-file-name "/var/eln-cache/" user-emacs-directory))) (when (and (fboundp 'startup-redirect-eln-cache) (fboundp 'native-comp-available-p) (native-comp-available-p)) (startup-redirect-eln-cache (convert-standard-filename (expand-file-name "var/eln-cache/" user-emacs-directory)))) (setq auto-save-default nil) (setq backup-directory-alist `((".*" . ,(concat user-emacs-directory "var/backups/")))) ; Change backup and auto save dir to var dir (setq auto-save-file-name-transforms `((".*" ,(concat user-emacs-directory "var/recovery/") t))) (setq auto-save-list-file-prefix (concat user-emacs-directory "var/auto-save/sessions/")) (setq custom-file (concat user-emacs-directory "etc/custom.el")) #+end_src ** Init :PROPERTIES: :header-args: :tangle init.el :END: Init File Checking if using emacs from nix package, loads config and custom.el #+begin_src emacs-lisp (setq-default materus/use-nix-packages (require 'materus-config nil 'noerror)) (cua-mode 0) ; To load cua variables/functions but not set it up yet (load (concat user-emacs-directory "etc/materus/emacs-config")) (when (file-exists-p custom-file) (load custom-file)) #+end_src ** Byte compile #+begin_src emacs-lisp (unless (file-exists-p (concat user-emacs-directory "etc/materus/emacs-config.elc")) (byte-compile-file (concat user-emacs-directory "etc/materus/emacs-config.el"))) (unless (file-exists-p (concat user-emacs-directory "init.elc")) (byte-compile-file (concat user-emacs-directory "init.el"))) (unless (file-exists-p (concat user-emacs-directory "early-init.elc")) (byte-compile-file (concat user-emacs-directory "early-init.el"))) #+end_src * Packages Package manager config. Nix not used for portability and easier control. ** Init #+begin_src emacs-lisp (require 'cl-lib) (require 'package) (setq package-user-dir (concat user-emacs-directory "var/elpa/" emacs-version "/" )) (add-to-list 'package-archives '("nongnu-devel" . "https://elpa.nongnu.org/nongnu-devel/")) (add-to-list 'package-archives '("melpa" . "https://melpa.org/packages/") t) (package-initialize) #+end_src ** Packages Packages to install #+begin_src emacs-lisp (defvar materus/packages '( use-package elcord persp-mode dashboard magit git-timemachine avy corfu vterm projectile company clipetty which-key iedit hideshowvis evil treemacs-evil treemacs treemacs-nerd-icons treemacs-perspective treemacs-icons-dired treemacs-magit treemacs-projectile tree-edit vertico marginalia nerd-icons nerd-icons-completion perspective minions doom-modeline rainbow-delimiters rainbow-mode use-package cmake-mode lsp-mode lsp-java lsp-jedi lsp-haskell lsp-ui lsp-treemacs gradle-mode groovy-mode kotlin-mode dap-mode d-mode lua-mode multiple-cursors org org-contrib org-ql org-rainbow-tags org-roam org-roam-ui org-review org-superstar org-auto-tangle visual-fill-column csharp-mode markdown-mode json-mode nix-mode no-littering right-click-context dracula-theme doom-themes doom-modeline orderless popper undo-tree bash-completion consult eldoc-box yasnippet async request nix-ts-mode markdown-ts-mode llvm-ts-mode treesit-fold treesit-auto tree-sitter-langs eat vlf edit-indirect zones sudo-edit toc-org eshell-vterm empv volatile-highlights ) "A list of packages to ensure are installed at launch.") (defun materus/packages-installed-p () (cl-loop for p in materus/packages when (not (package-installed-p p)) do (cl-return nil) finally (cl-return t))) (defun materus/install-packages () (unless (materus/packages-installed-p) (package-refresh-contents) (dolist (p materus/packages) (when (not (package-installed-p p)) (package-install p))))) (materus/install-packages) #+end_src * Configuration ** No Littering Set up no littering #+begin_src emacs-lisp (require 'recentf) (use-package no-littering :config (add-to-list 'recentf-exclude (recentf-expand-file-name no-littering-var-directory)) (add-to-list 'recentf-exclude (recentf-expand-file-name no-littering-etc-directory))) #+end_src ** Graphical Graphical related settings. *** Mouse #+begin_src emacs-lisp (context-menu-mode 1) (setq mouse-wheel-follow-mouse 't) (setq scroll-step 1) (setq mouse-drag-and-drop-region t) (xterm-mouse-mode 1) (pixel-scroll-precision-mode 1) (setq-default pixel-scroll-precision-large-scroll-height 10.0) #+end_src *** Misc #+begin_src emacs-lisp (setq frame-inhibit-implied-resize t) (setq frame-resize-pixelwise t) (setq window-resize-pixelwise t) (when (display-graphic-p) (set-frame-font "Hack Nerd Font" nil t) ) (setq-default display-line-numbers-width 4) (global-tab-line-mode 1) (setq-default tab-width 4) (tool-bar-mode -1) (setq read-process-output-max (* 1024 1024 3)) (setq ring-bell-function 'ignore) (setq-default cursor-type '(bar . 1)) ;; Delimiters (use-package rainbow-delimiters :hook (prog-mode . rainbow-delimiters-mode) :config (custom-set-faces '(rainbow-delimiters-depth-1-face ((t (:foreground "#FFFFFF")))) '(rainbow-delimiters-depth-2-face ((t (:foreground "#FFFF00")))) '(rainbow-delimiters-depth-5-face ((t (:foreground "#6A5ACD")))) '(rainbow-delimiters-unmatched-face ((t (:foreground "#FF0000"))))) ) ;; Nerd Icons (use-package nerd-icons) ;; Theme (use-package dracula-theme :config (if (daemonp) (add-hook 'after-make-frame-functions (lambda (frame) (with-selected-frame frame (load-theme 'dracula t)))) (load-theme 'dracula t))) (defun startup-screen-advice (orig-fun &rest args) (when (= (seq-count #'buffer-file-name (buffer-list)) 0) (apply orig-fun args))) (advice-add 'display-startup-screen :around #'startup-screen-advice) ; Hide startup screen if started with file #+end_src *** Dashboard #+begin_src emacs-lisp (use-package dashboard :after (nerd-icons) :config (setq dashboard-center-content t) (setq dashboard-display-icons-p t) (setq dashboard-icon-type 'nerd-icons) (dashboard-setup-startup-hook) (when (daemonp) (setq initial-buffer-choice (lambda () (get-buffer "*dashboard*"))) ; Show dashboard when emacs is running as daemon ) ) #+end_src *** Modeline #+begin_src emacs-lisp (use-package doom-modeline :init (setq doom-modeline-support-imenu t) :hook (after-init . doom-modeline-mode) :config (setq doom-modeline-icon t) (setq display-time-24hr-format t) (display-time-mode 1)) (use-package minions :hook (after-init . minions-mode)) #+end_src ** Org-mode Org mode settings #+begin_src emacs-lisp (use-package org :mode (("\\.org$" . org-mode)) :hook ((org-mode . org-indent-mode) (org-mode . (lambda () (setq-local electric-pair-inhibit-predicate `(lambda (c) (if (char-equal c ?<) t (,electric-pair-inhibit-predicate c))))))) :config (require 'org-mouse) (require 'org-tempo)) (use-package org-superstar :after (org) :hook (org-mode . org-superstar-mode)) :config (setq org-superstar-leading-bullet " ") (use-package org-auto-tangle :after (org) :hook (org-mode . org-auto-tangle-mode)) (use-package toc-org :after (org) :hook ((org-mode . toc-org-mode ) (markdown-mode . toc-org-mode))) #+end_src ** Completions *** Minibuffer #+begin_src emacs-lisp (use-package consult) (use-package marginalia) (use-package orderless) (use-package which-key :config (which-key-mode 1)) (use-package vertico :after (consult marginalia) :config (setq completion-in-region-function (lambda (&rest args) (apply (if vertico-mode #'consult-completion-in-region #'completion--in-region) args))) (vertico-mode 1) (marginalia-mode 1)) #+end_src *** Company #+begin_src emacs-lisp (use-package company :hook (after-init-hook . global-company-mode)) #+end_src ** Miscellaneous *** Defaults #+begin_src emacs-lisp (electric-pair-mode 1) (electric-indent-mode 0) #+end_src *** Elcord #+begin_src emacs-lisp (defun materus/elcord-toggle (&optional _frame) "Toggle elcord based on visible frames" (if (> (length (frame-list)) 1) (elcord-mode 1) (elcord-mode -1)) ) (use-package elcord :init (unless (daemonp) (elcord-mode 1)) :config (add-hook 'after-delete-frame-functions 'materus/elcord-toggle) (add-hook 'server-after-make-frame-hook 'materus/elcord-toggle)) #+end_src *** Undo-Tree #+begin_src emacs-lisp (use-package undo-tree :init (global-undo-tree-mode 1) :config (defvar materus/undo-tree-dir (concat user-emacs-directory "var/undo-tree/")) (unless (file-exists-p materus/undo-tree-dir) (make-directory materus/undo-tree-dir t)) (setq undo-tree-visualizer-diff t) (setq undo-tree-history-directory-alist `(("." . ,materus/undo-tree-dir ))) (setq undo-tree-visualizer-timestamps t) ) #+end_src *** Projectile #+begin_src emacs-lisp (use-package projectile) #+end_src *** Treemacs #+begin_src emacs-lisp (use-package treemacs) (use-package treemacs-projectile :after (projectile treemacs)) (use-package treemacs-nerd-icons :after (nerd-icons treemacs)) #+end_src * Programming ** LSP #+begin_src emacs-lisp (use-package lsp-mode) (use-package lsp-ui) (use-package dap-mode) (use-package dap-lldb) (use-package dap-gdb-lldb) (defun lsp-booster--advice-json-parse (old-fn &rest args) "Try to parse bytecode instead of json." (or (when (equal (following-char) ?#) (let ((bytecode (read (current-buffer)))) (when (byte-code-function-p bytecode) (funcall bytecode)))) (apply old-fn args))) (advice-add (if (progn (require 'json) (fboundp 'json-parse-buffer)) 'json-parse-buffer 'json-read) :around #'lsp-booster--advice-json-parse) (defun lsp-booster--advice-final-command (old-fn cmd &optional test?) "Prepend emacs-lsp-booster command to lsp CMD." (let ((orig-result (funcall old-fn cmd test?))) (if (and (not test?) ;; for check lsp-server-present? (not (file-remote-p default-directory)) ;; see lsp-resolve-final-command, it would add extra shell wrapper lsp-use-plists (not (functionp 'json-rpc-connection)) ;; native json-rpc (executable-find "emacs-lsp-booster")) (progn (when-let ((command-from-exec-path (executable-find (car orig-result)))) ;; resolve command from exec-path (in case not found in $PATH) (setcar orig-result command-from-exec-path)) (message "Using emacs-lsp-booster for %s!" orig-result) (cons "emacs-lsp-booster" orig-result)) orig-result))) (advice-add 'lsp-resolve-final-command :around #'lsp-booster--advice-final-command) #+end_src ** Nix #+begin_src emacs-lisp (with-eval-after-load 'lsp-mode (lsp-register-client (make-lsp-client :new-connection (lsp-stdio-connection "nixd") :major-modes '(nix-mode) :priority 0 :server-id 'nixd))) (setq lsp-nix-nixd-formatting-command "nixfmt") (add-hook 'nix-mode-hook 'lsp-deferred) (add-hook 'nix-mode-hook 'display-line-numbers-mode) #+end_src ** Emacs Lisp #+begin_src emacs-lisp (add-hook 'emacs-lisp-mode-hook 'display-line-numbers-mode) (add-hook 'emacs-lisp-mode-hook 'company-mode) #+end_src ** C/C++ #+begin_src emacs-lisp (add-hook 'c-mode-hook 'lsp-deferred) (add-hook 'c-mode-hook 'display-line-numbers-mode) (add-hook 'c++-mode-hook 'lsp-deferred) (add-hook 'c++-mode-hook 'display-line-numbers-mode) #+end_src ** Java #+begin_src emacs-lisp (add-hook 'java-mode-hook 'lsp-deferred) #+end_src * TODO Keybindings #+begin_src emacs-lisp ;; Keybinds (keymap-set cua--cua-keys-keymap "C-z" 'undo-tree-undo) (keymap-set cua--cua-keys-keymap "C-y" 'undo-tree-redo) (keymap-set global-map "C-" #'indent-rigidly-left-to-tab-stop) (keymap-set global-map "C-" #'indent-rigidly-right-to-tab-stop) (define-key key-translation-map (kbd "") 'event-apply-hyper-modifier ) (define-key key-translation-map (kbd "") 'event-apply-hyper-modifier ) (define-key key-translation-map (kbd "∇") 'event-apply-hyper-modifier ) (global-set-key (kbd "C-H-t") 'treemacs) (cua-mode 1) #+end_src * Test Just for testing some code #+begin_src emacs-lisp ;;; (global-set-key (kbd "C-∇") (kbd "C-H")) ;;; (global-set-key (kbd "H-∇") (lambda () (interactive) (insert-char #x2207))) ;;; (setq completion-styles '(orderless basic) ;;; completion-category-defaults nil ;;; completion-category-overrides '((file (styles partial-completion)))) #+end_src \ No newline at end of file +#+TITLE Emacs Cfg #+DESCRIPTION: materus emacs configuration #+STARTUP: overview #+AUTHOR: materus #+LANGUAGE: en #+PROPERTY: header-args :tangle etc/materus/emacs-config.el #+auto_tangle: t * Table of Contents :noexport:TOC_3_gh: - [[#init-files][Init Files]] - [[#early-init][Early Init]] - [[#init][Init]] - [[#byte-compile][Byte compile]] - [[#packages][Packages]] - [[#init-1][Init]] - [[#packages-1][Packages]] - [[#configuration][Configuration]] - [[#no-littering][No Littering]] - [[#graphical][Graphical]] - [[#mouse][Mouse]] - [[#misc][Misc]] - [[#dashboard][Dashboard]] - [[#modeline][Modeline]] - [[#org-mode][Org-mode]] - [[#completions][Completions]] - [[#minibuffer][Minibuffer]] - [[#company][Company]] - [[#miscellaneous][Miscellaneous]] - [[#defaults][Defaults]] - [[#elcord][Elcord]] - [[#undo-tree][Undo-Tree]] - [[#projectile][Projectile]] - [[#treemacs][Treemacs]] - [[#programming][Programming]] - [[#lsp][LSP]] - [[#nix][Nix]] - [[#emacs-lisp][Emacs Lisp]] - [[#cc][C/C++]] - [[#java][Java]] - [[#keybindings][Keybindings]] - [[#test][Test]] * Init Files ** Early Init :PROPERTIES: :header-args: :tangle early-init.el :END: Early init file, setting for GC and some paths. #+begin_src emacs-lisp (defvar materus/init-early t) ; Var to ensure early-init loaded (setq materus/init-early t) ; Probably useless (setq initial-major-mode 'fundamental-mode) (setq native-comp-async-report-warnings-errors nil) (setq package-enable-at-startup nil) (setq native-comp-speed 3) (add-hook 'emacs-startup-hook (lambda () (package-initialize) (setq gc-cons-threshold 100000000 ; ~100mb gc-cons-percentage 0.1) )) (unless (daemonp) (setq gc-cons-threshold most-positive-fixnum ; 2^61 bytes gc-cons-percentage 0.6) (advice-add #'tty-run-terminal-initialization :override #'ignore) (add-hook 'window-setup-hook (lambda () (advice-remove #'tty-run-terminal-initialization #'ignore) (tty-run-terminal-initialization (selected-frame) nil t) ) ) ) (when (boundp 'native-comp-eln-load-path) ; Change dir for eln-cache (startup-redirect-eln-cache (expand-file-name "/var/eln-cache/" user-emacs-directory))) (when (and (fboundp 'startup-redirect-eln-cache) (fboundp 'native-comp-available-p) (native-comp-available-p)) (startup-redirect-eln-cache (convert-standard-filename (expand-file-name "var/eln-cache/" user-emacs-directory)))) (setq auto-save-default nil) (setq backup-directory-alist `((".*" . ,(concat user-emacs-directory "var/backups/")))) ; Change backup and auto save dir to var dir (setq auto-save-file-name-transforms `((".*" ,(concat user-emacs-directory "var/recovery/") t))) (setq auto-save-list-file-prefix (concat user-emacs-directory "var/auto-save/sessions/")) (setq custom-file (concat user-emacs-directory "etc/custom.el")) #+end_src ** Init :PROPERTIES: :header-args: :tangle init.el :END: Init File Checking if using emacs from nix package, loads config and custom.el #+begin_src emacs-lisp (setq-default materus/use-nix-packages (require 'materus-config nil 'noerror)) (cua-mode 0) ; To load cua variables/functions but not set it up yet (load (concat user-emacs-directory "etc/materus/emacs-config")) (when (file-exists-p custom-file) (load custom-file)) #+end_src ** Byte compile #+begin_src emacs-lisp (unless (file-exists-p (concat user-emacs-directory "etc/materus/emacs-config.elc")) (byte-compile-file (concat user-emacs-directory "etc/materus/emacs-config.el"))) (unless (file-exists-p (concat user-emacs-directory "init.elc")) (byte-compile-file (concat user-emacs-directory "init.el"))) (unless (file-exists-p (concat user-emacs-directory "early-init.elc")) (byte-compile-file (concat user-emacs-directory "early-init.el"))) #+end_src * Packages Package manager config. Nix not used for portability and easier control. ** Init #+begin_src emacs-lisp (require 'cl-lib) (require 'package) (setq package-user-dir (concat user-emacs-directory "var/elpa/" emacs-version "/" )) (add-to-list 'package-archives '("nongnu-devel" . "https://elpa.nongnu.org/nongnu-devel/")) (add-to-list 'package-archives '("melpa" . "https://melpa.org/packages/") t) (package-initialize) #+end_src ** Packages Packages to install #+begin_src emacs-lisp (defvar materus/packages '( use-package elcord persp-mode dashboard magit git-timemachine avy corfu vterm projectile company clipetty which-key iedit hideshowvis evil treemacs-evil treemacs treemacs-nerd-icons treemacs-perspective treemacs-icons-dired treemacs-magit treemacs-projectile tree-edit vertico marginalia nerd-icons nerd-icons-completion perspective minions doom-modeline rainbow-delimiters rainbow-mode use-package cmake-mode lsp-mode lsp-java lsp-jedi lsp-haskell lsp-ui lsp-treemacs gradle-mode groovy-mode kotlin-mode dap-mode d-mode lua-mode multiple-cursors org org-contrib org-ql org-rainbow-tags org-roam org-roam-ui org-review org-superstar org-auto-tangle visual-fill-column csharp-mode markdown-mode json-mode nix-mode no-littering right-click-context dracula-theme doom-themes doom-modeline orderless popper undo-tree bash-completion consult eldoc-box yasnippet async request nix-ts-mode markdown-ts-mode llvm-ts-mode treesit-fold treesit-auto tree-sitter-langs eat vlf edit-indirect zones sudo-edit toc-org eshell-vterm empv volatile-highlights ) "A list of packages to ensure are installed at launch.") (defun materus/packages-installed-p () (cl-loop for p in materus/packages when (not (package-installed-p p)) do (cl-return nil) finally (cl-return t))) (defun materus/install-packages () (unless (materus/packages-installed-p) (package-refresh-contents) (dolist (p materus/packages) (when (not (package-installed-p p)) (package-install p))))) (materus/install-packages) #+end_src * Configuration ** No Littering Set up no littering #+begin_src emacs-lisp (require 'recentf) (use-package no-littering :config (add-to-list 'recentf-exclude (recentf-expand-file-name no-littering-var-directory)) (add-to-list 'recentf-exclude (recentf-expand-file-name no-littering-etc-directory))) #+end_src ** Graphical Graphical related settings. *** Mouse #+begin_src emacs-lisp (context-menu-mode 1) (setq mouse-wheel-follow-mouse 't) (setq scroll-step 1) (setq mouse-drag-and-drop-region t) (xterm-mouse-mode 1) (pixel-scroll-precision-mode 1) (setq-default pixel-scroll-precision-large-scroll-height 10.0) #+end_src *** Misc #+begin_src emacs-lisp (setq frame-inhibit-implied-resize t) (setq frame-resize-pixelwise t) (setq window-resize-pixelwise t) (when (display-graphic-p) (set-frame-font "Hack Nerd Font" nil t) ) (setq-default display-line-numbers-width 4) (global-tab-line-mode 1) (setq-default tab-width 4) (tool-bar-mode -1) (setq read-process-output-max (* 1024 1024 3)) (setq ring-bell-function 'ignore) (setq-default cursor-type '(bar . 1)) ;; Delimiters (use-package rainbow-delimiters :hook (prog-mode . rainbow-delimiters-mode) :config (custom-set-faces '(rainbow-delimiters-depth-1-face ((t (:foreground "#FFFFFF")))) '(rainbow-delimiters-depth-2-face ((t (:foreground "#FFFF00")))) '(rainbow-delimiters-depth-5-face ((t (:foreground "#6A5ACD")))) '(rainbow-delimiters-unmatched-face ((t (:foreground "#FF0000"))))) ) ;; Nerd Icons (use-package nerd-icons) ;; Theme (use-package dracula-theme :config (if (daemonp) (add-hook 'after-make-frame-functions (lambda (frame) (with-selected-frame frame (load-theme 'dracula t)))) (load-theme 'dracula t))) (defun startup-screen-advice (orig-fun &rest args) (when (= (seq-count #'buffer-file-name (buffer-list)) 0) (apply orig-fun args))) (advice-add 'display-startup-screen :around #'startup-screen-advice) ; Hide startup screen if started with file #+end_src *** Dashboard #+begin_src emacs-lisp (use-package dashboard :after (nerd-icons) :config (setq dashboard-center-content t) (setq dashboard-display-icons-p t) (setq dashboard-icon-type 'nerd-icons) (dashboard-setup-startup-hook) (when (daemonp) (setq initial-buffer-choice (lambda () (get-buffer "*dashboard*"))) ; Show dashboard when emacs is running as daemon ) ) #+end_src *** Modeline #+begin_src emacs-lisp (use-package doom-modeline :init (setq doom-modeline-support-imenu t) :hook (after-init . doom-modeline-mode) :config (setq doom-modeline-icon t) (setq display-time-24hr-format t) (display-time-mode 1)) (use-package minions :hook (after-init . minions-mode)) #+end_src ** Org-mode Org mode settings #+begin_src emacs-lisp (use-package org :mode (("\\.org$" . org-mode)) :hook ((org-mode . org-indent-mode) (org-mode . (lambda () (setq-local electric-pair-inhibit-predicate `(lambda (c) (if (char-equal c ?<) t (,electric-pair-inhibit-predicate c))))))) :config (require 'org-mouse) (require 'org-tempo)) (use-package org-superstar :after (org) :hook (org-mode . org-superstar-mode)) :config (setq org-superstar-leading-bullet " ") (use-package org-auto-tangle :after (org) :hook (org-mode . org-auto-tangle-mode)) (use-package toc-org :after (org) :hook ((org-mode . toc-org-mode ) (markdown-mode . toc-org-mode))) #+end_src ** Completions *** Minibuffer #+begin_src emacs-lisp (use-package consult) (use-package marginalia) (use-package orderless) (use-package which-key :config (which-key-mode 1)) (use-package vertico :after (consult marginalia) :config (setq completion-in-region-function (lambda (&rest args) (apply (if vertico-mode #'consult-completion-in-region #'completion--in-region) args))) (vertico-mode 1) (marginalia-mode 1)) #+end_src *** Company #+begin_src emacs-lisp (use-package company :hook (after-init-hook . global-company-mode)) #+end_src ** Miscellaneous *** Defaults #+begin_src emacs-lisp (electric-pair-mode 1) (electric-indent-mode 0) #+end_src *** Elcord #+begin_src emacs-lisp (defun materus/elcord-toggle (&optional _frame) "Toggle elcord based on visible frames" (if (> (length (frame-list)) 1) (elcord-mode 1) (elcord-mode -1)) ) (use-package elcord :init (unless (daemonp) (elcord-mode 1)) :config (add-hook 'after-delete-frame-functions 'materus/elcord-toggle) (add-hook 'server-after-make-frame-hook 'materus/elcord-toggle)) #+end_src *** Undo-Tree #+begin_src emacs-lisp (use-package undo-tree :init (global-undo-tree-mode 1) :config (defvar materus/undo-tree-dir (concat user-emacs-directory "var/undo-tree/")) (unless (file-exists-p materus/undo-tree-dir) (make-directory materus/undo-tree-dir t)) (setq undo-tree-visualizer-diff t) (setq undo-tree-history-directory-alist `(("." . ,materus/undo-tree-dir ))) (setq undo-tree-visualizer-timestamps t) ) #+end_src *** Projectile #+begin_src emacs-lisp (use-package projectile) #+end_src *** Treemacs #+begin_src emacs-lisp (use-package treemacs) (use-package treemacs-projectile :after (projectile treemacs)) (use-package treemacs-nerd-icons :after (nerd-icons treemacs)) #+end_src * Programming ** LSP #+begin_src emacs-lisp (use-package lsp-mode) (use-package lsp-ui) (use-package dap-mode) (use-package dap-lldb) (use-package dap-gdb-lldb) (defun lsp-booster--advice-json-parse (old-fn &rest args) "Try to parse bytecode instead of json." (or (when (equal (following-char) ?#) (let ((bytecode (read (current-buffer)))) (when (byte-code-function-p bytecode) (funcall bytecode)))) (apply old-fn args))) (advice-add (if (progn (require 'json) (fboundp 'json-parse-buffer)) 'json-parse-buffer 'json-read) :around #'lsp-booster--advice-json-parse) (defun lsp-booster--advice-final-command (old-fn cmd &optional test?) "Prepend emacs-lsp-booster command to lsp CMD." (let ((orig-result (funcall old-fn cmd test?))) (if (and (not test?) ;; for check lsp-server-present? (not (file-remote-p default-directory)) ;; see lsp-resolve-final-command, it would add extra shell wrapper lsp-use-plists (not (functionp 'json-rpc-connection)) ;; native json-rpc (executable-find "emacs-lsp-booster")) (progn (when-let ((command-from-exec-path (executable-find (car orig-result)))) ;; resolve command from exec-path (in case not found in $PATH) (setcar orig-result command-from-exec-path)) (message "Using emacs-lsp-booster for %s!" orig-result) (cons "emacs-lsp-booster" orig-result)) orig-result))) (advice-add 'lsp-resolve-final-command :around #'lsp-booster--advice-final-command) #+end_src ** Nix #+begin_src emacs-lisp (with-eval-after-load 'lsp-mode (lsp-register-client (make-lsp-client :new-connection (lsp-stdio-connection "nixd") :major-modes '(nix-mode) :priority 0 :server-id 'nixd))) (setq lsp-nix-nixd-formatting-command "nixfmt") (add-hook 'nix-mode-hook 'lsp-deferred) (add-hook 'nix-mode-hook 'display-line-numbers-mode) #+end_src ** Emacs Lisp #+begin_src emacs-lisp (add-hook 'emacs-lisp-mode-hook 'display-line-numbers-mode) (add-hook 'emacs-lisp-mode-hook 'company-mode) #+end_src ** C/C++ #+begin_src emacs-lisp (add-hook 'c-mode-hook 'lsp-deferred) (add-hook 'c-mode-hook 'display-line-numbers-mode) (add-hook 'c++-mode-hook 'lsp-deferred) (add-hook 'c++-mode-hook 'display-line-numbers-mode) #+end_src ** Java #+begin_src emacs-lisp (add-hook 'java-mode-hook 'lsp-deferred) #+end_src * TODO Keybindings #+begin_src emacs-lisp ;; Keybinds (keymap-set cua--cua-keys-keymap "C-z" 'undo-tree-undo) (keymap-set cua--cua-keys-keymap "C-y" 'undo-tree-redo) (keymap-set global-map "C-" #'indent-rigidly-left-to-tab-stop) (keymap-set global-map "C-" #'indent-rigidly-right-to-tab-stop) (define-key key-translation-map (kbd "") 'event-apply-hyper-modifier ) (define-key key-translation-map (kbd "") 'event-apply-hyper-modifier ) (define-key key-translation-map (kbd "∇") 'event-apply-hyper-modifier ) (global-set-key (kbd "C-H-t") 'treemacs) (cua-mode 1) #+end_src * Test Just for testing some code #+begin_src emacs-lisp ;;; (global-set-key (kbd "C-∇") (kbd "C-H")) ;;; (global-set-key (kbd "H-∇") (lambda () (interactive) (insert-char #x2207))) ;;; (setq completion-styles '(orderless basic) ;;; completion-category-defaults nil ;;; completion-category-overrides '((file (styles partial-completion)))) #+end_src \ No newline at end of file diff --git a/extraFiles/config/emacs/etc/materus/emacs-config.el b/extraFiles/config/emacs/etc/materus/emacs-config.el index 6196371..bbfd009 100644 --- a/extraFiles/config/emacs/etc/materus/emacs-config.el +++ b/extraFiles/config/emacs/etc/materus/emacs-config.el @@ -82,7 +82,7 @@ right-click-context dracula-theme doom-themes - doom-modeline + doom-modeline orderless popper undo-tree @@ -106,7 +106,7 @@ toc-org eshell-vterm empv - volatile-highlights + volatile-highlights ) "A list of packages to ensure are installed at launch.") @@ -117,10 +117,10 @@ (defun materus/install-packages () (unless (materus/packages-installed-p) - (package-refresh-contents) - (dolist (p materus/packages) + (package-refresh-contents) + (dolist (p materus/packages) (when (not (package-installed-p p)) - (package-install p))))) + (package-install p))))) (materus/install-packages) (require 'recentf) @@ -174,10 +174,10 @@ ;; Theme (use-package dracula-theme :config (if (daemonp) - (add-hook 'after-make-frame-functions - (lambda (frame) - (with-selected-frame frame (load-theme 'dracula t)))) - (load-theme 'dracula t))) + (add-hook 'after-make-frame-functions + (lambda (frame) + (with-selected-frame frame (load-theme 'dracula t)))) + (load-theme 'dracula t))) (defun startup-screen-advice (orig-fun &rest args) (when (= (seq-count #'buffer-file-name (buffer-list)) 0) @@ -193,7 +193,7 @@ (dashboard-setup-startup-hook) (when (daemonp) (setq initial-buffer-choice (lambda () (get-buffer "*dashboard*"))) ; Show dashboard when emacs is running as daemon - ) + ) ) (use-package doom-modeline @@ -245,11 +245,11 @@ :after (consult marginalia) :config (setq completion-in-region-function - (lambda (&rest args) + (lambda (&rest args) (apply (if vertico-mode - #'consult-completion-in-region + #'consult-completion-in-region #'completion--in-region) - args))) + args))) (vertico-mode 1) (marginalia-mode 1))