diff --git a/.emacs b/.emacs index adc34c1..e9a021b 100644 --- a/.emacs +++ b/.emacs @@ -146,12 +146,16 @@ ;; Don't use tabs in indentation indent-tabs-mode nil) +;; Add for emacs server +(add-to-list 'default-frame-alist '(font . "FiraEmacs 10")) +(add-to-list 'default-frame-alist '(alpha . (85 . 95))) + ;; Set transparency -(set-frame-parameter (selected-frame) 'alpha '(85 . 90)) +(set-frame-parameter (selected-frame) 'alpha '(85 . 95)) ;; Font (unless (equal (system-name) "hegp") - (set-frame-font "Fira Code 10" nil t)) + (set-frame-font "FiraEmacs 10" nil t)) ;; Replace yes/no with y/n (fset 'yes-or-no-p 'y-or-n-p) @@ -857,6 +861,12 @@ :custom-face (helpful-heading ((t (:height 1.9))))) +;;;;; Fira Code + +(use-package fira-code + :load-path "~/.emacs.d/Fira-code" + :hook (prog-mode . fira-code-mode)) + ;;;;; Rainbow mode (use-package rainbow-mode @@ -1050,11 +1060,7 @@ (progn (goto-char (point-max)) (evil-append 1)))) ) - - :hook (ess-mode . (lambda () - (setq-local prettify-symbols-alist '(("%>%" . "|>"))) - (setq-local prettify-symbols-unprettify-at-point 'right-edge) - (prettify-symbols-mode)))) + ) ;;;;; Poly-R diff --git a/.emacs.d/Fira-code/fira-code-data.el b/.emacs.d/Fira-code/fira-code-data.el new file mode 100644 index 0000000..ef4eeda --- /dev/null +++ b/.emacs.d/Fira-code/fira-code-data.el @@ -0,0 +1,250 @@ +;; -*- coding: utf-8 -*- +(defconst fira-code--data + '(["space.frac" " " "\xe100"] ;  + ["exclam_exclam.liga" "!!" "\xe101"] ;  + ["exclam_exclam_period.liga" "!!." "\xe102"] ;  + ["exclam_equal.liga" "!=" "\xe103"] ;  + ["exclam_equal_equal.liga" "!==" "\xe104"] ;  + ["numbersign_exclam.liga" "#!" "\xe105"] ;  + ["numbersign_numbersign.liga" "##" "\xe106"] ;  + ["numbersign_numbersign_numbersign.liga" "###" "\xe107"] ;  + ["numbersign_numbersign_numbersign_numbersign.liga" "####" "\xe108"] ;  + ["numbersign_parenleft.liga" "#(" "\xe109"] ;  + ["numbersign_colon.liga" "#:" "\xe10a"] ;  + ["numbersign_colon.liga_rem" "#:" "\xe10b"] ;  + ["numbersign_equal.liga" "#=" "\xe10c"] ;  + ["numbersign_question.liga" "#?" "\xe10d"] ;  + ["numbersign_bracketleft.liga" "#[" "\xe10e"] ;  + ["numbersign_underscore.liga" "#_" "\xe10f"] ;  + ["numbersign_underscore_parenleft.liga" "#_(" "\xe110"] ;  + ["numbersign_braceleft.liga" "#{" "\xe111"] ;  + ["dollar.ss05" "$" "\xe112"] ;  + ["dollar_greater.liga" "$>" "\xe113"] ;  + ["percent_percent.liga" "%%" "\xe114"] ;  + ["ampersand.ss03" "&" "\xe115"] ;  + ["ampersand_ampersand.liga" "&&" "\xe116"] ;  + ["parenleft.case" "(" "\xe117"] ;  + ["parenleft.dnom" "(" "\xe118"] ;  + ["parenleft.numr" "(" "\xe119"] ;  + ["parenright.case" ")" "\xe11a"] ;  + ["parenright.dnom" ")" "\xe11b"] ;  + ["parenright.numr" ")" "\xe11c"] ;  + ["asterisk.lc" "*" "\xe11d"] ;  + ["asterisk_asterisk.liga" "**" "\xe11e"] ;  + ["asterisk_asterisk_asterisk.liga" "***" "\xe11f"] ;  + ["asterisk_slash.liga" "*/" "\xe120"] ;  + ["asterisk_greater.liga" "*>" "\xe121"] ;  + ["plus.dnom" "+" "\xe122"] ;  + ["plus.lc" "+" "\xe123"] ;  + ["plus.numr" "+" "\xe124"] ;  + ["plus_plus.liga" "++" "\xe125"] ;  + ["plus_plus_plus.liga" "+++" "\xe126"] ;  + ["plus_greater.liga" "+>" "\xe127"] ;  + ["hyphen.case" "-" "\xe128"] ;  + ["hyphen.lc" "-" "\xe129"] ;  + ["hyphen_hyphen.liga" "--" "\xe12a"] ;  + ["hyphen_hyphen_hyphen.liga" "---" "\xe12b"] ;  + ["hyphen_hyphen_greater.liga" "-->" "\xe12c"] ;  + ["hyphen_less.liga" "-<" "\xe12d"] ;  + ["hyphen_less_less.liga" "-<<" "\xe12e"] ;  + ["hyphen_greater.liga" "->" "\xe12f"] ;  + ["hyphen_greater_greater.liga" "->>" "\xe130"] ;  + ["hyphen_bar.liga" "-|" "\xe131"] ;  + ["hyphen_asciitilde.liga" "-~" "\xe132"] ;  + ["period_hyphen.liga" ".-" "\xe133"] ;  + ["period_period.liga" ".." "\xe134"] ;  + ["period_period_period.liga" "..." "\xe135"] ;  + ["period_period_less.liga" "..<" "\xe136"] ;  + ["period_equal.liga" ".=" "\xe137"] ;  + ["period_question.liga" ".?" "\xe138"] ;  + ["slash_asterisk.liga" "/*" "\xe139"] ;  + ["slash_slash.liga" "//" "\xe13a"] ;  + ["slash_slash_slash.liga" "///" "\xe13b"] ;  + ["slash_equal.liga" "/=" "\xe13c"] ;  + ["slash_equal_equal.liga" "/==" "\xe13d"] ;  + ["slash_greater.liga" "/>" "\xe13e"] ;  + ["slash_backslash.liga" "/\\" "\xe13f"] ;  + ["zero.dnom" "0" "\xe140"] ;  + ["zero.numr" "0" "\xe141"] ;  + ["zero.tosf" "0" "\xe142"] ;  + ["zero.tosf.zero" "0" "\xe143"] ;  + ["zero.zero" "0" "\xe144"] ;  + ["zero.zero.tosf" "0" "\xe145"] ;  + ["one.dnom" "1" "\xe146"] ;  + ["one.numr" "1" "\xe147"] ;  + ["one.tosf" "1" "\xe148"] ;  + ["two.dnom" "2" "\xe149"] ;  + ["two.numr" "2" "\xe14a"] ;  + ["two.tosf" "2" "\xe14b"] ;  + ["three.dnom" "3" "\xe14c"] ;  + ["three.numr" "3" "\xe14d"] ;  + ["three.tosf" "3" "\xe14e"] ;  + ["four.dnom" "4" "\xe14f"] ;  + ["four.numr" "4" "\xe150"] ;  + ["four.tosf" "4" "\xe151"] ;  + ["five.dnom" "5" "\xe152"] ;  + ["five.numr" "5" "\xe153"] ;  + ["five.tosf" "5" "\xe154"] ;  + ["six.dnom" "6" "\xe155"] ;  + ["six.numr" "6" "\xe156"] ;  + ["six.tosf" "6" "\xe157"] ;  + ["seven.dnom" "7" "\xe158"] ;  + ["seven.numr" "7" "\xe159"] ;  + ["seven.tosf" "7" "\xe15a"] ;  + ["eight.dnom" "8" "\xe15b"] ;  + ["eight.numr" "8" "\xe15c"] ;  + ["eight.tosf" "8" "\xe15d"] ;  + ["nine.dnom" "9" "\xe15e"] ;  + ["nine.numr" "9" "\xe15f"] ;  + ["nine.tosf" "9" "\xe160"] ;  + ["colon.uc" ":" "\xe161"] ;  + ["colon_colon.liga" "::" "\xe162"] ;  + ["colon_colon_colon.liga" ":::" "\xe163"] ;  + ["colon_colon_equal.liga" "::=" "\xe164"] ;  + ["colon_less.liga" ":<" "\xe165"] ;  + ["colon_equal.liga" ":=" "\xe166"] ;  + ["colon_greater.liga" ":>" "\xe167"] ;  + ["semicolon_semicolon.liga" ";;" "\xe168"] ;  + ["less_exclam_hyphen_hyphen.liga" "