mirror of
https://codeberg.org/andyscott/dotfiles.git
synced 2024-12-22 09:53:10 -05:00
Template for hidpi, disable tramp, finally fix indenting
This commit is contained in:
parent
7ea4db0b6b
commit
27fe8763da
1 changed files with 48 additions and 38 deletions
|
@ -142,9 +142,9 @@
|
||||||
(savehist-mode))
|
(savehist-mode))
|
||||||
|
|
||||||
;; SSH
|
;; SSH
|
||||||
(use-package tramp
|
;; (use-package tramp
|
||||||
:config
|
;; :config
|
||||||
(setq tramp-default-method "ssh"))
|
;; (setq tramp-default-method "ssh"))
|
||||||
|
|
||||||
;; Completion with vertico/consult
|
;; Completion with vertico/consult
|
||||||
(use-package vertico
|
(use-package vertico
|
||||||
|
@ -422,10 +422,16 @@
|
||||||
;:hook
|
;:hook
|
||||||
;(org-mode . mixed-pitch-mode)
|
;(org-mode . mixed-pitch-mode)
|
||||||
:config
|
: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 'default nil :font "Hack" :height 90)
|
||||||
(set-face-attribute 'fixed-pitch 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))
|
(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
|
;; Icons
|
||||||
(use-package all-the-icons)
|
(use-package all-the-icons)
|
||||||
|
@ -528,10 +534,10 @@
|
||||||
;; (lsp-rust-analyzer-display-reborrow-hints nil)
|
;; (lsp-rust-analyzer-display-reborrow-hints nil)
|
||||||
:config
|
:config
|
||||||
(setq lsp-prefer-flymake nil)) ; prefer lsp-ui (flycheck) to flymake
|
(setq lsp-prefer-flymake nil)) ; prefer lsp-ui (flycheck) to flymake
|
||||||
; (setq lsp-disabled-clients '(clangd))) ; prefer ccls to clangd
|
; (setq lsp-disabled-clients '(clangd))) ; prefer ccls to clangd
|
||||||
; :bind
|
; :bind
|
||||||
; (:map lsp-mode-map
|
; (:map lsp-mode-map
|
||||||
; ("TAB" . completion-at-point)))
|
; ("TAB" . completion-at-point)))
|
||||||
|
|
||||||
(use-package lsp-ui
|
(use-package lsp-ui
|
||||||
:requires lsp-mode flycheck
|
:requires lsp-mode flycheck
|
||||||
|
@ -692,8 +698,8 @@
|
||||||
:bind ("C-c C-n" . jsdoc))
|
:bind ("C-c C-n" . jsdoc))
|
||||||
|
|
||||||
;; LaTeX
|
;; LaTeX
|
||||||
;(use-package lsp-latex)
|
;(use-package lsp-latex)
|
||||||
;'(setq lsp-tex-server 'digestif)
|
;'(setq lsp-tex-server 'digestif)
|
||||||
|
|
||||||
;; OpenGL / GLSL
|
;; OpenGL / GLSL
|
||||||
(use-package glsl-mode)
|
(use-package glsl-mode)
|
||||||
|
@ -742,13 +748,13 @@
|
||||||
("C-c C-c e" . lsp-rust-analyzer-expand-macro)
|
("C-c C-c e" . lsp-rust-analyzer-expand-macro)
|
||||||
("C-c C-c d" . dap-hydra)
|
("C-c C-c d" . dap-hydra)
|
||||||
("C-c C-c h" . lsp-ui-doc-glance)))
|
("C-c C-c h" . lsp-ui-doc-glance)))
|
||||||
;; :config
|
;; :config
|
||||||
;; uncomment for less flashiness
|
;; uncomment for less flashiness
|
||||||
;; (setq lsp-eldoc-hook nil)
|
;; (setq lsp-eldoc-hook nil)
|
||||||
;; (setq lsp-enable-symbol-highlighting nil)
|
;; (setq lsp-enable-symbol-highlighting nil)
|
||||||
;; (setq lsp-signature-auto-activate 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))
|
;; (add-hook 'rustic-mode-hook 'rk/rustic-mode-hook))
|
||||||
|
|
||||||
;; (defun rk/rustic-mode-hook ()
|
;; (defun rk/rustic-mode-hook ()
|
||||||
|
@ -771,6 +777,10 @@
|
||||||
(make-lsp-client
|
(make-lsp-client
|
||||||
:new-connection (lsp-stdio-connection "/usr/bin/zls")
|
:new-connection (lsp-stdio-connection "/usr/bin/zls")
|
||||||
:major-modes '(zig-mode)
|
:major-modes '(zig-mode)
|
||||||
:server-id 'zls)))
|
:server-id 'zls))
|
||||||
|
:hook
|
||||||
|
(zig-mode . (lambda ()
|
||||||
|
(setq-local fill-column 100)
|
||||||
|
(setq-local tab-width 4))))
|
||||||
|
|
||||||
;;; End init.el
|
;;; End init.el
|
Loading…
Reference in a new issue