More config

5 files changed, 41 insertions, 7 deletions

diff --git a/.emacs.d/lisp/init-lang.el b/.emacs.d/lisp/init-lang.el
index f8e96b6..b4b7e89 100644
--- a/.emacs.d/lisp/init-lang.el
+++ b/.emacs.d/lisp/init-lang.el
@@ -1,5 +1,7 @@
 (use-package ledger-mode
-  :mode (("\\.journal$" . ledger-mode)))
+  :mode (("\\.journal$" . ledger-mode))
+  :config
+  (setq ledger-default-date-format ledger-iso-date-format))
 
 (use-package markdown-mode
   :ensure t
@@ -15,15 +17,15 @@
 (use-package go-mode
   :ensure t
   :commands (go-mode)
-  :mode (("\\.go\\'" . go-mode))
+  :mode (("\\.go$" . go-mode))
   :hook ((go-mode . (lambda () (setq tab-width 4)))))
 
 (use-package lsp-mode
   :ensure t
+  :commands (lsp lsp-deferred)
   :hook
   ((go-mode . lsp-deferred)
    (lsp-mode . lsp-enable-which-key-integration))
-  :commands (lsp lsp-deferred)
   :config
   (evil-define-key 'normal lsp-mode-map
     (kbd "gd") 'lsp-find-definition
diff --git a/.emacs.d/lisp/init-misc.el b/.emacs.d/lisp/init-misc.el
index 07eef14..bda9ca3 100644
--- a/.emacs.d/lisp/init-misc.el
+++ b/.emacs.d/lisp/init-misc.el
@@ -1,6 +1,29 @@
 (setq tab-always-indent 'complete
       completion-cycle-threshold t)
 
+(when (version<= "26.0.50" emacs-version)
+  (global-display-line-numbers-mode))
+(setq vc-follow-symlinks t)
+(setq backup-directory-alist
+      `(("." . ,(concat user-emacs-directory "backups"))))
+(setq-default fill-column 72)
+(menu-bar-mode -1)
+(xterm-mouse-mode 1) ;; Enable mouse
+
+(use-package atom-one-dark-theme
+  :config
+  (load-theme 'atom-one-dark t))
+(set-face-attribute 'default nil :font "Monaco" :height 150)
+
+(use-package which-key
+  :ensure t
+  :config
+  (which-key-mode))
+
+(use-package undo-tree
+  :config
+  (global-undo-tree-mode))
+
 (use-package recentf
   :ensure nil
   :config
@@ -41,7 +64,9 @@
   :init
   (setq company-global-modes
 	'(emacs-lisp-mode go-mode ledger-mode))
-  :hook ((after-init . global-company-mode)))
+  :hook ((after-init . global-company-mode))
+  :config
+  (setq company-minimum-prefix-length 1))
 
 (use-package projectile
   :init
@@ -50,3 +75,5 @@
   :config
   (setq projectile-cache-file (expand-file-name ".cache/projectile" user-emacs-directory))
   (projectile-mode 1))
+
+(provide 'init-misc)
diff --git a/.emacs.d/lisp/init-mu4e.el b/.emacs.d/lisp/init-mu4e.el
index 8a2c5a6..ebf684c 100644
--- a/.emacs.d/lisp/init-mu4e.el
+++ b/.emacs.d/lisp/init-mu4e.el
diff --git a/.emacs.d/lisp/init-org.el b/.emacs.d/lisp/init-org.el
index caadeec..50061b2 100644
--- a/.emacs.d/lisp/init-org.el
+++ b/.emacs.d/lisp/init-org.el
@@ -33,10 +33,15 @@
     (kbd "<leader>oih") 'org-insert-heading
     (kbd "<leader>oci") 'org-clock-in
     (kbd "<leader>oco") 'org-clock-out
-    (kbd "<leader>sp") 'org-set-property)
+    (kbd "<leader>sp") 'org-set-property
+    (kbd "+") 'org-priority-up
+    (kbd "-") 'org-priority-down)
   (setq org-tags-exclude-from-inheritance
 	'("PROJECT"))
 
+  (setq org-clock-persist 'history)
+  (org-clock-persistence-insinuate)
+
   ;; refile
   (setq org-refile-targets '((nil :maxlevel . 9)
 			     (org-agenda-files :maxlevel . 9))
diff --git a/.emacs.d/lisp/init-package.el b/.emacs.d/lisp/init-package.el
index 5e6a0c7..ab9b1fa 100644
--- a/.emacs.d/lisp/init-package.el
+++ b/.emacs.d/lisp/init-package.el
@@ -1,7 +1,7 @@
 (require 'package)
 (setq package-archives '(("gnu" . "https://elpa.gnu.org/packages/")
-                         ("melpa" . "https://melpa.org/packages/")))
-(setq package-enable-at-startup nil)
+                         ("mepla" . "https://melpa.org/packages/")
+                         ("melpa-stable" . "https://stable.melpa.org/packages/")))
 (package-initialize)
 
 (dolist (package '(use-package))