From 5a1ee56a85c7a8854770e6bccde694a1fbb01e17 Mon Sep 17 00:00:00 2001 From: Daniel Weschke Date: Mon, 16 Jun 2025 15:16:28 +0200 Subject: [PATCH] update config --- init | 3 +-- scripts/test/test.org | 37 ++++++++++++++++++++++++++++++++++ settings/dot-settings.el | 20 ------------------ settings/general-settings.el | 2 ++ settings/plot-settings.el | 22 ++++++++++++++++---- settings/pre-settings.el | 3 ++- settings/shell-settings.el | 2 +- settings/web-settings.el | 2 +- settings/which-key-settings.el | 4 +++- 9 files changed, 65 insertions(+), 30 deletions(-) create mode 100644 scripts/test/test.org delete mode 100644 settings/dot-settings.el diff --git a/init b/init index dd2c5284..aef873a7 100644 --- a/init +++ b/init @@ -47,14 +47,13 @@ (require 'mail-settings) ;; languages / filetypes -(require 'plot-settings) ;; gnuplot-mode plantuml-mode (dash) +(require 'plot-settings) ;; graphviz-dot gnuplot-mode plantuml-mode (dash) (require 'ess-settings) ;; requires ess ess-R-data-view ctable popup (require 'ledger-settings) ;; ledger-mode company-ledger (require 'python-settings) ;; requires anaconda-mode pythonic company-anaconda (require 'shell-settings) ;; sh-script powershell (require 'web-settings) ;; css js2 php web-mode company-web (require 'filetype-settings) ;; markdown sql systemd -(require 'dot-settings) ;; graphviz dot (require 'polymode-settings) ;; polymode (require 'post-settings) diff --git a/scripts/test/test.org b/scripts/test/test.org new file mode 100644 index 00000000..903811ac --- /dev/null +++ b/scripts/test/test.org @@ -0,0 +1,37 @@ + + +* graphviz dot +#+begin_src dot +digraph G { + main -> parse -> execute; + main -> init; + main -> cleanup; + execute -> make_string; + execute -> printf + init -> make_string; + main -> printf; + execute -> compare; +} +#+end_src + +* gnuplot +#+begin_src gnuplot :results silent +reset + +set title "Putting it All Together" + +set xlabel "X" +set xrange [-8:8] +set xtics -8,2,8 + + +set ylabel "Y" +set yrange [-20:70] +set ytics -20,10,70 + +f(x) = x**2 +g(x) = x**3 +h(x) = 10*sqrt(abs(x)) + +plot f(x) w lp lw 1, g(x) w p lw 2, h(x) w l lw 3 +#+end_src diff --git a/settings/dot-settings.el b/settings/dot-settings.el deleted file mode 100644 index 194614af..00000000 --- a/settings/dot-settings.el +++ /dev/null @@ -1,20 +0,0 @@ -;;; dot-settings.el --- dot settings -*- lexical-binding: t -*- - -;;; Commentary: -;; https://orgmode.org/worg//org-contrib/babel/languages/ob-doc-dot.html - -;;; Code: -(use-package graphviz-dot-mode - :after (org) - :commands graphviz-dot-mode - :mode ("\\.gv\\'" "\\.dot\\'") - :init - (setq org-src-lang-modes - (add-to-list 'org-src-lang-modes '("dot" . graphviz-dot))) - :config - (setq graphviz-dot-indent-width 2) - (setq graphviz-dot-preview-extension "svg") - (setq graphviz-dot-view-command "open %s")) - -(provide 'dot-settings) -;;; dot-settings.el ends here diff --git a/settings/general-settings.el b/settings/general-settings.el index 9d77c831..3b4655e2 100644 --- a/settings/general-settings.el +++ b/settings/general-settings.el @@ -724,6 +724,8 @@ Version 2016-07-13" :style toggle :selected focus-mode :help "focus-mode"] ["HideShow" hs-minor-mode :style toggle :selected hs-minor-mode :help "hs-minor-mode"] + ["Highlight Line" hl-line-mode + :style toggle :selected hl-line-mode :help "hl-lien-mode"] ["Horizontal Scroll Bar" horizontal-scroll-bar-mode :style toggle :selected horizontal-scroll-bar-mode :help "horizontal-scroll-bar-mode"] ;; ["Ido" ido-mode diff --git a/settings/plot-settings.el b/settings/plot-settings.el index 4babb06e..34337ce1 100644 --- a/settings/plot-settings.el +++ b/settings/plot-settings.el @@ -8,7 +8,20 @@ ;; plantuml-mode https://melpa.org/#/plantuml-mode https://github.com/skuro/plantuml-mode ;; dash +;; https://orgmode.org/worg//org-contrib/babel/languages/ob-doc-dot.html + ;;; Code: +(use-package graphviz-dot-mode + :commands graphviz-dot-mode + :mode ("\\.gv\\'" "\\.dot\\'") + :init + (with-eval-after-load 'org-src + (add-to-list 'org-src-lang-modes '("dot" . graphviz-dot))) + :config + (setq graphviz-dot-indent-width 2) + (setq graphviz-dot-preview-extension "svg") + (setq graphviz-dot-view-command "open %s")) + (use-package gnuplot :commands gnuplot-mode :mode "\\.gp\\'") @@ -18,13 +31,14 @@ :commands gnuplot-context-sensitive-mode) (use-package plantuml-mode - :commands (plantuml-mode org-mode) + :commands (plantuml-mode) + :init + (with-eval-after-load 'org-src + (add-to-list 'org-src-lang-modes '("plantuml" . plantuml))) :config ;; arch linux aur package path (setq plantuml-jar-path "/usr/share/java/plantuml/plantuml.jar") - (setq org-plantuml-jar-path "/usr/share/java/plantuml/plantuml.jar") - (with-eval-after-load 'org-src - (setq org-src-lang-modes (add-to-list 'org-src-lang-modes '("plantuml" . plantuml))))) + (setq org-plantuml-jar-path "/usr/share/java/plantuml/plantuml.jar")) (provide 'plot-settings) ;;; plot-settings.el ends here diff --git a/settings/pre-settings.el b/settings/pre-settings.el index 319ac6ea..7dc58766 100644 --- a/settings/pre-settings.el +++ b/settings/pre-settings.el @@ -16,7 +16,8 @@ (require 'use-package)) ;; requires bind-key (setq use-package-verbose t) (setq use-package-compute-statistics t) -(use-package delight) ;; used for use-package :delight, see delight-delighted-modes +(use-package delight + :defer t) ;; used for use-package :delight, see delight-delighted-modes, defer b/c of awesome-tray ;; ;; functions diff --git a/settings/shell-settings.el b/settings/shell-settings.el index 404ee315..6ae0f334 100644 --- a/settings/shell-settings.el +++ b/settings/shell-settings.el @@ -6,7 +6,7 @@ ("" . comint-previous-input) ("" . comint-next-input))) -(use-package sh-script +(use-package sh-script ;; built-in :defer t :config (setq sh-basic-offset 2)) diff --git a/settings/web-settings.el b/settings/web-settings.el index 322454d8..59dcfd23 100644 --- a/settings/web-settings.el +++ b/settings/web-settings.el @@ -13,7 +13,7 @@ ;;; Code: (use-package css-mode - :defer t + :commands css-mode :config (setq css-indent-offset 2)) diff --git a/settings/which-key-settings.el b/settings/which-key-settings.el index 76b43598..d2622717 100644 --- a/settings/which-key-settings.el +++ b/settings/which-key-settings.el @@ -11,12 +11,14 @@ (use-package which-key :delight (which-key-mode "K") ;; \u24C0 K :init - (setq which-key-idle-delay 1.0) + (setq which-key-idle-delay 0.75) (setq which-key-idle-secondary-delay 0.05) ;;(setq which-key-unicode-correction 3) (when (daemonp) ;; problem if using unicodes and emacsclient, the last line of which-key side-frame is cropped. (setq which-key-dont-use-unicode t)) + ;; :hook (after-init . which-key-mode) + ;; :hook (before-init . which-key-mode) :config (which-key-mode) (setq which-key-allow-multiple-replacements t)