diff --git a/dot_config/X11/xinitrc.tmpl b/dot_config/X11/xinitrc.tmpl index 0d64588..d029e66 100644 --- a/dot_config/X11/xinitrc.tmpl +++ b/dot_config/X11/xinitrc.tmpl @@ -34,8 +34,8 @@ if [ -d /etc/X11/xinit/xinitrc.d ] ; then fi {{ if eq .chezmoi.hostname "helix" -}} -xinput set-prop 13 285 1 & -xinput set-prop 13 305 1 & +xinput set-prop 11 285 1 & +xinput set-prop 11 305 1 & {{- else if eq .chezmoi.hostname "triangulum" }} xinput set-prop 10 306 1 & {{- else if eq .chezmoi.hostname "hydrus" }} diff --git a/dot_config/emacs/init.el b/dot_config/emacs/init.el index b927f27..618dae5 100644 --- a/dot_config/emacs/init.el +++ b/dot_config/emacs/init.el @@ -756,14 +756,14 @@ ;; Zig -;(use-package zig-mode -; :custom (zig-format-on-save nil) -; :config -; (add-to-list 'lsp-language-id-configuration '(zig-mode . "zig")) -; (make-lsp-client -; :new-connection (lsp-stdio-connection "/usr/bin/zls") -; :major-modes '(zig-mode) -; :server-id 'zls)) +(use-package zig-mode + :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))) ;; Templating (use-package yasnippet @@ -779,7 +779,5 @@ (tex-mode . yas-minor-mode) (latex-mode . yas-minor-mode)) - - (use-package yasnippet-snippets) ;;; End init.el