From d8f5c80d333ecd899db9dfe21808ec5d9947c7ad Mon Sep 17 00:00:00 2001 From: Marcus Kammer Date: Sun, 24 Dec 2023 17:18:43 +0100 Subject: [PATCH 01/20] Enable custom sbcl on linux --- bundle/bundle--lisp.el | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/bundle/bundle--lisp.el b/bundle/bundle--lisp.el index 0bdd6c31..1952cb96 100644 --- a/bundle/bundle--lisp.el +++ b/bundle/bundle--lisp.el @@ -16,9 +16,10 @@ ;; 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 (string-equal system-type "gnu/linux") + (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))))) (defvar mk/hyperspec-dir-locations '("d:/visua/projects/personal/lisp-docs/HyperSpec-7-0/HyperSpec/" From 4182c43ddb30f7ba78dd263ae3606306eb7f6d3c Mon Sep 17 00:00:00 2001 From: Marcus Kammer Date: Tue, 26 Dec 2023 12:51:43 +0100 Subject: [PATCH 02/20] Fix code indentation --- bundle/bundle--package.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bundle/bundle--package.el b/bundle/bundle--package.el index 3168c7c0..36385300 100644 --- a/bundle/bundle--package.el +++ b/bundle/bundle--package.el @@ -294,8 +294,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)) From 2dd562d43b994cc31cca19bdd419573b63e357ec Mon Sep 17 00:00:00 2001 From: Marcus Kammer Date: Tue, 26 Dec 2023 12:51:53 +0100 Subject: [PATCH 03/20] Remove unnecessary variables from gnu customfile --- bundle/custom_gnu.el | 3 --- 1 file changed, 3 deletions(-) diff --git a/bundle/custom_gnu.el b/bundle/custom_gnu.el index 215b4baf..e0da6bfa 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) From 7eb629e803a06f39b34b90913dab5b65ac4ddef9 Mon Sep 17 00:00:00 2001 From: Marcus Kammer Date: Tue, 26 Dec 2023 12:54:24 +0100 Subject: [PATCH 04/20] Remove unnecessary variables from win32 customfile --- bundle/custom_win32_XPS8930.el | 3 --- 1 file changed, 3 deletions(-) diff --git a/bundle/custom_win32_XPS8930.el b/bundle/custom_win32_XPS8930.el index 0141b607..45a76828 100644 --- a/bundle/custom_win32_XPS8930.el +++ b/bundle/custom_win32_XPS8930.el @@ -17,8 +17,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] @@ -35,5 +33,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"))))) From a5ef579c031238bd59388b14741dedf5070794e0 Mon Sep 17 00:00:00 2001 From: Marcus Kammer Date: Tue, 26 Dec 2023 12:58:53 +0100 Subject: [PATCH 05/20] Update sql package --- bundle/bundle--package.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bundle/bundle--package.el b/bundle/bundle--package.el index 36385300..e6e01498 100644 --- a/bundle/bundle--package.el +++ b/bundle/bundle--package.el @@ -49,7 +49,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 From 7a61629a7cc503717f02a9bd720a408e6f630b8b Mon Sep 17 00:00:00 2001 From: Marcus Kammer Date: Tue, 26 Dec 2023 12:59:00 +0100 Subject: [PATCH 06/20] Remove unnecessary variables from customfile --- bundle/custom_win32_EVG03435NB.el | 1 - 1 file changed, 1 deletion(-) 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] From dcd897e7edebddb62a0934be16f0c2d8f7c8f5c9 Mon Sep 17 00:00:00 2001 From: Marcus Kammer Date: Wed, 27 Dec 2023 10:41:22 +0100 Subject: [PATCH 07/20] Only use sbcl custom image if available --- bundle/bundle--lisp.el | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/bundle/bundle--lisp.el b/bundle/bundle--lisp.el index 1952cb96..49b48eca 100644 --- a/bundle/bundle--lisp.el +++ b/bundle/bundle--lisp.el @@ -16,10 +16,11 @@ ;; shell$ sbcl ;; * (mapc 'require '(sb-bsd-sockets sb-posix sb-introspect sb-cltl2 asdf)) ;; * (save-lisp-and-die "sbcl.core-for-slime") - (when (string-equal system-type "gnu/linux") + (when (eq system-type 'gnu/linux) (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 (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/" From 3a1fe457f7057fd4884a7c8fe564b2772e03a3ea Mon Sep 17 00:00:00 2001 From: Marcus Kammer Date: Wed, 27 Dec 2023 10:42:02 +0100 Subject: [PATCH 08/20] Update variable pitch font --- bundle/custom_gnu.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundle/custom_gnu.el b/bundle/custom_gnu.el index e0da6bfa..5d3d9e74 100644 --- a/bundle/custom_gnu.el +++ b/bundle/custom_gnu.el @@ -64,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 120 :family "Noto Serif"))))) From 51145d2a76bbb49f8c1b38f194d3be0fa9240725 Mon Sep 17 00:00:00 2001 From: Marcus Kammer Date: Wed, 27 Dec 2023 11:15:28 +0100 Subject: [PATCH 09/20] No need to call setq-local in a hook --- bundle/bundle--lisp.el | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/bundle/bundle--lisp.el b/bundle/bundle--lisp.el index 49b48eca..818ca882 100644 --- a/bundle/bundle--lisp.el +++ b/bundle/bundle--lisp.el @@ -84,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) @@ -103,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" From 392cfc594ca91c16a1fb009a8d1f9d4904324056 Mon Sep 17 00:00:00 2001 From: Marcus Kammer Date: Wed, 27 Dec 2023 11:16:32 +0100 Subject: [PATCH 10/20] Use Noto Serif in nov mode --- bundle/bundle--package.el | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/bundle/bundle--package.el b/bundle/bundle--package.el index e6e01498..2800b724 100644 --- a/bundle/bundle--package.el +++ b/bundle/bundle--package.el @@ -21,17 +21,18 @@ (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 () (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) + (if (eq system-type 'windows-nt) + (setq-local line-spacing 2) + (setq-local line-spacing 4)) (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))) From 8895023a5c28db6d8c1a272959a160c982db44b0 Mon Sep 17 00:00:00 2001 From: Marcus Kammer Date: Wed, 27 Dec 2023 11:16:55 +0100 Subject: [PATCH 11/20] Noto Sans as default variable pitch font --- bundle/custom_gnu.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundle/custom_gnu.el b/bundle/custom_gnu.el index 5d3d9e74..af3d42e8 100644 --- a/bundle/custom_gnu.el +++ b/bundle/custom_gnu.el @@ -64,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 normal :height 120 :family "Noto Serif"))))) + '(variable-pitch ((t (:weight normal :height 100 :family "Noto Sans"))))) From 2a0f633ac97571f51b61249b80057af40792d96c Mon Sep 17 00:00:00 2001 From: Marcus Kammer Date: Wed, 27 Dec 2023 11:24:19 +0100 Subject: [PATCH 12/20] Enable line-spacing in nov mode --- bundle/bundle--package.el | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/bundle/bundle--package.el b/bundle/bundle--package.el index 2800b724..a2b15ec5 100644 --- a/bundle/bundle--package.el +++ b/bundle/bundle--package.el @@ -21,7 +21,11 @@ (use-package nov :hook ((nov-mode . visual-line-mode) - (nov-mode . (lambda () (face-remap-add-relative 'variable-pitch :weight 'normal :height 120 :family "Noto Serif")))) + (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) @@ -30,9 +34,6 @@ (nov-text-width 82) (nov-variable-pitch t) :config - (if (eq system-type 'windows-nt) - (setq-local line-spacing 2) - (setq-local line-spacing 4)) (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))) From 3e56bf5d558709730ecdca2368de2ecf8b0d2dd9 Mon Sep 17 00:00:00 2001 From: Marcus Kammer Date: Wed, 27 Dec 2023 14:03:56 +0100 Subject: [PATCH 13/20] Define minimal mode-line --- bundle/bundle--gui.el | 39 ++++++++++++++++++++++++++++----------- 1 file changed, 28 insertions(+), 11 deletions(-) diff --git a/bundle/bundle--gui.el b/bundle/bundle--gui.el index 38b927ef..167c42f5 100644 --- a/bundle/bundle--gui.el +++ b/bundle/bundle--gui.el @@ -58,6 +58,23 @@ ;; (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 + :box '(:line-width (1 . 8) :color "#1d2026" :style flat-button) + :weight 'bold) + (use-package all-the-icons :if (display-graphic-p) :commands all-the-icons-install-fonts @@ -69,17 +86,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) From afa489b5501ec46e90bed7a94d8f818e4cb33a48 Mon Sep 17 00:00:00 2001 From: Marcus Kammer Date: Wed, 27 Dec 2023 14:04:21 +0100 Subject: [PATCH 14/20] Load system specific configuration --- bundle/bundle--general.el | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) 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"))) From bcca4dc34270b82aa192117670b8abaa7741ad87 Mon Sep 17 00:00:00 2001 From: Marcus Kammer Date: Wed, 27 Dec 2023 14:05:11 +0100 Subject: [PATCH 15/20] Load server at first --- init.el | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/init.el b/init.el index 5696a383..027e22bb 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")) From 8e6c33de657e11c8283e92477cface0e089b9669 Mon Sep 17 00:00:00 2001 From: Marcus Kammer Date: Wed, 27 Dec 2023 14:08:45 +0100 Subject: [PATCH 16/20] Define mode-line-inactive face --- bundle/bundle--gui.el | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/bundle/bundle--gui.el b/bundle/bundle--gui.el index 167c42f5..a764a635 100644 --- a/bundle/bundle--gui.el +++ b/bundle/bundle--gui.el @@ -75,6 +75,10 @@ :box '(:line-width (1 . 8) :color "#1d2026" :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 From c3d0cae6b00084b7817eaa96d2cc1681ad828080 Mon Sep 17 00:00:00 2001 From: Marcus Kammer Date: Wed, 27 Dec 2023 14:08:58 +0100 Subject: [PATCH 17/20] Disable server --- init.el | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/init.el b/init.el index 027e22bb..1f639c10 100755 --- a/init.el +++ b/init.el @@ -1,6 +1,6 @@ -(require 'server) -(or (eq (server-running-p) t) - (server-start)) +;; (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) From 8d94666600f7095aefbe9eb73ac2383801fc0ba7 Mon Sep 17 00:00:00 2001 From: Marcus Kammer Date: Wed, 27 Dec 2023 14:34:02 +0100 Subject: [PATCH 18/20] Disable jabber activity in mode-line --- bundle/bundle--package.el | 1 + 1 file changed, 1 insertion(+) diff --git a/bundle/bundle--package.el b/bundle/bundle--package.el index a2b15ec5..5d221d69 100644 --- a/bundle/bundle--package.el +++ b/bundle/bundle--package.el @@ -227,6 +227,7 @@ (use-package jabber :defer t :custom + (jabber-activity-mode nil) (jabber-account-list '(("marcus.kammer@mailbox.org"))) (jabber-muc-autojoin From 28965ca50c934d1e597b9085b383d5aaccdcc41b Mon Sep 17 00:00:00 2001 From: Marcus Kammer Date: Wed, 27 Dec 2023 14:34:13 +0100 Subject: [PATCH 19/20] Update emacs service --- emacs.service | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 From 0dea2830db7f845c9a2d879698a4ed64d046ee82 Mon Sep 17 00:00:00 2001 From: Marcus Kammer Date: Wed, 27 Dec 2023 16:26:11 +0100 Subject: [PATCH 20/20] Fix code indentation --- bundle/bundle--gui.el | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/bundle/bundle--gui.el b/bundle/bundle--gui.el index a764a635..f2f9a6f2 100644 --- a/bundle/bundle--gui.el +++ b/bundle/bundle--gui.el @@ -72,12 +72,11 @@ mode-line-end-spaces)) (set-face-attribute 'mode-line nil - :box '(:line-width (1 . 8) :color "#1d2026" :style flat-button) - :weight 'bold) + :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) + :box '(:line-width (1 . 8) :style flat-button) :weight 'normal) (use-package all-the-icons :if (display-graphic-p)