Merge branch 'master' of https://git.blinkenbunt.org/frederic/emacs-configuration

without doing so, most of Treemacs' keybindings won't work

README.md

@@ -22,5 +22,6 @@ This is an attempt to learn about Emacs and its ecosystem by creating a custom c
   * themed right-click menus
   * update diff-hl after committing things with magit
   * enable which-key completions and ido in dired-mode
+  * shortcut to toggle Treemacs visibility
 
 

init.el

@@ -18,10 +18,26 @@
 (require 'evil)
 (evil-mode 1)
 
+(require 'evil-org)
+(add-hook 'org-mode-hook 'evil-org-mode)
+(evil-org-set-key-theme '(navigation insert textobjects additional calendar))
+(require 'evil-org-agenda)
+(evil-org-agenda-set-keys)
+
+(setq org-startup-indented t)
+
+(setq org-journal-dir "~/org/journal/")
+(setq org-journal-date-format "%A, %d %B %Y")
+(setq org-journal-file-format "%Y-%m-%d.org")
+(setq org-journal-file-type "daily")
+(require 'org-journal)
+
 (require 'treemacs)
 (require 'treemacs-evil)
 
 (setq-default indent-tabs-mode nil)
+(setq-default c-basic-offset 4)
+(setq-default c-default-style "k&r")
 
 (require 'evil-surround)
 (global-evil-surround-mode 1)

install-packages.el

@@ -25,6 +25,7 @@
 (package-install 'which-key)
 (package-install 'ido-vertical-mode)
 (package-install 'evil-surround)
+(package-install 'org-journal)
 
 ;; prompts for font installation directory
 ;;(all-the-icons-install-fonts t)