diff --git a/nix/config/emacs/init.el b/nix/config/emacs/init.el
index bcc049d..e0bca7e 100644
--- a/nix/config/emacs/init.el
+++ b/nix/config/emacs/init.el
@@ -102,9 +102,9 @@
   (corfu-popupinfo-mode)
   :config
   (add-hook 'eshell-mode-hook
-          (lambda ()
-            (setq-local corfu-auto nil)
-            (corfu-mode))))
+            (lambda ()
+              (setq-local corfu-auto nil)
+              (corfu-mode))))
 
 (use-package diff-hl
   :hook ((magit-pre-refresh . diff-hl-magit-pre-refresh)
@@ -269,7 +269,7 @@
            :default-weight semilight
            :default-height 250)
           (t
-           :default-family "Cascadia Code"
+           :default-family "Fira Code"
            :default-weight regular
            :default-height 130
            :fixed-pitch-height 1.0
@@ -324,26 +324,36 @@
   :after fontaine
   :config
   (defun to/set-ligatures-for-font (font-family)
-  (let ((ligatures
-         (cond ((string= font-family "Iosevka Comfy")
-                '("<---" "<--" "<<-" "<-" "->" "-->" "--->" "<->" "<-->" "<--->"
-                  "<---->" "<!--" "<==" "<===" "<=" "=>" "=>>" "==>" "===>" ">="
-                  "<=>" "<==>" "<===>" "<====>" "<!---" "<~~" "<~" "~>" "~~>" "::"
-                  ":::" "==" "!=" "===" "!==" ":=" ":-" ":+" "<*" "<*>" "*>" "<|"
-                  "<|>" "|>" "+:" "-:" "=:" "<******>" "++" "+++"))
-               ((string= font-family "Cascadia Code")
-                '("www" "--" "---" "-~" "(*" "{|" "}#" "[|" "]#" ".-" ".." "..." "..="
-                  "..<" ".?" ".=" "::" ":::" "::=" ":=" "://" ";;" "!." "!:" "!!" "!!."
-                  "!=" "!==" "?." "?:" "??" "??=" "?=" "*)" "**" "***" "*>" "*/" "#("
-                  "#{" "#[" "#:" "#!" "#?" "#=" "#_" "#_(" "/*" "/>" "//" "///" "/\\"
-                  "\\\\" "&&" "|}" "|]" "||" "|||" "|||>" "|>" "$>" "++" "+++" "+>" "=="
-                  "===" "=>>" "=<<" ">=" ">>" ">>=" ">>>" "<!--" "<*" "<*>" "<|" "<||"
-                  "<|||" "<|>" "<$" "<$>" "<+" "<+>" "<=" "<>" "<<" "<<=" "<<<" "<~"
-                  "<~>" "<~~" "</" "</>" "~-" "~@" "~=" "~>" "~~" "~~>" "^=" "%%"
-                  "->" "-->" "--->" "<-" "<--" "<---"))
-               (t
-                '()))))
-    (ligature-set-ligatures 'prog-mode ligatures)))
+    (let ((ligatures
+           (cond ((string= font-family "Iosevka Comfy")
+                  '("<---" "<--" "<<-" "<-" "->" "-->" "--->" "<->" "<-->" "<--->"
+                    "<---->" "<!--" "<==" "<===" "<=" "=>" "=>>" "==>" "===>" ">="
+                    "<=>" "<==>" "<===>" "<====>" "<!---" "<~~" "<~" "~>" "~~>" "::"
+                    ":::" "==" "!=" "===" "!==" ":=" ":-" ":+" "<*" "<*>" "*>" "<|"
+                    "<|>" "|>" "+:" "-:" "=:" "<******>" "++" "+++"))
+                 ((string= font-family "Cascadia Code")
+                  '("www" "--" "---" "-~" "(*" "{|" "}#" "[|" "]#" ".-" ".." "..." "..="
+                    "..<" ".?" ".=" "::" ":::" "::=" ":=" "://" ";;" "!." "!:" "!!" "!!."
+                    "!=" "!==" "?." "?:" "??" "??=" "?=" "*)" "**" "***" "*>" "*/" "#("
+                    "#{" "#[" "#:" "#!" "#?" "#=" "#_" "#_(" "/*" "/>" "//" "///" "/\\"
+                    "\\\\" "&&" "|}" "|]" "||" "|||" "|||>" "|>" "$>" "++" "+++" "+>" "=="
+                    "===" "=>>" "=<<" ">=" ">>" ">>=" ">>>" "<!--" "<*" "<*>" "<|" "<||"
+                    "<|||" "<|>" "<$" "<$>" "<+" "<+>" "<=" "<>" "<<" "<<=" "<<<" "<~"
+                    "<~>" "<~~" "</" "</>" "~-" "~@" "~=" "~>" "~~" "~~>" "^=" "%%"
+                    "->" "-->" "--->" "<-" "<--" "<---"))
+                 ((string= font-family "Fira Code")
+                  '("www" "**" "***" "**/" "*>" "*/" "\\\\" "\\\\\\" "{-" "[]" "::"
+                    ":::" ":=" "!!" "!=" "!==" "-}" "--" "---" "-->" "->" "->>" "-<"
+                    "-<<" "-~" "#{" "#[" "##" "###" "####" "#(" "#?" "#_" "#_(" ".-"
+                    ".=" ".." "..<" "..." "?=" "??" ";;" "/*" "/**" "/=" "/==" "/>"
+                    "//" "///" "&&" "||" "||=" "|=" "|>" "^=" "$>" "++" "+++" "+>"
+                    "=:=" "==" "===" "==>" "=>" "=>>" "<=" "=<<" "=/=" ">-" ">=" ">=>"
+                    ">>" ">>-" ">>=" ">>>" "<*" "<*>" "<|" "<|>" "<$" "<$>" "<!--"
+                    "<-" "<--" "<->" "<+" "<+>" "<=" "<==" "<=>" "<=<" "<>" "<<" "<<-"
+                    "<<=" "<<<" "<~" "<~~" "</" "</>" "~@" "~-" "~=" "~>" "~~" "~~>"
+                    "%%" "x" ":" "+" "+" "*"))
+                 (t '()))))
+      (ligature-set-ligatures 'prog-mode ligatures)))
 
   (to/set-ligatures-for-font (face-attribute 'default :family))
   (global-ligature-mode t))
@@ -352,10 +362,10 @@
   :hook
   ((lsp-mode . lsp-diagnostics-mode)
    ((js-mode
-    js-ts-mode
-    js-jsx-mode
-    typescript-ts-mode
-    tsx-ts-mode) . lsp-deferred)
+     js-ts-mode
+     js-jsx-mode
+     typescript-ts-mode
+     tsx-ts-mode) . lsp-deferred)
    ((python-mode python-ts-mode) . lsp)
    (nix-mode . lsp)
    ((swift-mode swift-ts-mode) .lsp))
@@ -404,8 +414,8 @@
   (load-theme 'modus-vivendi-tinted :no-confirm))
 
 (use-package minions
-    :config
-    (minions-mode))
+  :config
+  (minions-mode))
 
 (use-package multiple-cursors
   :bind
@@ -459,10 +469,10 @@
   :after org
   :defer 3
   :config
-    (org-babel-do-load-languages
-     'org-babel-load-languages
-     (append org-babel-load-languages
-             '((swift . t)))))
+  (org-babel-do-load-languages
+   'org-babel-load-languages
+   (append org-babel-load-languages
+           '((swift . t)))))
 
 (use-package olivetti
   :hook (org-mode markdown-mode)
diff --git a/nix/config/kitty/kitty.conf b/nix/config/kitty/kitty.conf
index 6b4257e..5019b51 100644
--- a/nix/config/kitty/kitty.conf
+++ b/nix/config/kitty/kitty.conf
@@ -1,4 +1,4 @@
-font_family Cascadia Code
+font_family Fira Code
 font_size 13.0
 hide_window_decorations yes
 tab_bar_style slant