From b8ef5068bcb1098df6b7fa171cba7ee573e2f30a Mon Sep 17 00:00:00 2001
From: Roger Gonzalez <roger@rogs.me>
Date: Tue, 4 Aug 2020 23:27:58 -0300
Subject: Improved doom by A LOT. LSP, vterm, ORG improvements

---
 .doom.d/config.el | 28 +++++++++++++++++++++-------
 .doom.d/init.el   | 10 +++++-----
 2 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/.doom.d/config.el b/.doom.d/config.el
index c29567b1..055b7657 100644
--- a/.doom.d/config.el
+++ b/.doom.d/config.el
@@ -25,7 +25,7 @@
 ;; They all accept either a font-spec, font string ("Input Mono-12"), or xlfd
 ;; font string. You generally only need these two:
 ;; test
-(setq doom-font (font-spec :family "monospace" :size 28)
+(setq doom-font (font-spec :family "mononoki Nerd Font Mono" :size 30)
       doom-variable-pitch-font (font-spec :family "sans"))
 
 ;; There are two ways to load a theme. Both assume the theme is installed and
@@ -38,7 +38,7 @@
 
 ;; If you want to change the style of line numbers, change this to `relative' or
 ;; `nil' to disable it:
-(setq display-line-numbers-type t)
+(setq display-line-numbers-type 'relative)
 
 
 ;; Here are some additional functions/macros that could help you configure Doom:
@@ -148,12 +148,21 @@
 (require 'aggressive-indent)
 (global-aggressive-indent-mode 1)
 
-;; Relative line mode
-(setq display-line-numbers-type 'relative)
-
 ;; Org Mode
 
-;; Capture templates
+;;;; Logs
+
+(after! org (setq org-log-state-notes-insert-after-drawers nil
+                  org-log-into-drawer t
+                  org-log-done 'time
+                  org-log-repeat 'time
+                  org-log-redeadline 'note
+                  org-log-reschedule 'note))
+
+(setq-default org-todo-keywords
+              '((sequence "TODO(t!)" "IN_PROGRESS(i!)" "WAIT(w@/!)" "SOMEDAY(s!)" "|" "DONE(d@/!)" "CANCELLED(c@/!)")))
+
+;;;; Capture templates
 (after! org
   (setq org-capture-templates
         (quote
@@ -201,6 +210,11 @@
           ("tl" "Logbook entry for Tarmac" entry (file+datetree "~/org/Tarmac/logbook-tarmac.org") "** %U - %^{Activity}  :LOG:")
           ))))
 
+
+;;;; Enforce ordered tasks
+(setq org-enforce-todo-dependencies t)
+(setq org-enforce-todo-checkbox-dependencies t)
+
 ;; Emojify mode
 (add-hook 'after-init-hook #'global-emojify-mode)
 
@@ -208,7 +222,7 @@
 (map! :leader
       (:prefix-map ("a" . "applications")
        ;; ispell
-       :desc "Open eshell" "e" #'eshell
+       :desc "Open vterm" "v" #'vterm
        :desc "HTTP Status cheatsheet" "h" #'helm-httpstatus
        :desc "Run ispell" "i" #'ispell
        ))
diff --git a/.doom.d/init.el b/.doom.d/init.el
index 94f5c0e2..4a387558 100644
--- a/.doom.d/init.el
+++ b/.doom.d/init.el
@@ -72,10 +72,10 @@
        vc                ; version-control and Emacs, sitting in a tree
 
        :term
-       ;;eshell            ; a consistent, cross-platform shell (WIP)
+       eshell            ; a consistent, cross-platform shell (WIP)
        ;;shell             ; a terminal REPL for Emacs
        ;;term              ; terminals in Emacs
-       ;;vterm             ; another terminals in Emacs
+       vterm             ; another terminals in Emacs
 
        :tools
        ;;ansible
@@ -90,7 +90,7 @@
        ;;gist              ; interacting with github gists
        (lookup           ; helps you navigate your code and documentation
         +docsets)        ; ...or in Dash docsets locally
-       ;;lsp
+       lsp
        ;;macos             ; MacOS-specific commands
        (magit +forge)      ; a git porcelain for Emacs
 
@@ -125,7 +125,7 @@
        ;;hy                ; readability of scheme w/ speed of python
        ;;idris             ;
        ;;(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
@@ -148,7 +148,7 @@
        ;;php               ; perl's insecure younger brother
        ;;plantuml          ; diagrams for confusing people more
        ;;purescript        ; javascript, but functional
-       python            ; beautiful is better than ugly
+       (python +lsp)            ; beautiful is better than ugly
        ;;qt                ; the 'cutest' gui framework ever
        ;;racket            ; a DSL for DSLs
        ;;rest              ; Emacs as a REST client
-- 
cgit v1.2.3