diff --git a/.emacs.d/init.el b/.emacs.d/init.el index 0403428..26cf99d 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -42,7 +42,7 @@ '(global-hl-line-mode t) '(package-selected-packages (quote - (yasnippet org-pdftools phps-mode projectile webfeeder znc pinboard yaml-mode which-key web-mode virtualenvwrapper use-package twittering-mode try smex racer powershell poetry pipenv ox-reveal outline-magic org-pdfview org-bullets ob-restclient multiple-cursors magit lua-mode lsp-ui iedit helm flycheck-rust exec-path-from-shell eglot edit-indirect company-lsp ansible ace-window)))) + (fira-code-mode yasnippet org-pdftools phps-mode projectile webfeeder znc pinboard yaml-mode which-key web-mode virtualenvwrapper use-package twittering-mode try smex racer powershell poetry pipenv ox-reveal outline-magic org-pdfview org-bullets ob-restclient multiple-cursors magit lua-mode lsp-ui iedit helm flycheck-rust exec-path-from-shell eglot edit-indirect company-lsp ansible ace-window)))) '(znc-servers `(("bouncer.awful.club" 5000 t ((freenode "blindidiotgod/freenode" ,znc-password) diff --git a/.emacs.d/jlj-generic.el b/.emacs.d/jlj-generic.el index 8779d25..15b526b 100644 --- a/.emacs.d/jlj-generic.el +++ b/.emacs.d/jlj-generic.el @@ -8,7 +8,7 @@ (setq case-fold-search t) ; ignore case when searching (fset 'yes-or-no-p 'y-or-n-p) ; make it easier to answer qs. -(set-frame-font "Consolas 12") ; set default font +(set-frame-font "fira code 12") ; set default font (transient-mark-mode 1) ; Enable transient mark mode (highlights) (load-theme 'manoj-dark) ; loads my favorite default theme (global-hl-line-mode t) ; highlights the line you're on @@ -26,6 +26,10 @@ :config (yas-minor-mode-on)) +(use-package fira-code-mode + :custom (fira-code-mode-disabled-ligatures '("[]" "#{" "#(" "#_" "#_(" "x")) ;; List of ligatures to turn off + :config (global-fira-code-mode)) ;; Enables fira-code-mode globally + ;; lets you find all instance of string @ point with C-; (use-package iedit :ensure t)