rice

commit 38cf0e12de4b00af7c31346490cfaf9dbc3e6663
parent 5feecca34d534e4890f2b49a4f27e020b3a41935
Author: Mark Feller <mfeller@recurly.com>
Date:   Wed, 18 Dec 2019 13:24:20 -0700

emacs cleanup modules

Signed-off-by: Mark Feller <mfeller@recurly.com>

Diffstat:
M
dots/.emacs.d/core/core-bootstrap.el
 | 
1
+
M
dots/.emacs.d/core/core-ui.el
 | 
2
+-
M
dots/.emacs.d/init.el
 | 
1
+
M
dots/.emacs.d/lisp/redeam.el
 | 
8
++++++--
M
dots/.emacs.d/modules/module-evil.el
 | 
1
+
M
dots/.emacs.d/modules/module-go.el
 | 
8
+++++---
M
dots/.emacs.d/modules/module-org.el
 | 
1
+
M
dots/.emacs.d/modules/module-restclient.el
 | 
1
+
D
dots/.emacs.d/network-security.data
 | 
3
---
A
dots/.emacs.d/snippets/org-mode/sh
 | 
8
++++++++
D
dots/.emacs.d/transient/history.el
 | 
2
--

11 files changed, 25 insertions(+), 11 deletions(-)
diff --git a/dots/.emacs.d/core/core-bootstrap.el b/dots/.emacs.d/core/core-bootstrap.el
@@ -28,6 +28,7 @@
 
 (setq package-archives
       '(("melpa-stable" . "http://melpa-stable.milkbox.net/packages/")
+        ("melpa"        . "http://melpa.milkbox.net/packages/")
         ("gnu"          . "http://elpa.gnu.org/packages/")
         ("org"          . "http://orgmode.org/elpa/")))
 
diff --git a/dots/.emacs.d/core/core-ui.el b/dots/.emacs.d/core/core-ui.el
@@ -56,7 +56,7 @@
 
 (setq-default fill-column 80)
 
-(add-hook 'before-save-hook 'whitespace-cleanup)
+(add-hook 'before-save-hook 'delete-tailing-whitespace)
 
 (setq echo-keystrokes 0.1)
 
diff --git a/dots/.emacs.d/init.el b/dots/.emacs.d/init.el
@@ -111,6 +111,7 @@
 (require 'module-bbdb)
 (require 'module-c)
 (require 'module-company)
+(require 'module-docker)
 (require 'module-eldoc)
 (require 'module-emacs-lisp)
 (require 'module-evil)
diff --git a/dots/.emacs.d/lisp/redeam.el b/dots/.emacs.d/lisp/redeam.el
@@ -1,8 +1,12 @@
-(setenv "CORE" (substitute-in-file-name "$GOPATH/src/gitlab.com/redeam/core"))
-(setenv "OPS" (substitute-in-file-name "$GOPATH/src/gitlab.com/redeam/ops"))
+(setenv "RECURLY" (substitute-in-file-name "$GOPATH/src/githum.com/recurly"))
 
 (defvar redeam/backplane "https://backplane.develop.redeam.io/v1")
 
+(defun recurly ()
+  "open recurly go code direcrtory"
+  (interactive)
+  (counsel-find-file (getenv "RECURLY")))
+
 (defun core ()
   "open file in core"
   (interactive)
diff --git a/dots/.emacs.d/modules/module-evil.el b/dots/.emacs.d/modules/module-evil.el
@@ -72,6 +72,7 @@
   :config (evil-snipe-override-mode t))
 
 (use-package evil-org
+  :disabled
   :delight (evil-org-mode)
   :config
   (progn (add-hook 'org-mode-hook 'evil-org-mode)
diff --git a/dots/.emacs.d/modules/module-go.el b/dots/.emacs.d/modules/module-go.el
@@ -22,8 +22,11 @@
 ;;; Code:
 
 ;; set gopath unless it has already been set
+(defvar go-compile-command "go build -v && go vet && go test -covermode=count -coverprofile=out.cover")
+
 (unless (getenv "GOPATH")
   (setenv "GOPATH" (concat (getenv "HOME") "/prog/go")))
+(setenv "PATH" (concat (getenv "PATH") ":/Users/mfeller/prog/go/bin"))
 
 (use-package go-mode
   :bind (:map go-mode-map
@@ -32,7 +35,7 @@
               ("C-c C-t" . ginkgo-test)
               ("C-c C"   . go-cover))
   :config
-  (progn (setq gofmt-command "gofumports") ; use goimports instead of go-fmt
+  (progn (setq gofmt-command "goimports") ; use goimports instead of go-fmt
          (setq godoc-command "godoc")     ; use godoc instead of go doc
          (setq tab-width 4)
 
@@ -73,9 +76,8 @@
 
          (defun setup-go-mode-compile ()
            "Customize compile command to run go build"
-           (if (not (string-match "go" compile-command))
                (set (make-local-variable 'compile-command)
-                    "go build -v && go vet && go test -covermode=count -coverprofile=out.cover")))
+                    go-compile-command))
 
          (add-hook 'go-mode-hook 'setup-go-mode-compile)
          (add-hook 'go-mode-hook 'subword-mode)
diff --git a/dots/.emacs.d/modules/module-org.el b/dots/.emacs.d/modules/module-org.el
@@ -31,6 +31,7 @@
   :config
   (progn (require 'org-indent)
          (require 'org-src)
+         (require 'ob-shell)
 
          (setq org-startup-indented t)
          (setq org-src-tab-acts-natively t)
diff --git a/dots/.emacs.d/modules/module-restclient.el b/dots/.emacs.d/modules/module-restclient.el
@@ -24,6 +24,7 @@
 (use-package restclient)
 
 (use-package company-restclient
+  :disabled
   :after (restclient company))
 
 (provide 'module-restclient)
diff --git a/dots/.emacs.d/network-security.data b/dots/.emacs.d/network-security.data
@@ -1,3 +0,0 @@
-(
- (:id "sha1:4d7e016b7e6ab8f2d757b1c54223bca988091e57" :fingerprint "sha1:78:7a:50:a8:5e:68:70:54:c8:95:91:41:1f:9c:fa:64:49:c7:09:b9" :host "melpa-stable.milkbox.net:443" :conditions (:no-host-match))
-)
diff --git a/dots/.emacs.d/snippets/org-mode/sh b/dots/.emacs.d/snippets/org-mode/sh
@@ -0,0 +1,7 @@
+# -*- mode: org -*-
+# name: shell
+# key: sh
+# --
+#+begin_src zsh
+  $0
+#+end_src+
\ No newline at end of file
diff --git a/dots/.emacs.d/transient/history.el b/dots/.emacs.d/transient/history.el
@@ -1 +0,0 @@
-nil-
\ No newline at end of file