seasharp/Rosenthal
1
0
Fork 0
mirror of https://codeberg.org/hako/Rosenthal.git synced 2025-06-25 11:55:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

services: Remove %rosenthal-example-emacs-fonts.

Browse Source 
* modules/rosenthal/services/desktop.scm (%rosenthal-example-emacs-init): Use
‘computed-substitution-with-inputs’.
(%rosenthal-example-emacs-fonts): Delete variable.
* modules/rosenthal/examples/emacs/init.el: Adjust Emacs configuration.
This commit is contained in:
Hilton Chain 2025-06-25 00:20:39 +08:00
parent 1ab9fdea6d
commit 0bf12445b0
No known key found for this signature in database
GPG Key ID: ACC66D09CA528292
2 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
modules/rosenthal/examples/emacs/init.el
View File

@ -5,18 +5,14 @@
;; TODO: ;; TODO:
;; 1. Configure geiser. Take a look at guile-studio. ;; 1. Configure geiser. Take a look at guile-studio.
;; 2. Make use of ‘guix:’ comments. ;; 2. Make use of `guix:' comments.
;;;
;;; Init
;;;
(setopt custom-file (locate-user-emacs-file "custom.el")) (setopt custom-file (locate-user-emacs-file "custom.el"))
(if (not (file-exists-p custom-file)) (if (not (file-exists-p custom-file))
(make-empty-file custom-file) (make-empty-file custom-file)
(load custom-file)) (load custom-file))
(load-file (locate-user-emacs-file "fonts.el")) (load-file (locate-user-emacs-file "$$fonts.el$$"))
;; Tweak garbage collection strategy. ;; Tweak garbage collection strategy.
;;guix:emacs-gcmh ;;guix:emacs-gcmh
@ -32,8 +28,10 @@
(use-package emacs (use-package emacs
:custom :custom
(shell-file-name "/bin/sh") ;Workaround to use fish as login shell. ;; Workaround to use fish as login shell.
(word-wrap-by-category t)) ;CJK support. (shell-file-name "/bin/sh")
;; CJK support.
(word-wrap-by-category t))
;;; ;;;
@ -167,7 +165,7 @@
;; Disable tab indentation. ;; Disable tab indentation.
(indent-tabs-mode nil) (indent-tabs-mode nil)
:config :config
;; Avoid re-indenting current line after entering ‘RET’. ;; Avoid re-indenting current line after entering `RET'.
(setopt electric-indent-inhibit t) (setopt electric-indent-inhibit t)
:hook :hook
(before-save . delete-trailing-whitespace) (before-save . delete-trailing-whitespace)
@ -217,7 +215,9 @@
;;guix:emacs-magit ;;guix:emacs-magit
(use-package magit (use-package magit
:custom :custom
(git-commit-cd-to-toplevel t) (git-commit-cd-to-toplevel t))
(use-package project
:config :config
(add-to-list 'project-switch-commands '(magit-project-status "Magit") t) (add-to-list 'project-switch-commands '(magit-project-status "Magit") t)
:bind :bind

10
modules/rosenthal/services/desktop.scm
View File

@ -27,8 +27,7 @@
#:use-module (rosenthal packages xorg) #:use-module (rosenthal packages xorg)
#:export (%rosenthal-example-emacs-fonts #:export (%rosenthal-example-emacs-init
%rosenthal-example-emacs-init
home-blueman-applet-configuration home-blueman-applet-configuration
home-blueman-applet-service-type home-blueman-applet-service-type
@ -65,11 +64,10 @@
;;; Configuration file presets. ;;; Configuration file presets.
;;; ;;;
(define %rosenthal-example-emacs-fonts
(local-file "../examples/emacs/fonts.el"))
(define %rosenthal-example-emacs-init (define %rosenthal-example-emacs-init
(local-file "../examples/emacs/init.el")) (computed-substitution-with-inputs "init.el"
(local-file "../examples/emacs/init.el")
(local-file "../examples/emacs" #:recursive? #t)))
;;; ;;;