diff --git a/bundle/bundle--customfile.el b/bundle/bundle--customfile.el index 639a8943..31452118 100644 --- a/bundle/bundle--customfile.el +++ b/bundle/bundle--customfile.el @@ -9,9 +9,11 @@ ;; (add-to-list 'exec-path "C:/msys64/usr/bin") ;; (setenv "PATH" (concat "C:\\msys64\\mingw64\\bin;" (getenv "PATH"))) - (setq - ispell-program-name "c:/msys64/mingw64/bin/aspell.exe" - custom-file "~/.emacs.d/bundle/custom_win32.el" + (when (directory-name-p "c:/msys64/") + (setq ispell-program-name "c:/msys64/mingw64/bin/aspell.exe" + mpv-executable "c:/msys64/mingw64/bin/mpv.exe")) + + (setq custom-file "~/.emacs.d/bundle/custom_win32.el" org-babel-python-command "python") (use-package powershell) diff --git a/bundle/bundle--package.el b/bundle/bundle--package.el index 73de23e2..c633b473 100644 --- a/bundle/bundle--package.el +++ b/bundle/bundle--package.el @@ -36,7 +36,8 @@ (setq nov-text-width 82 nov-variable-pitch t) (when (eq system-type 'windows-nt) - (setq nov-unzip-program "c:/msys64/usr/bin/unzip.exe"))) + (when (directory-name-p "c:/msys64/") + (setq nov-unzip-program "c:/msys64/usr/bin/unzip.exe")))) (use-package eglot :defer t @@ -65,7 +66,10 @@ :defer t :after geiser :config - (setq geiser-guile-binary "guile")) + (setq geiser-guile-binary "guile") + (when (eq system-type 'windows-nt) + (when (directory-name-p "c:/msys64/") + (setq geiser-guile-binary "c:/msys64/mingw64/bin/guile.exe")))) (use-package cc-mode ;; https://www.gnu.org/prep/standards/html_node/Writing-C.html @@ -188,7 +192,8 @@ :defer t :config (when (eq system-type 'windows-nt) - (setq sql-sqlite-program "c:/msys64/mingw64/bin/sqlite3.exe"))) + (when (directory-name-p "c:/msys64/") + (setq sql-sqlite-program "c:/msys64/mingw64/bin/sqlite3.exe")))) (use-package magit :bind ("C-x g" . magit-status) diff --git a/bundle/bundle--qda.el b/bundle/bundle--qda.el index c4c10ae1..8beb2905 100644 --- a/bundle/bundle--qda.el +++ b/bundle/bundle--qda.el @@ -7,4 +7,7 @@ ;; Break lines automatically while typing (add-hook 'subed-mode-hook 'turn-on-auto-fill) ;; Break lines at 40 characters - (add-hook 'subed-mode-hook (lambda () (setq-local fill-column 40)))) + (add-hook 'subed-mode-hook (lambda () (setq-local fill-column 40))) + (when (eq system-type 'windows-nt) + (when (directory-name-p "c:/msys64/") + (setq subed-mpv-executable "c:/msys64/mingw64/bin/mpv.exe")))) diff --git a/bundle/custom_win32_EVG02667NB.el b/bundle/custom_win32_EVG02667NB.el index 26b1ddae..21ac4be3 100644 --- a/bundle/custom_win32_EVG02667NB.el +++ b/bundle/custom_win32_EVG02667NB.el @@ -32,7 +32,6 @@ ("gitlab.com" "gitlab.com/api/v4" "gitlab.com" forge-gitlab-repository) ("code.siemens.com" "code.siemens.com/api/v4" "code.siemens.com" forge-gitlab-repository))) '(frame-background-mode 'dark) - '(geiser-racket-binary "C:/Program Files/Racket/Racket.exe") '(hl-todo-keyword-faces '(("TODO" . "#dc752f") ("NEXT" . "#dc752f") @@ -67,7 +66,7 @@ '(org-roam-directory "d:/UserData/marcus.kammer/OneDrive - Siemens AG/org-roam/") '(org-web-tools-pandoc-sleep-time 1.0) '(package-selected-packages - '(powershell ox-reveal org-web-tools org-tree-slide org-roam elfeed erc-image magit go-translate simple-httpd slime racket-mode web-mode go-mode geiser-guile geiser-racket geiser eglot nov shrface vertico smartparens emojify ace-window olivetti rainbow-delimiters helpful doom-modeline doom-themes all-the-icons-dired all-the-icons use-package)) + '(mpv subed ob-http ob-go powershell ox-reveal org-web-tools org-tree-slide org-roam elfeed erc-image magit go-translate simple-httpd slime racket-mode web-mode go-mode geiser-guile geiser-racket geiser eglot nov shrface vertico smartparens emojify ace-window olivetti rainbow-delimiters helpful doom-modeline doom-themes all-the-icons-dired all-the-icons use-package)) '(plantuml-default-exec-mode 'jar) '(plantuml-jar-path "~/AppData/Local/Programs/plantuml/plantuml.jar") '(python-indent-guess-indent-offset nil) @@ -77,7 +76,6 @@ '(ring-bell-function 'ignore) '(scroll-bar-mode nil) '(scroll-step 5) - '(sql-sqlite-program "c:/msys64/mingw64/bin/sqlite3.exe" t) '(tab-bar-mode nil) '(tetris-x-colors [[229 192 123] @@ -92,4 +90,5 @@ ;; If you edit it by hand, you could mess it up, so be careful. ;; Your init file should contain only one such instance. ;; If there is more than one, they won't work right. - '(variable-pitch ((t (:height 1.2 :family "Roboto Condensed"))))) + '(font-lock-keyword-face ((t (:foreground "#81A1C1" :slant italic)))) + '(variable-pitch ((t (:height 1.3 :family "Roboto Condensed"))))) diff --git a/init.el b/init.el index 0b97bbbe..91d9a0c3 100755 --- a/init.el +++ b/init.el @@ -5,6 +5,7 @@ (load "bundle--server") (load "bundle--package") (load "bundle--org") +(load "bundle--qda") (load "bundle--customfile") (load "bundle--latex") (load "bundle--mk")