Skip to content

Commit

Permalink
update config to handle emacs 27, add rust ob, disable org-gcal for now
Browse files Browse the repository at this point in the history
  • Loading branch information
irfn committed Nov 27, 2020
1 parent a422443 commit f0cd145
Show file tree
Hide file tree
Showing 8 changed files with 43 additions and 27 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,5 @@ elisp
smex-items
notes
org-gcal/
snippets/
snippets/
*~
2 changes: 1 addition & 1 deletion config.org
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
emacs lisp is not common lisp but can use cl libraries through this bridge.
#+NAME: common lisp
#+BEGIN_SRC emacs-lisp
(require 'cl)
(require 'cl-lib)
#+END_SRC

** Start emacs maximized
Expand Down
17 changes: 10 additions & 7 deletions custom.el
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,21 @@
;; If you edit it by hand, you could mess it up, so be careful.
;; Your init file should contain only one such instance.
;; If there is more than one, they won't work right.
'(ansi-color-names-vector
["#1C1B19" "#EF2F27" "#519F50" "#FED06E" "#2C78BF" "#E02C6D" "#0AAEB3" "#4E4E4E"])
'(custom-safe-themes
'("5a02bb308119dba4fe2e2d1a6af221075a7f932afdc73f39e6967a0560fadf0e" default))
'(org-agenda-files "~/.agenda_files")
'(package-archives
(quote
(("org" . "http://orgmode.org/elpa/")
'(("org" . "http://orgmode.org/elpa/")
("gnu" . "http://elpa.gnu.org/packages/")
("melpa" . "https://melpa.org/packages/")
("ox-odt" . "https://kjambunathan.github.io/elpa/"))))
("ox-odt" . "https://kjambunathan.github.io/elpa/")))
'(package-selected-packages
(quote
(gotest dashboard flycheck-rust ox-odt mustache-mode mustache lua-mode srcery-theme vscdark-theme use-package terraform-mode suscolors-theme smex ruby-hash-syntax rubocopfmt rubocop rspec-mode rg rbenv rainbow-delimiters racer protobuf-mode plantuml-mode ox-gfm org-present org-gcal org-bullets ob-sml ob-go night-owl-theme neotree lsp-ui load-env-vars kubernetes k8s-mode jsonnet-mode intero inkpot-theme inf-ruby indent-tools helm-rg helm-projectile gruvbox-theme go-snippets go-guru go-eldoc flymake-yaml flymake-rust flymake-ruby flymake-go flycheck-golangci-lint exec-path-from-shell erlang enh-ruby-mode emoji-cheat-sheet-plus dracula-theme doom-modeline dockerfile-mode docker-compose-mode docker company-lsp company-go company-emoji company-distel clojure-mode-extra-font-locking cider cargo auto-org-md atom-one-dark-theme ansible-vault ample-zen-theme all-the-icons-dired alchemist ace-window)))
'(plantuml-default-exec-mode (quote jar))
'(plantuml-jar-args (quote ("-charset" "UTF-8" "--illegal-access" "deny"))))
'(ob-rust erlang-mode gotest dashboard flycheck-rust ox-odt mustache-mode mustache lua-mode srcery-theme vscdark-theme use-package terraform-mode suscolors-theme smex ruby-hash-syntax rubocopfmt rubocop rspec-mode rg rbenv rainbow-delimiters racer protobuf-mode plantuml-mode ox-gfm org-present org-gcal org-bullets ob-sml ob-go night-owl-theme neotree lsp-ui load-env-vars kubernetes k8s-mode jsonnet-mode intero inkpot-theme inf-ruby indent-tools helm-rg helm-projectile gruvbox-theme go-snippets go-guru go-eldoc flymake-yaml flymake-rust flymake-ruby flymake-go flycheck-golangci-lint exec-path-from-shell erlang enh-ruby-mode emoji-cheat-sheet-plus dracula-theme doom-modeline dockerfile-mode docker-compose-mode docker company-lsp company-go company-emoji company-distel clojure-mode-extra-font-locking cider cargo auto-org-md atom-one-dark-theme ansible-vault ample-zen-theme all-the-icons-dired alchemist ace-window))
'(plantuml-default-exec-mode 'jar)
'(plantuml-jar-args '("-charset" "UTF-8" "--illegal-access" "deny"))
'(shell-file-name "/usr/local/bin/fish"))
(custom-set-faces
;; custom-set-faces was added by Custom.
;; If you edit it by hand, you could mess it up, so be careful.
Expand Down
19 changes: 10 additions & 9 deletions docs.org
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,11 @@ Core of the Org mode is setup in ~init.el~ since org is the foundation for liter
'((ruby . t)
(ditaa . t)
(plantuml . t)
(emacs-lisp . t))))
(emacs-lisp . t)
(rust . t))))

(defun ob-confirm-babel-evaluate (lang body)
(not (member lang '("python" "go" "ruby" "clojure" "sh" "ditaa" "plantuml" "emacs-lisp"))))
(defun ob-confirm-babel-evaluate (lang body);;
(not (member lang '("python" "go" "ruby" "clojure" "sh" "ditaa" "plantuml" "emacs-lisp", "rust"))))

(use-package ob
:defer t
Expand Down Expand Up @@ -71,12 +72,12 @@ Core of the Org mode is setup in ~init.el~ since org is the foundation for liter
* Calendar

#+BEGIN_SRC emacs-lisp
(use-package org-gcal
:ensure t
:init (setq org-gcal-client-id (getenv "ORG_GCAL_CLIENTID")
org-gcal-client-secret (getenv "ORG_GCAL_CLIENTSECRET")
org-gcal-file-alist '(((getenv "ORG_GCAL_EMAIL") . (getenv "ORG_GCAL_ORG_PATH"))))
)
;;(use-package org-gcal
;; :ensure t
;; :init (setq org-gcal-client-id (getenv "ORG_GCAL_CLIENTID")
;; org-gcal-client-secret (getenv "ORG_GCAL_CLIENTSECRET")
;; org-gcal-file-alist '(((getenv "ORG_GCAL_EMAIL") . (getenv "ORG_GCAL_ORG_PATH"))))
;;)
#+END_SRC

* Markdown
Expand Down
6 changes: 4 additions & 2 deletions editor.org
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@

(global-set-key (kbd "H-/") 'comment-region)
(global-set-key (kbd "M-s-÷") 'uncomment-region)
(set-cursor-color "wheat")

#+END_SRC
** Reload from disk
#+BEGIN_SRC emacs-lisp
Expand Down Expand Up @@ -55,7 +57,7 @@
* Font
#+BEGIN_SRC emacs-lisp
(when (member "Fira Code" (font-family-list))
(set-face-attribute 'default nil :font "Fira Code-15"))
(set-face-attribute 'default nil :font "Fira Code-17"))
#+END_SRC

* Themes
Expand All @@ -74,7 +76,7 @@

(use-package srcery-theme
:ensure t)

(load-theme 'srcery)
#+END_SRC
* Misc
** Yaml
Expand Down
2 changes: 1 addition & 1 deletion erl.org
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ needed


#+BEGIN_SRC emacs-lisp
(setq load-path (cons "/usr/local/Cellar/erlang/22.2/lib/erlang/lib/tools-3.3/emacs/"
(setq load-path (cons "/usr/local/Cellar/erlang/23.1.1/lib/erlang/lib/tools-3.4.1/emacs/"
load-path))
(require 'erlang-start)

Expand Down
16 changes: 10 additions & 6 deletions ide.org
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
:ensure t
:init (load-env-vars "~/.profile"))
#+END_SRC

#+RESULTS:

* Exec Path
This is to ensure that shell and Emacs can share ~PATH~ env var
#+BEGIN_SRC emacs-lisp
Expand All @@ -19,6 +22,7 @@ This is to ensure that shell and Emacs can share ~PATH~ env var
(exec-path-from-shell-initialize)))
#+END_SRC
#+RESULTS:
: tcar

* Mac
#+BEGIN_SRC emacs-lisp
Expand Down Expand Up @@ -73,12 +77,7 @@ This is to ensure that shell and Emacs can share ~PATH~ env var
(projects . 5)
(agenda . 5)
(registers . 5)))

(use-package dashboard
:ensure t
:config
(dashboard-setup-startup-hook))

;;(setq initial-buffer-choice (lambda () (get-buffer "*dashboard*"))

(setq dashboard-footer-messages '(
"Talking to his professor about orbital mechanics, Newton realized that he needed to stop and invent Calculus. Go Shave that yak! err.. Once in a while."
Expand All @@ -98,6 +97,11 @@ only Emacs can save your soul"
"Calling EMACS an editor is like calling the Earth a hunk of dirt."
"Emacs is a nice operating system"
))
(use-package dashboard
:ensure t
:config (setq dashboard-startup-banner 3)
:init (dashboard-setup-startup-hook))

#+END_SRC

#+RESULTS:
Expand Down
5 changes: 5 additions & 0 deletions rust.org
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,11 @@

;;(add-hook 'rust-mode-hook 'racer-mode)
#+END_SRC
* babel support
#+BEGIN_SRC emacs-lisp
(use-package ob-rust
:ensure t)
#+END_SRC

* Provide this so that it may be required
#+BEGIN_SRC emacs-lisp
Expand Down

0 comments on commit f0cd145

Please sign in to comment.