Update checking for binarys from msys64 (windows)

This commit is contained in:
Marcus Kammer 2022-08-12 12:59:23 +02:00
parent 15fb8ff9cf
commit ed90e81274
5 changed files with 21 additions and 11 deletions

View file

@ -9,9 +9,11 @@
;; (add-to-list 'exec-path "C:/msys64/usr/bin") ;; (add-to-list 'exec-path "C:/msys64/usr/bin")
;; (setenv "PATH" (concat "C:\\msys64\\mingw64\\bin;" (getenv "PATH"))) ;; (setenv "PATH" (concat "C:\\msys64\\mingw64\\bin;" (getenv "PATH")))
(setq (when (directory-name-p "c:/msys64/")
ispell-program-name "c:/msys64/mingw64/bin/aspell.exe" (setq ispell-program-name "c:/msys64/mingw64/bin/aspell.exe"
custom-file "~/.emacs.d/bundle/custom_win32.el" mpv-executable "c:/msys64/mingw64/bin/mpv.exe"))
(setq custom-file "~/.emacs.d/bundle/custom_win32.el"
org-babel-python-command "python") org-babel-python-command "python")
(use-package powershell) (use-package powershell)

View file

@ -36,7 +36,8 @@
(setq nov-text-width 82 (setq nov-text-width 82
nov-variable-pitch t) nov-variable-pitch t)
(when (eq system-type 'windows-nt) (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 (use-package eglot
:defer t :defer t
@ -65,7 +66,10 @@
:defer t :defer t
:after geiser :after geiser
:config :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 (use-package cc-mode
;; https://www.gnu.org/prep/standards/html_node/Writing-C.html ;; https://www.gnu.org/prep/standards/html_node/Writing-C.html
@ -188,7 +192,8 @@
:defer t :defer t
:config :config
(when (eq system-type 'windows-nt) (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 (use-package magit
:bind ("C-x g" . magit-status) :bind ("C-x g" . magit-status)

View file

@ -7,4 +7,7 @@
;; Break lines automatically while typing ;; Break lines automatically while typing
(add-hook 'subed-mode-hook 'turn-on-auto-fill) (add-hook 'subed-mode-hook 'turn-on-auto-fill)
;; Break lines at 40 characters ;; 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"))))

View file

@ -32,7 +32,6 @@
("gitlab.com" "gitlab.com/api/v4" "gitlab.com" forge-gitlab-repository) ("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))) ("code.siemens.com" "code.siemens.com/api/v4" "code.siemens.com" forge-gitlab-repository)))
'(frame-background-mode 'dark) '(frame-background-mode 'dark)
'(geiser-racket-binary "C:/Program Files/Racket/Racket.exe")
'(hl-todo-keyword-faces '(hl-todo-keyword-faces
'(("TODO" . "#dc752f") '(("TODO" . "#dc752f")
("NEXT" . "#dc752f") ("NEXT" . "#dc752f")
@ -67,7 +66,7 @@
'(org-roam-directory "d:/UserData/marcus.kammer/OneDrive - Siemens AG/org-roam/") '(org-roam-directory "d:/UserData/marcus.kammer/OneDrive - Siemens AG/org-roam/")
'(org-web-tools-pandoc-sleep-time 1.0) '(org-web-tools-pandoc-sleep-time 1.0)
'(package-selected-packages '(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-default-exec-mode 'jar)
'(plantuml-jar-path "~/AppData/Local/Programs/plantuml/plantuml.jar") '(plantuml-jar-path "~/AppData/Local/Programs/plantuml/plantuml.jar")
'(python-indent-guess-indent-offset nil) '(python-indent-guess-indent-offset nil)
@ -77,7 +76,6 @@
'(ring-bell-function 'ignore) '(ring-bell-function 'ignore)
'(scroll-bar-mode nil) '(scroll-bar-mode nil)
'(scroll-step 5) '(scroll-step 5)
'(sql-sqlite-program "c:/msys64/mingw64/bin/sqlite3.exe" t)
'(tab-bar-mode nil) '(tab-bar-mode nil)
'(tetris-x-colors '(tetris-x-colors
[[229 192 123] [[229 192 123]
@ -92,4 +90,5 @@
;; If you edit it by hand, you could mess it up, so be careful. ;; If you edit it by hand, you could mess it up, so be careful.
;; Your init file should contain only one such instance. ;; Your init file should contain only one such instance.
;; If there is more than one, they won't work right. ;; 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")))))

View file

@ -5,6 +5,7 @@
(load "bundle--server") (load "bundle--server")
(load "bundle--package") (load "bundle--package")
(load "bundle--org") (load "bundle--org")
(load "bundle--qda")
(load "bundle--customfile") (load "bundle--customfile")
(load "bundle--latex") (load "bundle--latex")
(load "bundle--mk") (load "bundle--mk")