From 65f4b29304ffcae232acf358d07f8d53a1482e8b Mon Sep 17 00:00:00 2001
From: Andrea Ciceri <andrea.ciceri@autistici.org>
Date: Thu, 16 Feb 2023 22:44:20 +0100
Subject: [PATCH] [WIP] Fixes new server/client model

---
 init.el               | 28 +++++++++++++++++++++++-----
 packages/packages.nix |  2 +-
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/init.el b/init.el
index 73c25a7..adef201 100644
--- a/init.el
+++ b/init.el
@@ -19,13 +19,29 @@
       (dolist (feature (nreverse features))
         (setq body `(with-eval-after-load ',feature ,body)))
       body))
-  :documentation "Load the cvurrent feature after FEATURES.")
+  :documentation "Load the current feature after FEATURES.")
+
+
+(setup ligatures
+  (ligature-set-ligatures 't '("www"))
+  (ligature-set-ligatures 'prog-mode '("www" "**" "***" "**/" "*>" "*/" "\\\\" "\\\\\\" "{-" "::"
+                                       ":::" ":=" "!!" "!=" "!==" "-}" "----" "-->" "->" "->>"
+                                       "-<" "-<<" "-~" "#{" "#[" "##" "###" "####" "#(" "#?" "#_"
+                                       "#_(" ".-" ".=" ".." "..<" "..." "?=" "??" ";;" "/*" "/**"
+                                       "/=" "/==" "/>" "//" "///" "&&" "||" "||=" "|=" "|>" "^=" "$>"
+                                       "++" "+++" "+>" "=:=" "==" "===" "==>" "=>" "=>>" "<="
+                                       "=<<" "=/=" ">-" ">=" ">=>" ">>" ">>-" ">>=" ">>>" "<*"
+                                       "<*>" "<|" "<|>" "<$" "<$>" "<!--" "<-" "<--" "<->" "<+"
+                                       "<+>" "<=" "<==" "<=>" "<=<" "<>" "<<" "<<-" "<<=" "<<<"
+                                       "<~" "<~~" "</" "</>" "~@" "~-" "~>" "~~" "~~>" "%%"))
+  (global-ligature-mode 't)
+)
 
-(setup fira-code-mode (when (display-graphic-p) (global-fira-code-mode)))
 
 (setup flycheck
   (:require flycheck)
   (:hook-into prog-mode)
+  ;; FIXME the following requires the same fix as `fira-code-mode`
   (if (display-graphic-p) (:hook flycheck-posframe-mode) (:hook flycheck-inline-mode)))
 
 (setup eglot
@@ -43,8 +59,10 @@
 	   backup-directory-alist `(("." . ,temporary-file-directory))
 	   auto-save-files-name-transforms `((".*" ,temporary-file-directory t))
 	   backup-by-copying t)
-
-  (set-face-attribute 'default nil :font "Fira Code 12")
+  (defun ccr/set-faces () (set-face-attribute 'default nil :font "Fira Code 12"))
+  (if (daemonp)
+      (add-hook 'server-after-make-frame-hook #'ccr/set-faces)
+      (ccr/set-faces))
   (menu-bar-mode -1)
   (scroll-bar-mode -1)
   (tool-bar-mode -1)
@@ -52,7 +70,7 @@
   (global-auto-revert-mode t)
   (show-paren-mode 1)
   (column-number-mode 1)
-  (unless (display-graphic-p)
+  (unless (display-graphic-p) ;; FIXME make it work when starting Emacs as daemon
     (advice-add 'enable-theme
 		:after
 		#'(lambda (&rest rest)
diff --git a/packages/packages.nix b/packages/packages.nix
index 9114ad2..976bc38 100644
--- a/packages/packages.nix
+++ b/packages/packages.nix
@@ -11,7 +11,6 @@ with epkgs; [
   orderless
   embark
   embark-consult
-  fira-code-mode
   vterm
   setup
   magit
@@ -43,4 +42,5 @@ with epkgs; [
   dirvish
   diredfl
   pdf-tools
+  ligature
 ]