From 27fe8763dab65cf85a7eadcdf2b034a3055bc580 Mon Sep 17 00:00:00 2001 From: Andrew Scott Date: Wed, 21 Jun 2023 23:29:53 -0400 Subject: [PATCH] Template for hidpi, disable tramp, finally fix indenting --- dot_config/emacs/{init.el => init.el.tmpl} | 86 ++++++++++++---------- 1 file changed, 48 insertions(+), 38 deletions(-) rename dot_config/emacs/{init.el => init.el.tmpl} (91%) diff --git a/dot_config/emacs/init.el b/dot_config/emacs/init.el.tmpl similarity index 91% rename from dot_config/emacs/init.el rename to dot_config/emacs/init.el.tmpl index 06055a1..da2b55f 100644 --- a/dot_config/emacs/init.el +++ b/dot_config/emacs/init.el.tmpl @@ -58,7 +58,7 @@ ;; Store autosaves in $XDG_CACHE_HOME (setq auto-save-file-name-transforms - `((".*" "~/.cache/emacs/autosave/" t))) + `((".*" "~/.cache/emacs/autosave/" t))) ;; Default encoding (set-default-coding-systems 'utf-8) @@ -142,9 +142,9 @@ (savehist-mode)) ;; SSH -(use-package tramp - :config - (setq tramp-default-method "ssh")) +;; (use-package tramp +;; :config +;; (setq tramp-default-method "ssh")) ;; Completion with vertico/consult (use-package vertico @@ -399,13 +399,13 @@ ;; Modeline (use-package minions :hook (doom-modeline-mode . minions-mode) - (simple-modeline-mode . minions-mode)) + (simple-modeline-mode . minions-mode)) (use-package doom-modeline :init (doom-modeline-mode) :custom (doom-modeline-height 32) - ;(doom-modeline-bar-width .75) + ;(doom-modeline-bar-width .75) (doom-modeline-window-width-limit fill-column) (doom-modeline-lsp t) (doom-modeline-minor-modes t) @@ -419,13 +419,19 @@ ;; Font (use-package mixed-pitch - ;:hook - ;(org-mode . mixed-pitch-mode) + ;:hook + ;(org-mode . mixed-pitch-mode) :config +{{- if eq .chezmoi.hostname "helix"}} + (set-face-attribute 'default nil :font "Hack" :height 180) + (set-face-attribute 'fixed-pitch nil :font "Hack" :height 180) + (set-face-attribute 'variable-pitch nil :font "DejaVu Sans" :height 200)) +{{- else }} (set-face-attribute 'default nil :font "Hack" :height 90) (set-face-attribute 'fixed-pitch nil :font "Hack" :height 90) (set-face-attribute 'variable-pitch nil :font "DejaVu Sans" :height 100)) -;(add-hook 'mixed-pitch-mode-hook #'solaire-mode-reset) +{{- end }} + ;(add-hook 'mixed-pitch-mode-hook #'solaire-mode-reset) ;; Icons (use-package all-the-icons) @@ -528,10 +534,10 @@ ;; (lsp-rust-analyzer-display-reborrow-hints nil) :config (setq lsp-prefer-flymake nil)) ; prefer lsp-ui (flycheck) to flymake -; (setq lsp-disabled-clients '(clangd))) ; prefer ccls to clangd -; :bind -; (:map lsp-mode-map -; ("TAB" . completion-at-point))) + ; (setq lsp-disabled-clients '(clangd))) ; prefer ccls to clangd + ; :bind + ; (:map lsp-mode-map + ; ("TAB" . completion-at-point))) (use-package lsp-ui :requires lsp-mode flycheck @@ -562,7 +568,7 @@ (eval-when-compile (require 'cl-lib)) (require 'dap-python) - ;(require 'dap-node) + ;(require 'dap-node) (require 'dap-lldb) (require 'dap-gdb-lldb) (dap-gdb-lldb-setup) @@ -571,14 +577,14 @@ (list :type "lldb" :request "launch" :name "LLDB::Run" - :gdbpath "rust-lldb")) + :gdbpath "rust-lldb")) :bind (:map dap-mode-map - ("" . dap-debug) - ("" . dap-next) - ("" . dap-step-in) - ("S-" . dap-disconnect) - ("C-S-" . dap-debug-restart))) + ("" . dap-debug) + ("" . dap-next) + ("" . dap-step-in) + ("S-" . dap-disconnect) + ("C-S-" . dap-debug-restart))) (use-package realgud) @@ -635,7 +641,7 @@ (use-package js2-mode :config (add-to-list 'interpreter-mode-alist '("#!/usr/bin/env node" . js2-mode)) - ;(setq js2-strict-missing-semi-warning t) + ;(setq js2-strict-missing-semi-warning t) (setq js2-mode-show-strict-warnings t) :hook (js-mode . js2-minor-mode)) @@ -643,7 +649,7 @@ :config (setq typescript-indent-level 2) :mode ("\\.ts\\'" . typescript-mode) - ("\\.tsx\\'" . typescript-mode)) + ("\\.tsx\\'" . typescript-mode)) ;; (use-package restclient ;; :init @@ -692,8 +698,8 @@ :bind ("C-c C-n" . jsdoc)) ;; LaTeX -;(use-package lsp-latex) -;'(setq lsp-tex-server 'digestif) + ;(use-package lsp-latex) + ;'(setq lsp-tex-server 'digestif) ;; OpenGL / GLSL (use-package glsl-mode) @@ -706,8 +712,8 @@ (use-package lsp-pyright :hook (python-mode . (lambda () - (require 'lsp-pyright) - (lsp)))) ; or lsp-deferred + (require 'lsp-pyright) + (lsp)))) ; or lsp-deferred (use-package numpydoc :after python @@ -721,11 +727,11 @@ (setq conda-anaconda-home (expand-file-name "/opt/miniconda3")) (setq conda-env-home-directory (expand-file-name "~/.conda/envs")) (conda-env-initialize-interactive-shells) - ;(conda-env-autoactivate-mode) + ;(conda-env-autoactivate-mode) :hook ('find-file-hook . (lambda () (when (bound-and-true-p conda-project-env-path) - (conda-env-activate-for-buffer))))) + (conda-env-activate-for-buffer))))) ;; Rust (use-package rustic @@ -742,13 +748,13 @@ ("C-c C-c e" . lsp-rust-analyzer-expand-macro) ("C-c C-c d" . dap-hydra) ("C-c C-c h" . lsp-ui-doc-glance))) - ;; :config - ;; uncomment for less flashiness - ;; (setq lsp-eldoc-hook nil) - ;; (setq lsp-enable-symbol-highlighting nil) - ;; (setq lsp-signature-auto-activate nil) +;; :config +;; uncomment for less flashiness +;; (setq lsp-eldoc-hook nil) +;; (setq lsp-enable-symbol-highlighting nil) +;; (setq lsp-signature-auto-activate nil) - ;; comment to disable rustfmt on save +;; comment to disable rustfmt on save ;; (add-hook 'rustic-mode-hook 'rk/rustic-mode-hook)) ;; (defun rk/rustic-mode-hook () @@ -768,9 +774,13 @@ :config (add-to-list 'lsp-language-id-configuration '(zig-mode . "zig")) (lsp-register-client - (make-lsp-client - :new-connection (lsp-stdio-connection "/usr/bin/zls") - :major-modes '(zig-mode) - :server-id 'zls))) + (make-lsp-client + :new-connection (lsp-stdio-connection "/usr/bin/zls") + :major-modes '(zig-mode) + :server-id 'zls)) + :hook + (zig-mode . (lambda () + (setq-local fill-column 100) + (setq-local tab-width 4)))) ;;; End init.el