From d8b0c19b534c2cb2afa193224b352c51fe155cdb Mon Sep 17 00:00:00 2001 From: Frantisek Bohacek Date: Fri, 29 Sep 2023 23:47:19 +0200 Subject: [PATCH] chore: remove not used stuff from emacs config, temporarily disable haskell Fixed an error in the config, where there wasn't closed block. The haskell integration doesn't work with newest packages, because of some changes in the flymake I presume. --- modules/editors/emacs/doom.d/config.el | 104 +------------------------ modules/editors/emacs/doom.d/init.el | 2 +- 2 files changed, 2 insertions(+), 104 deletions(-) diff --git a/modules/editors/emacs/doom.d/config.el b/modules/editors/emacs/doom.d/config.el index ce447e9..94699ab 100644 --- a/modules/editors/emacs/doom.d/config.el +++ b/modules/editors/emacs/doom.d/config.el @@ -105,53 +105,6 @@ (lsp-ui-sideline-show-hover t) (lsp-ui-doc-enable nil)) -(require 'dap-cpptools) - -(with-eval-after-load 'dap-cpptools -;; Add a template specific for debugging Rust programs. -;; It is used for new projects, where I can M-x dap-edit-debug-template -(dap-register-debug-template "Rust::CppTools Run Configuration" - (list :type "cppdbg" - :request "launch" - :name "Rust::Run" - :MIMode "gdb" - :miDebuggerPath "rust-gdb" - :environment [] - :program "${workspaceFolder}/target/debug/hello / replace with binary" - :cwd "${workspaceFolder}" - :console "external" - :dap-compilation "cargo build" - :dap-compilation-dir "${workspaceFolder}"))) - -(with-eval-after-load 'dap-mode - (setq dap-default-terminal-kind "integrated") ;; Make sure that terminal programs open a term for I/O in an Emacs buffer - (dap-auto-configure-mode +1)) - -;(add-to-list 'org-latex-classes -;'("ctuslides" "\\documentclass[presentation]{ctuslides}" -; ("\\section{%s}" . "\\section*{%s}") -; ("\\subsection{%s}" . "\\subsection*{%s}") -; ("\\subsubsection{%s}" . "\\subsubsection*{%s}"))) - -(setq lsp-julia-default-environment "~/.julia/environments/v1.8") - -;; latex - -(defun run-latexmk () - (interactive) - (let ((TeX-save-query nil) - (TeX-process-asynchronous nil) - (master-file (TeX-master-file))) - (TeX-save-document "") - (TeX-run-TeX "latexmk" - (TeX-command-expand "latexmk -pdf %O %S" 'TeX-master-file) - master-file)) - (if (plist-get TeX-error-report-switches (intern master-file)) - (TeX-next-error t) - (progn - (demolish-tex-help) - (minibuffer-message "latexmk: done.")))) - (after! centaur-tabs (centaur-tabs-group-by-projectile-project)) ;; imenu @@ -166,18 +119,6 @@ ;; vhdl (add-hook 'vhdl-mode-hook #'lsp!) -(add-hook 'vhdl-ts-mode-hook #'lsp!) - -(defvar-local my/flycheck-local-cache nil) - -(defun my/flycheck-checker-get (fn checker property) - (or (alist-get property (alist-get checker my/flycheck-local-cache)) - (funcall fn checker property))) - -(advice-add 'flycheck-checker-get :around 'my/flycheck-checker-get) - -(add-hook 'vhdl-ts-mode-hook #'vhdl-electric-mode) -(add-hook 'vhdl-ts-mode-hook #'vhdl-stutter-mode) (add-hook 'vhdl-mode-hook #'vhdl-electric-mode) (add-hook 'vhdl-mode-hook #'vhdl-stutter-mode) @@ -186,6 +127,7 @@ (setq vhdl-clock-name "clk_i") (setq vhdl-reset-kind 'sync) (setq vhdl-reset-name "rst_in") +) ;;(setq lsp-vhdl--params '(server-path "/home/ruther/Documents/git_cloned/rust_hdl/target/debug/vhdl_ls" server-args nil)) ;;(setq lsp-vhdl-server-path "/home/ruther/Documents/git_cloned/rust_hdl/target/debug/vhdl_ls")) (setq lsp-vhdl-server 'vhdl-ls) @@ -198,31 +140,6 @@ ;; (when (derived-mode-p 'vhdl-mode) ;; (setq my/flycheck-local-cache '((lsp . ((next-checkers . (vhdl-ghdl))))))))) -(use-package! vhdl-ext - :after vhdl-mode - :demand - :mode (("\\.vhd\\'" . vhdl-mode) - ("\\.vhdl\\'" . vhdl-mode)) - :init - (setq vhdl-ext-feature-list - '(font-lock - ;;eglot - lsp - ;;flycheck - beautify - navigation - template - compilation - imenu - which-func - hideshow - time-stamp - company-keywords - ports)) - :hook ((vhdl-mode . vhdl-ext-mode)) - :config - (vhdl-ext-mode-setup)) - (flycheck-define-checker vhdl-ghdl "A VHDL syntax checker using ghdl." :command ("ghdl" @@ -239,9 +156,6 @@ ": " (message) line-end)) :modes vhdl-mode) -;; org-mdoe -(setq rmh-elfeed-org-files (list "~/doc/notes/org/elfeed.org")) - ;; tree sitter and navigation ;;(setq treesit-language-source-alist ;; '((rust "https://github.com/tree-sitter/tree-sitter-rust") @@ -274,20 +188,6 @@ (setq lsp-ui-doc-max-height 30)) (add-hook 'lsp-mode-hook 'my-lsp-ui-setup) -(defun ~/magit-process-environment (env) - "Add GIT_DIR and GIT_WORK_TREE to ENV when in a special directory. -https://github.com/magit/magit/issues/460 (@cpitclaudel)." - (let ((default (file-name-as-directory (expand-file-name default-directory))) - (home (expand-file-name "~/"))) - (when (string= default home) - (let ((gitdir (expand-file-name "~/.dotFiles/"))) - (push (format "GIT_WORK_TREE=%s" home) env) - (push (format "GIT_DIR=%s" gitdir) env)))) - env) - -(advice-add 'magit-process-environment - :filter-return #'~/magit-process-environment) - (use-package org-roam :ensure t :custom @@ -299,5 +199,3 @@ https://github.com/magit/magit/issues/460 (@cpitclaudel)." (file+head "pages/${slug}.org" "#+title: ${title}\n") :unnarrowed t))) :config (org-roam-db-autosync-enable)) - -(add-hook 'python-mode-hook #'lsp) diff --git a/modules/editors/emacs/doom.d/init.el b/modules/editors/emacs/doom.d/init.el index 7ff44ab..10afe6a 100644 --- a/modules/editors/emacs/doom.d/init.el +++ b/modules/editors/emacs/doom.d/init.el @@ -137,7 +137,7 @@ ;;gdscript ; the language you waited for ;;(go +lsp) ; the hipster dialect ;;(graphql +lsp) ; Give queries a REST - (haskell +lsp) ; a language that's lazier than I am + ;;(haskell +lsp) ; a language that's lazier than I am ;;hy ; readability of scheme w/ speed of python ;;idris ; a language you can depend on json ; At least it ain't XML -- 2.48.1