Merge branch 'master' of git.billenius.com:love/emacs

.emacs

@@ -97,7 +97,6 @@
 ;; Apply theme at startup
 (my/set-theme-based-on-appearance)
 
-
 ;; ===========================
 ;; UI Customizations
 ;; ===========================
@@ -124,7 +123,15 @@
 (global-visual-line-mode 1)
 
 ;; Set Default Font to Iosevka 18pt
-(set-face-attribute 'default nil :family "Iosevka" :height 150)
+;;(set-face-attribute 'default nil :family "Iosevka" :height 150)
+;; Set font
+(set-face-attribute 'default nil
+  :family "JetBrains Mono Nerd Font"
+  :height 140 
+  :weight 'normal
+  :width 'normal)
+;; Line spacing 
+(setq-default line-spacing 0)
 
 ;; Backup files -> ~/.emacs.d/backups/
 (setq backup-directory-alist `(("." . "~/.emacs.d/backups"))
@@ -280,7 +287,7 @@
  ;; If there is more than one, they won't work right.
  '(helm-minibuffer-history-key "M-p")
  '(package-selected-packages
-   '(lsp-mode lsp-pyright zenburn-theme which-key solarized-theme rust-mode projectile poetry magit lsp-ui lsp-treemacs kotlin-mode helm flycheck evil-collection dracula-theme company better-defaults)))
+   '(catppuccin-theme lsp-pyright zenburn-theme which-key solarized-theme rust-mode projectile poetry magit lsp-ui lsp-treemacs kotlin-mode helm flycheck evil-collection dracula-theme company better-defaults)))
 (custom-set-faces
  ;; custom-set-faces was added by Custom.
  ;; If you edit it by hand, you could mess it up, so be careful.