updates

doom/config.el

@@ -22,7 +22,7 @@
 ;; (setq doom-font (font-spec :family "monospace" :size 12 :weight 'semi-light)
 ;;       doom-variable-pitch-font (font-spec :family "sans" :size 13))
 ;; (setq doom-font (font-spec :family "FiraCode Nerd Font" :size 14))
-(setq doom-font (font-spec :family "mononoki Nerd Font Mono" :size 18))
+(setq doom-font (font-spec :family "FiraCode Nerd Font" :size 18))
 
 ;; There are two ways to load a theme. Both assume the theme is installed and
 ;; available. You can either set `doom-theme' or manually load a theme with the
@@ -82,6 +82,8 @@
   :hook
   (sh-mode . 'lsp))
 
+(setq lsp-enable-folding t)
+
 (add-hook 'python-mode 'python-pylint)
 
 (add-hook 'sh-mode-hook 'flycheck-mode)
@@ -122,7 +124,7 @@
 (use-package! company-tabnine :ensure t)
 
 (after! company
-    (setq +lsp-company-backends '(company-tabnine :separate company-capf company-yasnippet))
+    (setq +lsp-company-backends '(company-tabnine :separate company-capf company-yasnippet company-shell))
     (setq company-show-quick-access t)
     (setq company-idle-delay 0)
 )
@@ -140,9 +142,14 @@
 ;; (defun my/python-mode-hook ()
 ;;   (add-to-list 'company-backends 'company-jedi))
 
-(add-to-list 'company-backends 'company-shell)
 
 (setq jedi:setup-keys t)
 (setq jedi:complete-on-dot t)
-(setq jedi:environment-virtualenv ["source", "env/bin/activate"])
+(setq jedi:environment-virtualenv ["source", "./env/bin/activate"])
+(setq jedi:key-complete ["Tab"])
 (add-hook 'python-mode-hook 'jedi:setup)
+
+(setq format-all-debug nil)
+;; (global-fira-code-mode)
+;; Enable fira-code-mode automatically for programming major modes
+(add-hook 'prog-mode-hook 'fira-code-mode)

doom/init.el

@@ -34,8 +34,8 @@
        (emoji +unicode)  ; 🙂
        hl-todo           ; highlight TODO/FIXME/NOTE/DEPRECATED/HACK/REVIEW
        ;;hydra
-       ;;indent-guides     ; highlighted indent columns
-       ;;ligatures         ; ligatures and symbols to make your code pretty again
+       indent-guides     ; highlighted indent columns
+       (ligatures +fira)         ; ligatures and symbols to make your code pretty again
        minimap           ; show a map of the code on the side
        modeline          ; snazzy, Atom-inspired modeline, plus API
        ;;nav-flash         ; blink cursor line after big motions
@@ -68,7 +68,7 @@
        :emacs
        (dired +icons)             ; making dired pretty [functional]
        electric          ; smarter, keyword-based electric-indent
-       ;;ibuffer         ; interactive buffer management
+       (ibuffer +icons)         ; interactive buffer management
        undo              ; persistent, smarter undo for your inevitable mistakes
        vc                ; version-control and Emacs, sitting in a tree
 
@@ -89,7 +89,7 @@
        direnv
        docker
        ;;editorconfig      ; let someone else argue about tabs vs spaces
-       ;;ein               ; tame Jupyter notebooks with emacs
+       ein               ; tame Jupyter notebooks with emacs
        (eval +overlay)     ; run code, run (also, repls)
        gist              ; interacting with github gists
        lookup              ; navigate your code and its documentation
@@ -112,7 +112,7 @@
        :lang
        ;;agda              ; types of types of types of types...
        ;;beancount         ; mind the GAAP
-       cc                ; C > C++ == 1
+       (cc +lsp)                ; C > C++ == 1
        ;;clojure           ; java with a lisp
        ;;common-lisp       ; if you've seen one lisp, you've seen them all
        ;;coq               ; proofs-as-programs
@@ -137,14 +137,14 @@
        ;;idris             ; a language you can depend on
        json              ; At least it ain't XML
        (java +meghanada) ; the poster child for carpal tunnel syndrome
-       javascript        ; all(hope(abandon(ye(who(enter(here))))))
+       (javascript +lsp)        ; all(hope(abandon(ye(who(enter(here))))))
        ;;julia             ; a better, faster MATLAB
        ;;kotlin            ; a better, slicker Java(Script)
        ;;latex             ; writing papers in Emacs has never been so fun
        ;;lean              ; for folks with too much to prove
        ;;ledger            ; be audit you can be
        ;;lua               ; one-based indices? one-based indices
-       markdown          ; writing docs for people to ignore
+       (markdown +grip)          ; writing docs for people to ignore
        ;;nim               ; python + lisp at the speed of c
        nix               ; I hereby declare "nix geht mehr!"
        ;;ocaml             ; an objective camel

doom/packages.el

@@ -62,9 +62,10 @@
 
 (package! py-isort)
 (package! python-pytest)
-(package! ein)
 (package! python-docstring)
 (package! py-autopep8)
 
 (package! diredfl)
 (package! peep-dired)
+
+(package! fira-code-mode)