From e68ae852224d72f03e7c0df9c26f1231381f67a9 Mon Sep 17 00:00:00 2001 From: Tim Deeb-Swihart Date: Wed, 26 Aug 2020 10:01:29 -0400 Subject: [PATCH] Fixes --- doom.d/config.el | 6 +++++- doom.d/init.el | 4 ++-- doom.d/packages.el | 1 + doom.d/snippets/go-mode/goblin-it | 4 ++-- install.py | 14 ++++++++++++-- 5 files changed, 22 insertions(+), 7 deletions(-) diff --git a/doom.d/config.el b/doom.d/config.el index 50a3240..80d7dcd 100644 --- a/doom.d/config.el +++ b/doom.d/config.el @@ -21,12 +21,14 @@ ;; font string. You generally only need these two: ;; (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 "Fira Code Retina-16") ;; 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 ;; `load-theme' function. This is the default: (setq doom-theme 'doom-one) + ;; If you use `org' and don't want your org files in the default location below, ;; change `org-directory'. It must be set before org loads! (defvar beorg-path "~/Library/Mobile Documents/iCloud~com~appsonthemove~beorg/Documents/org") @@ -266,6 +268,8 @@ _s-k_: Kill all buffers _p_: sw (setq avy-keys '(?a ?o ?e ?u ?i ?d ?h ?t ?n ?s)) +(after! magit + (magit-todos-mode 1)) ; Some handy leader bindings from my old custom config (map! :leader :desc "Switch to buffer" "d" #'switch-to-buffer diff --git a/doom.d/init.el b/doom.d/init.el index e4d135c..9e09cfb 100644 --- a/doom.d/init.el +++ b/doom.d/init.el @@ -39,7 +39,7 @@ neotree ; a project drawer, like NERDTree for vim ophints ; highlight the region an operation acts on (popup +defaults) ; tame sudden yet inevitable temporary windows - (pretty-code +fira) ; ligatures or substitute text with pretty symbols + (pretty-code) ; ligatures or substitute text with pretty symbols ;;tabs ; a tab bar for Emacs ;;treemacs ; a project drawer, like neotree but cooler ;;unicode ; extended unicode support for various languages @@ -145,7 +145,7 @@ ;;php ; perl's insecure younger brother ;;plantuml ; diagrams for confusing people more ;;purescript ; javascript, but functional - (python +lsp +poetry) ; beautiful is better than ugly + (python +pyright +lsp +poetry) ; beautiful is better than ugly ;;qt ; the 'cutest' gui framework ever ;;racket ; a DSL for DSLs ;;raku ; the artist formerly known as perl6 diff --git a/doom.d/packages.el b/doom.d/packages.el index 5f20034..fd95619 100644 --- a/doom.d/packages.el +++ b/doom.d/packages.el @@ -11,6 +11,7 @@ (package! company-tabnine) (package! envrc) +(package! olivetti) ;; To install a package directly from a remote git repo, you must specify a ;; `:recipe'. You'll find documentation on what `:recipe' accepts here: ;; https://github.com/raxod502/straight.el#the-recipe-format diff --git a/doom.d/snippets/go-mode/goblin-it b/doom.d/snippets/go-mode/goblin-it index ec6bfde..f8e62ca 100644 --- a/doom.d/snippets/go-mode/goblin-it +++ b/doom.d/snippets/go-mode/goblin-it @@ -1,8 +1,8 @@ # -*- mode: snippet -*- -# name: goblin It +# name: ginkgo It # key: gi # -- It("should $1", func() { - $0 + ${0:Fail("FIXME")} }) \ No newline at end of file diff --git a/install.py b/install.py index 65c570f..675b172 100644 --- a/install.py +++ b/install.py @@ -2,7 +2,7 @@ from contextlib import contextmanager from glob import glob import json -from subprocess import check_output, STDOUT +from subprocess import check_output, STDOUT, CalledProcessError from tempfile import NamedTemporaryFile import sys import os @@ -46,7 +46,17 @@ def mkdir(path): def runcmd(cmd): - out = check_output(cmd, shell=True, stderr=STDOUT) + try: + out = check_output(cmd, shell=True, stderr=STDOUT) + except CalledProcessError as e: + out = e.stdout + err = e.stderr + if out is not None: + print(out.strip().decode(errors="ignore")) + if err is not None: + print(err.strip().decode(errors="ignore")) + raise + return out.strip().decode(errors="ignore")