Skip to content

Commit

Permalink
Fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
Tim Deeb-Swihart committed Aug 26, 2020
1 parent 02f333f commit e68ae85
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 7 deletions.
6 changes: 5 additions & 1 deletion doom.d/config.el
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions doom.d/init.el
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions doom.d/packages.el
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions doom.d/snippets/go-mode/goblin-it
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# -*- mode: snippet -*-
# name: goblin It
# name: ginkgo It
# key: gi
# --

It("should $1", func() {
$0
${0:Fail("FIXME")}
})
14 changes: 12 additions & 2 deletions install.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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")


Expand Down

0 comments on commit e68ae85

Please sign in to comment.