marcuskammer/emacs.d
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'main' of git.sr.ht:~marcuskammer/emacs.d

Browse source
This commit is contained in:
Marcus Kammer 2023-05-09 16:22:11 +02:00
commit 26ea83339c
3 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bundle/bundle--org.el
View file

@ -62,7 +62,7 @@
time-stamp-format "%Y-%02m-%02d %02H:%02M") time-stamp-format "%Y-%02m-%02d %02H:%02M")
(add-hook 'before-save-hook 'time-stamp nil) (add-hook 'before-save-hook 'time-stamp nil)
(when (eq system-type 'windows-nt) (when (eq system-type 'windows-nt)
(setq org-babel-sqlite3-command "c:/msys64/mingw64/bin/sqlite3.exe")) (setq org-babel-sqlite3-command "c:/msys64/ucrt64/bin/sqlite3.exe"))
(org-babel-do-load-languages (org-babel-do-load-languages
'org-babel-load-languages 'org-babel-load-languages
'((emacs-lisp . t) (lisp . t) (gnuplot . t) (python . t) (sqlite . t) (shell . t) (plantuml . t) (C . t))) '((emacs-lisp . t) (lisp . t) (gnuplot . t) (python . t) (sqlite . t) (shell . t) (plantuml . t) (C . t)))

17
bundle/bundle--package.el
View file

@ -55,6 +55,14 @@
:config :config
(add-to-list 'eglot-server-programs '((c++-mode c-mode) "ccls"))) (add-to-list 'eglot-server-programs '((c++-mode c-mode) "ccls")))
(use-package sql
:ensure nil
:defer t
:config
(when (eq system-type 'windows-nt)
(setq sql-sqlite-program "c:/msys64/ucrt64/bin/sqlite3.exe")
(setq sql-mariadb-options '("-C" "-t" "-f" "-n"))))
(use-package lisp-mode (use-package lisp-mode
:ensure nil :ensure nil
:init :init
@ -438,13 +446,6 @@
;; :engines (list (gts-google-engine) (gts-google-rpc-engine)) ;; :engines (list (gts-google-engine) (gts-google-rpc-engine))
;; :render (gts-buffer-render)))) ;; :render (gts-buffer-render))))
(use-package sql
:ensure nil
:defer t
:config
(when (eq system-type 'windows-nt)
(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)
:config :config
@ -516,6 +517,8 @@
;; On windows: Copy files to c:/msys64/mingw64/share/hunspell/ ;; On windows: Copy files to c:/msys64/mingw64/share/hunspell/
;; hunspell -D Show detected path of the loaded dictionary, ;; hunspell -D Show detected path of the loaded dictionary,
;; and list of the search path and the available dictionaries. ;; and list of the search path and the available dictionaries.
(when (eq system-type 'windows-nt)
(setq ispell-program-name "c:/msys64/ucrt64/bin/hunspell.exe"))
(setq ispell-dictionary "german,english") (setq ispell-dictionary "german,english")
(setq ispell-local-dictionary-alist (setq ispell-local-dictionary-alist
'(("german" "[[:alpha:]]" "[^[:alpha:]]" "[']" t ("-d" "de_DE_frami,de_AT_frami,de_CH_frami") nil utf-8) '(("german" "[[:alpha:]]" "[^[:alpha:]]" "[']" t ("-d" "de_DE_frami,de_AT_frami,de_CH_frami") nil utf-8)

5
bundle/custom_win32.el
View file

@ -12,18 +12,15 @@
'(epg-gpgconf-program "c:/Program Files (x86)/GnuPG/bin/gpgconf.exe") '(epg-gpgconf-program "c:/Program Files (x86)/GnuPG/bin/gpgconf.exe")
'(initial-buffer-choice "d:/visua/Documents/org/agenda/tasks.org") '(initial-buffer-choice "d:/visua/Documents/org/agenda/tasks.org")
'(initial-frame-alist '((fullscreen . maximized))) '(initial-frame-alist '((fullscreen . maximized)))
'(ispell-program-name "c:/msys64/ucrt64/bin/hunspell.exe")
'(nov-unzip-program "c:/msys64/usr/bin/unzip.exe")
'(org-agenda-files '("d:/visua/Documents/org/agenda")) '(org-agenda-files '("d:/visua/Documents/org/agenda"))
'(org-directory "D:/visua/Documents/org") '(org-directory "D:/visua/Documents/org")
'(org-roam-db-location "~/org-roam.db") '(org-roam-db-location "~/org-roam.db")
'(org-roam-directory "d:/visua/Documents/org/") '(org-roam-directory "d:/visua/Documents/org/")
'(package-selected-packages '(package-selected-packages
'(ob-go mastodon plantuml-mode htmlize ox-rss ob-http nim-mode hyperbole jabber kotlin-mode typescript-mode markdown-mode csv-mode yaml-mode org-roam powershell ox-reveal org-web-tools org-tree-slide elfeed erc-image magit go-translate simple-httpd slime racket-mode web-mode go-mode 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)) '(ob-go mastodon plantuml-mode htmlize ox-rss ob-http nim-mode hyperbole jabber kotlin-mode typescript-mode markdown-mode csv-mode yaml-mode org-roam powershell ox-reveal org-web-tools org-tree-slide elfeed erc-image magit go-translate simple-httpd slime web-mode go-mode 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))
'(python-shell-interpreter "ipython") '(python-shell-interpreter "ipython")
'(python-shell-interpreter-args "-i --simple-prompt --InteractiveShell.display_page=True") '(python-shell-interpreter-args "-i --simple-prompt --InteractiveShell.display_page=True")
'(ring-bell-function 'ignore) '(ring-bell-function 'ignore)
'(sql-sqlite-program "c:/msys64/ucrt64/bin/sqlite3.exe")
'(tetris-x-colors '(tetris-x-colors
[[229 192 123] [[229 192 123]
[97 175 239] [97 175 239]