diff --git a/bundle/bundle--general.el b/bundle/bundle--general.el index 6e31f8fa..ffbb8884 100644 --- a/bundle/bundle--general.el +++ b/bundle/bundle--general.el @@ -91,13 +91,15 @@ ;;; bundle--customfile (when (eq system-type 'gnu/linux) (setq custom-file "~/.emacs.d/bundle/custom_gnu.el" - browse-url-secondary-browser-function 'browse-url-firefox)) + browse-url-secondary-browser-function 'browse-url-firefox) + (unless (file-directory-p "~/cl-sites/") + (async-shell-command "git clone git@git.sr.ht:~marcuskammer/cl-sites ~/cl-sites"))) (when (eq system-type 'windows-nt) (setq explicit-shell-file-name - (seq-find 'file-executable-p - '("C:\\Program Files\\PowerShell\\7\\pwsh.exe" - "C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe"))) + (seq-find 'file-executable-p + '("C:\\Program Files\\PowerShell\\7\\pwsh.exe" + "C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe"))) (setq explicit-powershell.exe-args '("-NoProfile" "-InputFormat" "Text")) (setq custom-file "~/.emacs.d/bundle/custom_win32.el") @@ -106,6 +108,9 @@ (setq custom-file "~/.emacs.d/bundle/custom_win32_XPS8930.el")) (when (string= system-name "EVG03435NB") + (let ((f "~/feeds.el")) + (when (file-exists-p f) + (load-file f))) (cd "~/OneDrive - Siemens AG/") (setq custom-file "~/.emacs.d/bundle/custom_win32_EVG03435NB.el"))) diff --git a/bundle/bundle--gui.el b/bundle/bundle--gui.el index 38b927ef..f2f9a6f2 100644 --- a/bundle/bundle--gui.el +++ b/bundle/bundle--gui.el @@ -58,6 +58,26 @@ ;; (set-face-attribute 'mode-line nil :weight 'bold) ;; (set-face-attribute 'header-line nil :weight 'bold) +(setq-default mode-line-format + '("%e" + mode-line-front-space + mode-line-modified + " " + mode-line-buffer-identification + " " + mode-line-position + (vc-mode vc-mode) + " " + mode-line-misc-info + mode-line-end-spaces)) + +(set-face-attribute 'mode-line nil + :foreground "#4c566a" + :box '(:line-width (1 . 8) :style flat-button) :weight 'bold) + +(set-face-attribute 'mode-line-inactive nil + :box '(:line-width (1 . 8) :style flat-button) :weight 'normal) + (use-package all-the-icons :if (display-graphic-p) :commands all-the-icons-install-fonts @@ -69,17 +89,17 @@ :if (display-graphic-p) :hook (dired-mode . all-the-icons-dired-mode)) -(use-package doom-modeline - :hook (after-init . doom-modeline-mode) - :custom - (doom-modeline-height 30) - (doom-modeline-bar-width 4) - (doom-modeline-icon t) - (doom-modeline-major-mode-icon t) - (doom-modeline-unicode-fallback nil) - (doom-modeline-minor-modes nil) - (doom-modeline-buffer-encoding nil) - (doom-modeline-battery t)) +;; (use-package doom-modeline +;; :hook (after-init . doom-modeline-mode) +;; :custom +;; (doom-modeline-height 30) +;; (doom-modeline-bar-width 4) +;; (doom-modeline-icon nil) +;; (doom-modeline-major-mode-icon nil) +;; (doom-modeline-unicode-fallback nil) +;; (doom-modeline-minor-modes nil) +;; (doom-modeline-buffer-encoding nil) +;; (doom-modeline-battery nil)) (use-package helpful :commands (helpful-callable helpful-variable helpful-command helpful-key) diff --git a/bundle/bundle--lisp.el b/bundle/bundle--lisp.el index 0bdd6c31..818ca882 100644 --- a/bundle/bundle--lisp.el +++ b/bundle/bundle--lisp.el @@ -16,9 +16,11 @@ ;; shell$ sbcl ;; * (mapc 'require '(sb-bsd-sockets sb-posix sb-introspect sb-cltl2 asdf)) ;; * (save-lisp-and-die "sbcl.core-for-slime") - ;; (let ((image-path (expand-file-name "~/sbcl.core-for-slime"))) - ;; (setq slime-lisp-implementations - ;; `((sbcl ("sbcl" "--noinform" "--core" ,image-path) :coding-system utf-8-unix)))) + (when (eq system-type 'gnu/linux) + (let ((image-path (expand-file-name "~/sbcl.core-for-slime"))) + (when (file-exists-p image-path) + (setq slime-lisp-implementations + `((sbcl ("sbcl" "--noinform" "--core" ,image-path) :coding-system utf-8-unix)))))) (defvar mk/hyperspec-dir-locations '("d:/visua/projects/personal/lisp-docs/HyperSpec-7-0/HyperSpec/" @@ -82,15 +84,15 @@ Uses `mk/hyperspec-dir-locations' to find the directory." (use-package elisp-mode :ensure nil - :hook ((emacs-lisp-mode . prettify-symbols-mode) - (emacs-lisp-mode . (lambda () (setq-local lisp-indent-function 'lisp-indent-function)))) - :mode (("\\.el$" . emacs-lisp-mode))) + :hook ((emacs-lisp-mode . prettify-symbols-mode)) + :mode (("\\.el$" . emacs-lisp-mode)) + :config + (setq-local lisp-indent-function 'lisp-indent-function)) (use-package lisp-mode :ensure nil :hook ((lisp-mode . prettify-symbols-mode) (lisp-mode . (lambda () - (setq-local lisp-indent-function 'common-lisp-indent-function) (face-remap-add-relative 'font-lock-function-name-face nil :underline t) (face-remap-add-relative 'font-lock-keyword-face nil :slant 'italic)))) :mode (("\\.lisp$" . lisp-mode) @@ -101,6 +103,7 @@ Uses `mk/hyperspec-dir-locations' to find the directory." (setq inferior-lisp-program "sbcl --noinform") (setq inferior-lisp-program "/usr/bin/sbcl --noinform")) :config + (setq-local lisp-indent-function 'common-lisp-indent-function) (defvar g-cl-function-names '("*" "+" "-" "/" "/=" "1+" "1-" "<" "<=" "=" ">" ">=" "abort" "abs" "acons" "acos" "acosh" "add-method" "adjoin" diff --git a/bundle/bundle--package.el b/bundle/bundle--package.el index 3168c7c0..5d221d69 100644 --- a/bundle/bundle--package.el +++ b/bundle/bundle--package.el @@ -21,17 +21,19 @@ (use-package nov :hook ((nov-mode . visual-line-mode) - (nov-mode . (lambda () (if (eq system-type 'windows-nt) - (setq-local line-spacing 2) - (setq-local line-spacing 4))))) + (nov-mode . (lambda () + (if (eq system-type 'windows-nt) + (setq-local line-spacing 2) + (setq-local line-spacing 4)) + (face-remap-add-relative 'variable-pitch :weight 'normal :height 120 :family "Noto Serif")))) :mode ("\\.epub\\'" . nov-mode) :init (add-hook 'nov-mode-hook #'shrface-mode) :custom (nov-header-line-format nil) + (nov-text-width 82) + (nov-variable-pitch t) :config - (setq nov-text-width 82 - nov-variable-pitch t) (require 'shrface) (setq nov-shr-rendering-functions '((img . nov-render-img) (title . nov-render-title))) (setq nov-shr-rendering-functions (append nov-shr-rendering-functions shr-external-rendering-functions))) @@ -49,7 +51,8 @@ :config (when (eq system-type 'windows-nt) (setq sql-sqlite-options '("-interactive")) - (setq sql-mariadb-options '("-C" "-t" "-f" "-n")))) + (setq sql-mariadb-options '("-C" "-t" "-f" "-n")) + (setq sql-mysql-options '("-C" "-t" "-f" "-n")))) ;; (use-package cc-mode ;; :defer t @@ -224,6 +227,7 @@ (use-package jabber :defer t :custom + (jabber-activity-mode nil) (jabber-account-list '(("marcus.kammer@mailbox.org"))) (jabber-muc-autojoin @@ -294,8 +298,8 @@ :config (when (eq system-type 'windows-nt) (setq epg-gpg-home-directory "~/AppData/Roaming/gnupg" - epg-gpg-program "c:/Program Files (x86)/GnuPG/bin/gpg.exe" - epg-gpgconf-program "c:/Program Files (x86)/GnuPG/bin/gpgconf.exe"))) + epg-gpg-program "c:/Program Files (x86)/GnuPG/bin/gpg.exe" + epg-gpgconf-program "c:/Program Files (x86)/GnuPG/bin/gpgconf.exe"))) (use-package which-key :init (which-key-mode)) diff --git a/bundle/custom_gnu.el b/bundle/custom_gnu.el index 215b4baf..af3d42e8 100644 --- a/bundle/custom_gnu.el +++ b/bundle/custom_gnu.el @@ -34,7 +34,6 @@ '(inferior-lisp-program "/usr/bin/sbcl --noinform" t) '(initial-buffer-choice "~/Documents/org/agenda/tasks.org") '(initial-frame-alist '((fullscreen . maximized) (undecorated . t))) - '(latex-run-command "xelatex") '(line-spacing nil) '(message-user-organization "") '(org-agenda-files '("~/Documents/org/agenda/")) @@ -46,8 +45,6 @@ '(package-enable-at-startup t) '(package-selected-packages '(common-lisp-snippets jq-format gptel dashboard nginx-mode ssh-config-mode ob-restclient restclient which-key auctex js2-mode ob-http geiser-guile geiser-racket geiser typescript-mode yaml-mode shrface plantuml-mode htmlize nim-mode hyperbole ox-rss keepass-mode jabber ox-pandoc mastodon w3m spotify cider clojure-mode mpv markdown-mode csv-mode ox-reveal ob-go org-web-tools org-tree-slide org-roam elfeed erc-image magit go-translate simple-httpd slime racket-mode web-mode go-mode eglot nov vertico 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-args "-i --simple-prompt --InteractiveShell.display_page=True") '(scroll-bar-mode nil) '(scroll-step 5) '(tab-width 4) @@ -67,4 +64,4 @@ ;; 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 (:weight Regular :height 1.0 :family "Noto Sans"))))) + '(variable-pitch ((t (:weight normal :height 100 :family "Noto Sans"))))) diff --git a/bundle/custom_win32_EVG03435NB.el b/bundle/custom_win32_EVG03435NB.el index cdc6ba92..7d07eb79 100644 --- a/bundle/custom_win32_EVG03435NB.el +++ b/bundle/custom_win32_EVG03435NB.el @@ -53,7 +53,6 @@ '(reb-re-syntax 'string) '(ring-bell-function 'ignore) '(scroll-step 5) - '(sql-mysql-options '("-C" "-t" "-f" "-n")) '(tab-width 4) '(tetris-x-colors [[229 192 123] diff --git a/bundle/custom_win32_XPS8930.el b/bundle/custom_win32_XPS8930.el index d42ff169..6317e461 100644 --- a/bundle/custom_win32_XPS8930.el +++ b/bundle/custom_win32_XPS8930.el @@ -20,8 +20,6 @@ '(org-roam-directory "~/Documents/org/") '(package-selected-packages '(jq-format json-navigator flymake-json dashboard nginx-mode ssh-config-mode org-roam mastodon ob-restclient restclient which-key auctex jabber js2-mode gptlet gptel ob-go plantuml-mode htmlize ox-rss ob-http nim-mode hyperbole kotlin-mode typescript-mode markdown-mode csv-mode yaml-mode 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-args "-i --simple-prompt --InteractiveShell.display_page=True") '(ring-bell-function 'ignore) '(tetris-x-colors [[229 192 123] @@ -38,5 +36,4 @@ ;; 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. - '(font-lock-keyword-face ((t (:slant italic)))) '(variable-pitch ((t (:height 1.0 :family "Noto Sans"))))) diff --git a/emacs.service b/emacs.service index 7a362a38..f7e8dd62 100644 --- a/emacs.service +++ b/emacs.service @@ -3,11 +3,11 @@ Description=Emacs text editor Documentation=info:emacs man:emacs(1) https://gnu.org/software/emacs/ [Service] -Type=simple +Type=forking ExecStart=/usr/local/bin/emacs --daemon ExecStop=/usr/local/bin/emacsclient --eval "(kill-emacs)" Environment=SSH_AUTH_SOCK=%t/keyring/ssh Restart=on-failure [Install] -WantedBy=default.target +WantedBy=default.target \ No newline at end of file diff --git a/init.el b/init.el index 5696a383..1f639c10 100755 --- a/init.el +++ b/init.el @@ -1,3 +1,7 @@ +;; (require 'server) +;; (or (eq (server-running-p) t) +;; (server-start)) + (let ((bundle-dir (expand-file-name "~/.emacs.d/bundle/"))) (when (file-directory-p bundle-dir) (add-to-list 'load-path bundle-dir) @@ -13,14 +17,3 @@ (load "bundle--ux") (load "bundle--mk") (load "bundle--linux"))) - -;; (require 'server) -;; (or (eq (server-running-p) t) -;; (server-start)) - -(let ((f "~/feeds.el")) - (when (file-exists-p f) - (load-file f))) - -(unless (file-directory-p "~/cl-sites/") - (async-shell-command "git clone git@git.sr.ht:~marcuskammer/cl-sites ~/cl-sites"))