Solved multi-OS

This commit is contained in:
Eduardo Cueto-Mendoza 2024-04-17 14:04:38 +01:00
parent 3d0458ca6d
commit 6022f05549
2 changed files with 188 additions and 195 deletions

View File

@ -23,7 +23,15 @@ The following variables are used to tweak some of the configuration pieces for u
;; You will most likely need to adjust this font size for your system! ;; You will most likely need to adjust this font size for your system!
(defvar efs/default-font-size 120) (defvar efs/default-font-size 120)
(defvar efs/default-variable-font-size 120) (defvar efs/default-variable-font-size 120)
)) )
((eq system-type 'berkeley-unix)
;; BSD-specific code goes here.
;; You will most likely need to adjust this font size for your system!
(defvar efs/default-font-size 120)
(defvar efs/default-variable-font-size 120)
)
)
;; Make frame transparency overridable ;; Make frame transparency overridable
(defvar efs/frame-transparency '(90 . 90)) (defvar efs/frame-transparency '(90 . 90))
@ -151,10 +159,8 @@ We use the [[https://github.com/emacscollective/no-littering/blob/master/no-litt
#+begin_src emacs-lisp #+begin_src emacs-lisp
(cond (cond ((eq system-type 'gnu/linux)
((eq system-type 'gnu/linux) ;; Linux-specific code goes here.
(progn
(
;; credit: yorickvP on Github ;; credit: yorickvP on Github
(setq wl-copy-process nil) (setq wl-copy-process nil)
(defun wl-copy (text) (defun wl-copy (text)
@ -171,7 +177,9 @@ We use the [[https://github.com/emacscollective/no-littering/blob/master/no-litt
(setq interprogram-cut-function 'wl-copy) (setq interprogram-cut-function 'wl-copy)
(setq interprogram-paste-function 'wl-paste) (setq interprogram-paste-function 'wl-paste)
)))) )
)
#+end_src #+end_src
@ -241,35 +249,18 @@ I am using the [[https://github.com/tonsky/FiraCode][Fira Code]] and [[https://f
;; Set the variable pitch face ;; Set the variable pitch face
(set-face-attribute 'variable-pitch nil :font "Comic Code Regular" :height efs/default-variable-font-size :weight 'regular) (set-face-attribute 'variable-pitch nil :font "Comic Code Regular" :height efs/default-variable-font-size :weight 'regular)
)) )
((eq system-type 'berkeley-unix)
;; BSD-specific code goes here.
(set-face-attribute 'default nil :font "Comic Code" :height efs/default-font-size)
;(cond
;((eq system-type 'windows-nt)
;(progn
; (message "Microsoft Windows")))
;((eq system-type 'darwin)
;(progn
;(
;(set-face-attribute 'default nil :font "BigBlueTermPlus Nerd Font" :height efs/default-font-size)
;; Set the fixed pitch face ;; Set the fixed pitch face
;(set-face-attribute 'fixed-pitch nil :font "BigBlueTermPlus Nerd Font" :height efs/default-font-size) (set-face-attribute 'fixed-pitch nil :font "Comic Code" :height efs/default-font-size)
;; Set the variable pitch face ;; Set the variable pitch face
;(set-face-attribute 'variable-pitch nil :font "BigBlueTermPlus Nerd Font" :height efs/default-variable-font-size :weight 'regular) (set-face-attribute 'variable-pitch nil :font "Comic Code" :height efs/default-variable-font-size :weight 'regular)
;) )
;) )
;)
;((eq system-type 'gnu/linux)
;(progn
;(
;)
;)
;))
#+end_src #+end_src
@ -589,7 +580,12 @@ The =efs/org-font-setup= function configures various text faces to tweak the siz
((eq system-type 'gnu/linux) ((eq system-type 'gnu/linux)
;; Linux-specific code goes here. ;; Linux-specific code goes here.
(set-face-attribute (car face) nil :font "Comic Code Regular" :weight 'regular :height (cdr face)) (set-face-attribute (car face) nil :font "Comic Code Regular" :weight 'regular :height (cdr face))
)) )
((eq system-type 'berkeley-unix)
;; BSD-specific code goes here.
(set-face-attribute (car face) nil :font "Comic Code" :weight 'regular :height (cdr face))
)
)
) )
;; Ensure that anything that should be fixed-pitch in Org files appears that way ;; Ensure that anything that should be fixed-pitch in Org files appears that way
@ -1482,7 +1478,7 @@ Dired is a built-in file manager for Emacs that does some pretty amazing things!
(use-package mu4e (use-package mu4e
:ensure nil :ensure nil
:if (eq system-type 'darwin) ;:if (eq system-type 'darwin)
:load-path "/opt/homebrew/share/emacs/site-lisp/mu4e" :load-path "/opt/homebrew/share/emacs/site-lisp/mu4e"
;:defer 20 ; Wait until 20 seconds after startup ;:defer 20 ; Wait until 20 seconds after startup
;:defer t ;:defer t

61
init.el
View File

@ -13,7 +13,15 @@
;; You will most likely need to adjust this font size for your system! ;; You will most likely need to adjust this font size for your system!
(defvar efs/default-font-size 120) (defvar efs/default-font-size 120)
(defvar efs/default-variable-font-size 120) (defvar efs/default-variable-font-size 120)
)) )
((eq system-type 'berkeley-unix)
;; BSD-specific code goes here.
;; You will most likely need to adjust this font size for your system!
(defvar efs/default-font-size 120)
(defvar efs/default-variable-font-size 120)
)
)
;; Make frame transparency overridable ;; Make frame transparency overridable
(defvar efs/frame-transparency '(90 . 90)) (defvar efs/frame-transparency '(90 . 90))
@ -95,10 +103,8 @@
(setq auto-save-file-name-transforms (setq auto-save-file-name-transforms
`((".*" ,(no-littering-expand-var-file-name "auto-save/") t))) `((".*" ,(no-littering-expand-var-file-name "auto-save/") t)))
(cond (cond ((eq system-type 'gnu/linux)
((eq system-type 'gnu/linux) ;; Linux-specific code goes here.
(progn
(
;; credit: yorickvP on Github ;; credit: yorickvP on Github
(setq wl-copy-process nil) (setq wl-copy-process nil)
(defun wl-copy (text) (defun wl-copy (text)
@ -115,7 +121,9 @@
(setq interprogram-cut-function 'wl-copy) (setq interprogram-cut-function 'wl-copy)
(setq interprogram-paste-function 'wl-paste) (setq interprogram-paste-function 'wl-paste)
)))) )
)
(setq inhibit-startup-message t) (setq inhibit-startup-message t)
;;(setq default-directory "~/.emacs.d") ;;(setq default-directory "~/.emacs.d")
@ -168,34 +176,18 @@
;; Set the variable pitch face ;; Set the variable pitch face
(set-face-attribute 'variable-pitch nil :font "Comic Code Regular" :height efs/default-variable-font-size :weight 'regular) (set-face-attribute 'variable-pitch nil :font "Comic Code Regular" :height efs/default-variable-font-size :weight 'regular)
)) )
((eq system-type 'berkeley-unix)
;; BSD-specific code goes here.
(set-face-attribute 'default nil :font "Comic Code" :height efs/default-font-size)
;(cond
;((eq system-type 'windows-nt)
;(progn
; (message "Microsoft Windows")))
;((eq system-type 'darwin)
;(progn
;(
;(set-face-attribute 'default nil :font "BigBlueTermPlus Nerd Font" :height efs/default-font-size)
;; Set the fixed pitch face ;; Set the fixed pitch face
;(set-face-attribute 'fixed-pitch nil :font "BigBlueTermPlus Nerd Font" :height efs/default-font-size) (set-face-attribute 'fixed-pitch nil :font "Comic Code" :height efs/default-font-size)
;; Set the variable pitch face ;; Set the variable pitch face
;(set-face-attribute 'variable-pitch nil :font "BigBlueTermPlus Nerd Font" :height efs/default-variable-font-size :weight 'regular) (set-face-attribute 'variable-pitch nil :font "Comic Code" :height efs/default-variable-font-size :weight 'regular)
;) )
;) )
;)
;((eq system-type 'gnu/linux)
;(progn
;(
;)
;)
;))
;; Make ESC quit prompts ;; Make ESC quit prompts
(global-set-key (kbd "<escape>") 'keyboard-escape-quit) (global-set-key (kbd "<escape>") 'keyboard-escape-quit)
@ -393,7 +385,12 @@
((eq system-type 'gnu/linux) ((eq system-type 'gnu/linux)
;; Linux-specific code goes here. ;; Linux-specific code goes here.
(set-face-attribute (car face) nil :font "Comic Code Regular" :weight 'regular :height (cdr face)) (set-face-attribute (car face) nil :font "Comic Code Regular" :weight 'regular :height (cdr face))
)) )
((eq system-type 'berkeley-unix)
;; BSD-specific code goes here.
(set-face-attribute (car face) nil :font "Comic Code" :weight 'regular :height (cdr face))
)
)
) )
;; Ensure that anything that should be fixed-pitch in Org files appears that way ;; Ensure that anything that should be fixed-pitch in Org files appears that way
@ -882,7 +879,7 @@
(use-package mu4e (use-package mu4e
:ensure nil :ensure nil
:if (eq system-type 'darwin) ;:if (eq system-type 'darwin)
:load-path "/opt/homebrew/share/emacs/site-lisp/mu4e" :load-path "/opt/homebrew/share/emacs/site-lisp/mu4e"
;:defer 20 ; Wait until 20 seconds after startup ;:defer 20 ; Wait until 20 seconds after startup
;:defer t ;:defer t