mirror of
				https://codeberg.org/hako/Rosenthal.git
				synced 2025-11-04 03:34:37 +00:00 
			
		
		
		
	services: Remove %rosenthal-example-emacs-fonts.
* 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:
		
							parent
							
								
									1ab9fdea6d
								
							
						
					
					
						commit
						0bf12445b0
					
				@ -5,18 +5,14 @@
 | 
			
		||||
 | 
			
		||||
;; TODO:
 | 
			
		||||
;; 1. Configure geiser.  Take a look at guile-studio.
 | 
			
		||||
;; 2. Make use of ‘guix:’ comments.
 | 
			
		||||
 | 
			
		||||
;;;
 | 
			
		||||
;;; Init
 | 
			
		||||
;;;
 | 
			
		||||
;; 2. Make use of `guix:' comments.
 | 
			
		||||
 | 
			
		||||
(setopt custom-file (locate-user-emacs-file "custom.el"))
 | 
			
		||||
(if (not (file-exists-p custom-file))
 | 
			
		||||
    (make-empty-file 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.
 | 
			
		||||
;;guix:emacs-gcmh
 | 
			
		||||
@ -32,8 +28,10 @@
 | 
			
		||||
 | 
			
		||||
(use-package emacs
 | 
			
		||||
  :custom
 | 
			
		||||
  (shell-file-name "/bin/sh")          ;Workaround to use fish as login shell.
 | 
			
		||||
  (word-wrap-by-category t))           ;CJK support.
 | 
			
		||||
  ;; Workaround to use fish as login shell.
 | 
			
		||||
  (shell-file-name "/bin/sh")
 | 
			
		||||
  ;; CJK support.
 | 
			
		||||
  (word-wrap-by-category t))
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
;;;
 | 
			
		||||
@ -167,7 +165,7 @@
 | 
			
		||||
  ;; Disable tab indentation.
 | 
			
		||||
  (indent-tabs-mode nil)
 | 
			
		||||
  :config
 | 
			
		||||
  ;; Avoid re-indenting current line after entering ‘RET’.
 | 
			
		||||
  ;; Avoid re-indenting current line after entering `RET'.
 | 
			
		||||
  (setopt electric-indent-inhibit t)
 | 
			
		||||
  :hook
 | 
			
		||||
  (before-save . delete-trailing-whitespace)
 | 
			
		||||
@ -217,7 +215,9 @@
 | 
			
		||||
;;guix:emacs-magit
 | 
			
		||||
(use-package magit
 | 
			
		||||
  :custom
 | 
			
		||||
  (git-commit-cd-to-toplevel t)
 | 
			
		||||
  (git-commit-cd-to-toplevel t))
 | 
			
		||||
 | 
			
		||||
(use-package project
 | 
			
		||||
  :config
 | 
			
		||||
  (add-to-list 'project-switch-commands '(magit-project-status "Magit") t)
 | 
			
		||||
  :bind
 | 
			
		||||
 | 
			
		||||
@ -27,8 +27,7 @@
 | 
			
		||||
 | 
			
		||||
  #:use-module (rosenthal packages xorg)
 | 
			
		||||
 | 
			
		||||
  #:export (%rosenthal-example-emacs-fonts
 | 
			
		||||
            %rosenthal-example-emacs-init
 | 
			
		||||
  #:export (%rosenthal-example-emacs-init
 | 
			
		||||
 | 
			
		||||
            home-blueman-applet-configuration
 | 
			
		||||
            home-blueman-applet-service-type
 | 
			
		||||
@ -65,11 +64,10 @@
 | 
			
		||||
;;; Configuration file presets.
 | 
			
		||||
;;;
 | 
			
		||||
 | 
			
		||||
(define %rosenthal-example-emacs-fonts
 | 
			
		||||
  (local-file "../examples/emacs/fonts.el"))
 | 
			
		||||
 | 
			
		||||
(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)))
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
;;;
 | 
			
		||||
 | 
			
		||||
		Loading…
	
		Reference in New Issue
	
	Block a user