Ligature and parinfer issues now gone

inscapist · Dec 11, 2020 · dd437f6 · dd437f6
1 parent 8a84de9
commit dd437f6
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 13 deletions.
diff --git a/.doom.d/+bindings.el b/.doom.d/+bindings.el
@@ -14,7 +14,7 @@
       :nv "rb" #'revert-bufferm
       :nv "rc" #'lsp-workspace-restart)
 
- ;; Easier navigation
+;; Easier navigation
 (map! :ne "C-h"   #'evil-window-left
       :ne "C-l"   #'evil-window-right
       :ne "C-j"   #'evil-window-down
@@ -63,7 +63,7 @@
       "tt" #'origami-mode)
 (map! :after origami
       (:map origami-mode-map
-            [tab] #'origami-toggle-node))
+       [tab] #'origami-toggle-node))
 
 ;; Easier window split
 (map! :leader

diff --git a/.doom.d/+langs.el b/.doom.d/+langs.el
@@ -26,3 +26,6 @@
 
 (setq-hook! 'web-mode-hook +format-with 'prettier)
 (setq-hook! 'html-mode-hook +format-with 'prettier)
+
+(after! rustic
+  (setq rustic-lsp-server 'rls))
diff --git a/.doom.d/+ui.el b/.doom.d/+ui.el
@@ -7,21 +7,26 @@
 ;; To disable font smoothing, run
 ;; defaults write org.gnu.Emacs AppleFontSmoothing -int 0
 ;;
-(setq felix/default-font "Iosevka Maya"
-      felix/default-font-size 13
+(setq felix/default-font "Victor Mono"
+      felix/default-font-size 12
       felix/default-font-weight 'normal
       felix/ui-font "Unica One"
       felix/ui-font-size 12
       felix/ui-font-weight 'bold
-      felix/mode-line-height 0.9)
+      felix/mode-line-height 0.95)
 
 (setq doom-theme 'doom-miramare
-      doom-themes-enable-bold nil
+      doom-themes-enable-bold t
       doom-themes-enable-italic t
       doom-font (font-spec :family felix/default-font :size felix/default-font-size :weight felix/default-font-weight)
       doom-variable-pitch-font (font-spec :family felix/ui-font :size felix/ui-font-size :weight felix/ui-font-weight)
       all-the-icons-scale-factor 0.9)
 
+;; configure nord-theme
+;; (after! nord-theme
+;;   (setq nord-uniform-mode-lines nil
+;;         nord-region-highlight "frost"))
+
 
 ;; disable shortmenu
 (remove-hook '+doom-dashboard-functions #'doom-dashboard-widget-shortmenu)
@@ -35,7 +40,7 @@
 
 (custom-set-faces!
   `(font-lock-comment-face :slant italic)
-  `(font-lock-keyword-face :slant italic)
+  `(font-lock-keyword-face :slant normal)
   `(treemacs-root-face :family ,felix/ui-font :size ,felix/ui-font-size :weight ,felix/ui-font-weight)
 
   ;; https://discordapp.com/channels/406534637242810369/603399769015975996/765837027152363550

diff --git a/.doom.d/init.el b/.doom.d/init.el
@@ -48,7 +48,7 @@
        ;;vi-tilde-fringe   ; fringe tildes to mark beyond EOB
        ;;window-select     ; visually switch windows
        workspaces        ; tab emulation, persistence & separate workspaces
-       zen               ; distraction-free coding or writing
+       ;;zen               ; distraction-free coding or writing
 
        :editor
        (evil +everywhere); come to the dark side, we have cookies
@@ -59,7 +59,7 @@
        ;;lispy             ; vim for lisp, for people who don't like vim
        ;;multiple-cursors  ; editing in many places at once
        ;;objed             ; text object editing for the innocent
-       ;;parinfer          ; turn lisp into python, sort of
+       parinfer          ; turn lisp into python, sort of
        ;;rotate-text       ; cycle region at point between text candidates
        snippets          ; my elves. They type so I don't have to
        ;;word-wrap         ; soft wrapping with language-aware indent
@@ -156,7 +156,7 @@
        ;;rest              ; Emacs as a REST client
        ;;rst               ; ReST in peace
        ;;(ruby +rails)     ; 1.step {|i| p "Ruby is #{i.even? ? 'love' : 'life'}"}
-       rust              ; Fe2O3.unwrap().unwrap().unwrap().unwrap()
+       (rust +lsp)              ; Fe2O3.unwrap().unwrap().unwrap().unwrap()
        ;;scala             ; java, but good
        ;;scheme            ; a fully conniving family of lisps
        sh                ; she sells {ba,z,fi}sh shells on the C xor
@@ -176,7 +176,7 @@
        ;;calendar
        ;;irc               ; how neckbeards socialize
        (rss +org)        ; emacs as an RSS reader
-       ;;twitter           ; twitter client https://twitter.com/vnought
+       twitter           ; twitter client https://twitter.com/vnought
 
        :config
        ;;literate

diff --git a/.doom.d/packages.el b/.doom.d/packages.el
@@ -56,7 +56,10 @@
 (package! origami)
 (package! graphviz-dot-mode)
 
-;; Themes
-;; (package! kaolin-themes)
+;; Use latest packages
 (package! doom-themes :recipe (:branch "master"))
 (package! format-all :recipe (:branch "master"))
+(package! nord-theme :recipe
+  (:host github
+   :repo "arcticicestudio/nord-emacs"
+   :branch "develop"))