From b99cb3ceca1e7e24e1c0c68942ca8efc0666728f Mon Sep 17 00:00:00 2001
From: Sravan Balaji <balajsra@umich.edu>
Date: Mon, 7 Jun 2021 08:35:25 -0400
Subject: [PATCH] Fix Ligature Issue & Add Makefile to Org babel Languages

- Replace ligature package submodule with fira code mode
- Add makefile to org babel languages
---
 .gitmodules          |  4 ----
 README.org           | 38 ++++++++++----------------------------
 init.el              | 39 ++++-----------------------------------
 packages/ligature.el |  1 -
 4 files changed, 14 insertions(+), 68 deletions(-)
 delete mode 160000 packages/ligature.el

diff --git a/.gitmodules b/.gitmodules
index 42ca94c..e69de29 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,4 +0,0 @@
-[submodule "packages/ligature.el"]
-	path = packages/ligature.el
-	url = git@github.com:mickeynp/ligature.el.git
-    branch = master
diff --git a/README.org b/README.org
index 0fc1b0e..5195a52 100644
--- a/README.org
+++ b/README.org
@@ -111,33 +111,16 @@ Setup FiraCode and Cantarell fonts with specified size.
 
 ** Ligature Support
 
-Add ligature support for Fira Code font.
+Add ligature support using Fira Code symbols.
 
-- https://github.com/tonsky/FiraCode/wiki/Emacs-instructions#using-ligatureel
+*NOTE*: The first time you load your configuration on a new machine, you'll need to run the following command interactively so that ligature symbols display correctly:
+
+~M-x fira-code-mode-install-fonts RET~
 
 #+begin_src emacs-lisp :tangle init.el
-  (use-package ligature
-    :load-path "./packages/ligature.el"
-    :config
-    ;; Enable the "www" ligature in every possible major mode
-    (ligature-set-ligatures 't '("www"))
-    ;; Enable traditional ligature support in eww-mode, if the
-    ;; `variable-pitch' face supports it
-    (ligature-set-ligatures 'eww-mode '("ff" "fi" "ffi"))
-    ;; Enable ligatures in programming modes (Fira Code)
-    (ligature-set-ligatures 'prog-mode '("www" "**" "***" "**/" "*>" "*/" "\\\\" "\\\\\\" "{-" "::"
-                                         ":::" ":=" "!!" "!=" "!==" "-}" "----" "-->" "->" "->>"
-                                         "-<" "-<<" "-~" "#{" "#[" "##" "###" "####" "#(" "#?" "#_"
-                                         "#_(" ".-" ".=" ".." "..<" "..." "?=" "??" ";;" "/*" "/**"
-                                         "/=" "/==" "/>" "//" "///" "&&" "||" "||=" "|=" "|>" "^=" "$>"
-                                         "++" "+++" "+>" "=:=" "==" "===" "==>" "=>" "=>>" "<="
-                                         "=<<" "=/=" ">-" ">=" ">=>" ">>" ">>-" ">>=" ">>>" "<*"
-                                         "<*>" "<|" "<|>" "<$" "<$>" "<!--" "<-" "<--" "<->" "<+"
-                                         "<+>" "<=" "<==" "<=>" "<=<" "<>" "<<" "<<-" "<<=" "<<<"
-                                         "<~" "<~~" "</" "</>" "~@" "~-" "~>" "~~" "~~>" "%%"))
-    ;; Enables ligature checks globally in all buffers. You can also do it
-    ;; per mode with `ligature-mode'.
-    (global-ligature-mode t))
+  (use-package fira-code-mode
+    :custom (fira-code-mode-disabled-ligatures '("[]" "#{" "#(" "#_" "#_(" "x")) ;; List of ligatures to turn off
+    :hook prog-mode) ;; Enables fira-code-mode automatically for programming major modes
 #+end_src
 
 * Keybindings
@@ -221,11 +204,9 @@ Add ligature support for Fira Code font.
 #+end_src
 ** Better Modeline
 
-*NOTE*: The first time you load your configuration on a new machine, you'll
-need to run the following command interactively so that mode line icons
-display correctly:
+*NOTE*: The first time you load your configuration on a new machine, you'll need to run the following command interactively so that mode line icons display correctly:
 
-~M-x all-the-icons-install-fonts~
+~M-x all-the-icons-install-fonts RET~
 
 #+begin_src emacs-lisp :tangle init.el
   ;; Icon Fonts
@@ -541,6 +522,7 @@ Use Hydra to design a transient key binding for quickly adjusting the scale of t
   (org-babel-do-load-languages
     'org-babel-load-languages
     '((emacs-lisp . t)
+      (makefile . t)
       (python . t)))
 
   (push '("conf-unix" . conf-unix) org-src-lang-modes)
diff --git a/init.el b/init.el
index 590d5e8..dfab6a6 100644
--- a/init.el
+++ b/init.el
@@ -60,28 +60,9 @@
 ;; Set the variable pitch font
 (set-face-attribute 'variable-pitch nil :font sb/document-font :height sb/default-font-size :weight 'regular)
 
-(use-package ligature
-  :load-path "./packages/ligature.el"
-  :config
-  ;; Enable the "www" ligature in every possible major mode
-  (ligature-set-ligatures 't '("www"))
-  ;; Enable traditional ligature support in eww-mode, if the
-  ;; `variable-pitch' face supports it
-  (ligature-set-ligatures 'eww-mode '("ff" "fi" "ffi"))
-  ;; Enable ligatures in programming modes (Fira Code)
-  (ligature-set-ligatures 'prog-mode '("www" "**" "***" "**/" "*>" "*/" "\\\\" "\\\\\\" "{-" "::"
-                                       ":::" ":=" "!!" "!=" "!==" "-}" "----" "-->" "->" "->>"
-                                       "-<" "-<<" "-~" "#{" "#[" "##" "###" "####" "#(" "#?" "#_"
-                                       "#_(" ".-" ".=" ".." "..<" "..." "?=" "??" ";;" "/*" "/**"
-                                       "/=" "/==" "/>" "//" "///" "&&" "||" "||=" "|=" "|>" "^=" "$>"
-                                       "++" "+++" "+>" "=:=" "==" "===" "==>" "=>" "=>>" "<="
-                                       "=<<" "=/=" ">-" ">=" ">=>" ">>" ">>-" ">>=" ">>>" "<*"
-                                       "<*>" "<|" "<|>" "<$" "<$>" "<!--" "<-" "<--" "<->" "<+"
-                                       "<+>" "<=" "<==" "<=>" "<=<" "<>" "<<" "<<-" "<<=" "<<<"
-                                       "<~" "<~~" "</" "</>" "~@" "~-" "~>" "~~" "~~>" "%%"))
-  ;; Enables ligature checks globally in all buffers. You can also do it
-  ;; per mode with `ligature-mode'.
-  (global-ligature-mode t))
+(use-package fira-code-mode
+  :custom (fira-code-mode-disabled-ligatures '("[]" "#{" "#(" "#_" "#_(" "x")) ;; List of ligatures to turn off
+  :hook prog-mode) ;; Enables fira-code-mode automatically for programming major modes
 
 ;; Make ESC quit prompts
 (global-set-key (kbd "<escape>") 'keyboard-escape-quit)
@@ -407,6 +388,7 @@
 (org-babel-do-load-languages
   'org-babel-load-languages
   '((emacs-lisp . t)
+    (makefile . t)
     (python . t)))
 
 (push '("conf-unix" . conf-unix) org-src-lang-modes)
@@ -502,16 +484,3 @@
 ;; Rainbow Delimiters
 (use-package rainbow-delimiters
   :hook (prog-mode . rainbow-delimiters-mode))
-(custom-set-variables
- ;; custom-set-variables was added by Custom.
- ;; If you edit it by hand, you could mess it up, so be careful.
- ;; Your init file should contain only one such instance.
- ;; If there is more than one, they won't work right.
- '(package-selected-packages
-   '(doom-themes which-key vimrc-mode use-package rainbow-delimiters org-bullets org-auto-tangle magit lsp-ui lsp-treemacs lsp-ivy ivy-rich highlight-indent-guides helpful haskell-mode gitignore-mode gitconfig-mode gitattributes-mode general fish-mode evil-nerd-commenter evil-easymotion evil-collection doom-modeline counsel-projectile company-box auto-package-update)))
-(custom-set-faces
- ;; custom-set-faces was added by Custom.
- ;; If you edit it by hand, you could mess it up, so be careful.
- ;; Your init file should contain only one such instance.
- ;; If there is more than one, they won't work right.
- )
diff --git a/packages/ligature.el b/packages/ligature.el
deleted file mode 160000
index 3923baf..0000000
--- a/packages/ligature.el
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 3923baf1fb9bf509cc95b4b14d7d0e2f7c88e53c