Added org journal mode and set up keybindings

custom.el

@@ -127,12 +127,12 @@
      ("shell" . sh)
      ("bash" . sh)))
  '(package-selected-packages
-   '(sed-mode
+   '(org-journal
+     sed-mode
      pacfiles-mode
      company-nixos-options
      nixos-options
      syslog-mode
-     google-c-style
      jinja2-mode
      masm-mode
      nginx-mode

elpa/google-c-style-20180130.1736/google-c-style-autoloads.el

@@ -1,34 +0,0 @@
-;;; google-c-style-autoloads.el --- automatically extracted autoloads
-;;
-;;; Code:
-
-(add-to-list 'load-path (directory-file-name
-                         (or (file-name-directory #$) (car load-path))))
-
-
-;;;### (autoloads nil "google-c-style" "google-c-style.el" (0 0 0
-;;;;;;  0))
-;;; Generated autoloads from google-c-style.el
-
-(defconst google-c-style `((c-recognize-knr-p) (c-enable-xemacs-performance-kludge-p . t) (c-basic-offset . 2) (indent-tabs-mode) (c-comment-only-line-offset . 0) (c-hanging-braces-alist (defun-open after) (defun-close before after) (class-open after) (class-close before after) (inexpr-class-open after) (inexpr-class-close before) (namespace-open after) (inline-open after) (inline-close before after) (block-open after) (block-close . c-snug-do-while) (extern-lang-open after) (extern-lang-close after) (statement-case-open after) (substatement-open after)) (c-hanging-colons-alist (case-label) (label after) (access-label after) (member-init-intro before) (inher-intro)) (c-hanging-semi&comma-criteria c-semi&comma-no-newlines-for-oneline-inliners c-semi&comma-inside-parenlist c-semi&comma-no-newlines-before-nonblanks) (c-indent-comments-syntactically-p . t) (comment-column . 40) (c-indent-comment-alist (other space . 2)) (c-cleanup-list brace-else-brace brace-elseif-brace brace-catch-brace empty-defun-braces defun-close-semi list-close-comma scope-operator) (c-offsets-alist (arglist-intro google-c-lineup-expression-plus-4) (func-decl-cont . ++) (member-init-intro . ++) (inher-intro . ++) (comment-intro . 0) (arglist-close . c-lineup-arglist) (topmost-intro . 0) (block-open . 0) (inline-open . 0) (substatement-open . 0) (statement-cont ,(when (fboundp 'c-no-indent-after-java-annotations) 'c-no-indent-after-java-annotations) ,(when (fboundp 'c-lineup-assignments) 'c-lineup-assignments) ++) (label . /) (case-label . +) (statement-case-open . +) (statement-case-intro . +) (access-label . /) (innamespace . 0))) "\
-Google C/C++ Programming Style.")
-
-(autoload 'google-set-c-style "google-c-style" "\
-Set the current buffer's c-style to Google C/C++ Programming
-  Style. Meant to be added to `c-mode-common-hook'." t nil)
-
-(autoload 'google-make-newline-indent "google-c-style" "\
-Sets up preferred newline behavior. Not set by default. Meant
-  to be added to `c-mode-common-hook'." t nil)
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "google-c-style" '("google-c-lineup-expression-plus-4")))
-
-;;;***
-
-;; Local Variables:
-;; version-control: never
-;; no-byte-compile: t
-;; no-update-autoloads: t
-;; coding: utf-8
-;; End:
-;;; google-c-style-autoloads.el ends here

elpa/google-c-style-20180130.1736/google-c-style-pkg.el

@@ -1,2 +0,0 @@
-;;; Generated package description from google-c-style.el  -*- no-byte-compile: t -*-
-(define-package "google-c-style" "20180130.1736" "Google's C/C++ style for c-mode" 'nil :commit "9c8784ded344f6a35d1e1550385002f613a0c788" :keywords '("c" "tools"))

elpa/google-c-style-20180130.1736/google-c-style.el

@@ -1,153 +0,0 @@
-;;; google-c-style.el --- Google's C/C++ style for c-mode
-
-;; Keywords: c, tools
-;; Package-Version: 20180130.1736
-;; Package-Commit: 9c8784ded344f6a35d1e1550385002f613a0c788
-
-;; google-c-style.el is Copyright (C) 2008 Google Inc. All Rights Reserved.
-;;
-;; It is free software; you can redistribute it and/or modify it under the
-;; terms of either:
-;;
-;; a) the GNU General Public License as published by the Free Software
-;; Foundation; either version 1, or (at your option) any later version, or
-;;
-;; b) the "Artistic License".
-
-;;; Commentary:
-
-;; Provides the google C/C++ coding style. You may wish to add
-;; `google-set-c-style' to your `c-mode-common-hook' after requiring this
-;; file. For example:
-;;
-;;    (add-hook 'c-mode-common-hook 'google-set-c-style)
-;;
-;; If you want the RETURN key to go to the next line and space over
-;; to the right place, add this to your .emacs right after the load-file:
-;;
-;;    (add-hook 'c-mode-common-hook 'google-make-newline-indent)
-
-;;; Code:
-
-;; For some reason 1) c-backward-syntactic-ws is a macro and 2)  under Emacs 22
-;; bytecode cannot call (unexpanded) macros at run time:
-(eval-when-compile (require 'cc-defs))
-
-;; Wrapper function needed for Emacs 21 and XEmacs (Emacs 22 offers the more
-;; elegant solution of composing a list of lineup functions or quantities with
-;; operators such as "add")
-(defun google-c-lineup-expression-plus-4 (langelem)
-  "Indents to the beginning of the current C expression plus 4 spaces.
-
-This implements title \"Function Declarations and Definitions\"
-of the Google C++ Style Guide for the case where the previous
-line ends with an open parenthese.
-
-\"Current C expression\", as per the Google Style Guide and as
-clarified by subsequent discussions, means the whole expression
-regardless of the number of nested parentheses, but excluding
-non-expression material such as \"if(\" and \"for(\" control
-structures.
-
-Suitable for inclusion in `c-offsets-alist'."
-  (save-excursion
-    (back-to-indentation)
-    ;; Go to beginning of *previous* line:
-    (c-backward-syntactic-ws)
-    (back-to-indentation)
-    (cond
-     ;; We are making a reasonable assumption that if there is a control
-     ;; structure to indent past, it has to be at the beginning of the line.
-     ((looking-at "\\(\\(if\\|for\\|while\\)\\s *(\\)")
-      (goto-char (match-end 1)))
-     ;; For constructor initializer lists, the reference point for line-up is
-     ;; the token after the initial colon.
-     ((looking-at ":\\s *")
-      (goto-char (match-end 0))))
-    (vector (+ 4 (current-column)))))
-
-;;;###autoload
-(defconst google-c-style
-  `((c-recognize-knr-p . nil)
-    (c-enable-xemacs-performance-kludge-p . t) ; speed up indentation in XEmacs
-    (c-basic-offset . 2)
-    (indent-tabs-mode . nil)
-    (c-comment-only-line-offset . 0)
-    (c-hanging-braces-alist . ((defun-open after)
-                               (defun-close before after)
-                               (class-open after)
-                               (class-close before after)
-                               (inexpr-class-open after)
-                               (inexpr-class-close before)
-                               (namespace-open after)
-                               (inline-open after)
-                               (inline-close before after)
-                               (block-open after)
-                               (block-close . c-snug-do-while)
-                               (extern-lang-open after)
-                               (extern-lang-close after)
-                               (statement-case-open after)
-                               (substatement-open after)))
-    (c-hanging-colons-alist . ((case-label)
-                               (label after)
-                               (access-label after)
-                               (member-init-intro before)
-                               (inher-intro)))
-    (c-hanging-semi&comma-criteria
-     . (c-semi&comma-no-newlines-for-oneline-inliners
-        c-semi&comma-inside-parenlist
-        c-semi&comma-no-newlines-before-nonblanks))
-    (c-indent-comments-syntactically-p . t)
-    (comment-column . 40)
-    (c-indent-comment-alist . ((other . (space . 2))))
-    (c-cleanup-list . (brace-else-brace
-                       brace-elseif-brace
-                       brace-catch-brace
-                       empty-defun-braces
-                       defun-close-semi
-                       list-close-comma
-                       scope-operator))
-    (c-offsets-alist . ((arglist-intro google-c-lineup-expression-plus-4)
-                        (func-decl-cont . ++)
-                        (member-init-intro . ++)
-                        (inher-intro . ++)
-                        (comment-intro . 0)
-                        (arglist-close . c-lineup-arglist)
-                        (topmost-intro . 0)
-                        (block-open . 0)
-                        (inline-open . 0)
-                        (substatement-open . 0)
-                        (statement-cont
-                         .
-                         (,(when (fboundp 'c-no-indent-after-java-annotations)
-                             'c-no-indent-after-java-annotations)
-                          ,(when (fboundp 'c-lineup-assignments)
-                             'c-lineup-assignments)
-                          ++))
-                        (label . /)
-                        (case-label . +)
-                        (statement-case-open . +)
-                        (statement-case-intro . +) ; case w/o {
-                        (access-label . /)
-                        (innamespace . 0))))
-  "Google C/C++ Programming Style.")
-
-;;;###autoload
-(defun google-set-c-style ()
-  "Set the current buffer's c-style to Google C/C++ Programming
-  Style. Meant to be added to `c-mode-common-hook'."
-  (interactive)
-  (make-local-variable 'c-tab-always-indent)
-  (setq c-tab-always-indent t)
-  (c-add-style "Google" google-c-style t))
-
-;;;###autoload
-(defun google-make-newline-indent ()
-  "Sets up preferred newline behavior. Not set by default. Meant
-  to be added to `c-mode-common-hook'."
-  (interactive)
-  (define-key c-mode-base-map "\C-m" 'newline-and-indent)
-  (define-key c-mode-base-map [ret] 'newline-and-indent))
-
-(provide 'google-c-style)
-;;; google-c-style.el ends here

elpa/org-journal-2.1.2/org-journal-autoloads.el

@@ -0,0 +1,147 @@
+;;; org-journal-autoloads.el --- automatically extracted autoloads
+;;
+;;; Code:
+
+(add-to-list 'load-path (directory-file-name
+                         (or (file-name-directory #$) (car load-path))))
+
+
+;;;### (autoloads nil "org-journal" "org-journal.el" (0 0 0 0))
+;;; Generated autoloads from org-journal.el
+
+(add-hook 'calendar-today-visible-hook 'org-journal-mark-entries)
+
+(add-hook 'calendar-today-invisible-hook 'org-journal-mark-entries)
+
+(autoload 'org-journal-mode "org-journal" "\
+Mode for writing or viewing entries written in the journal.
+
+\(fn)" t nil)
+
+(define-obsolete-function-alias 'org-journal-open-next-entry 'org-journal-next-entry "2.1.0")
+
+(define-obsolete-function-alias 'org-journal-open-previous-entry 'org-journal-previous-entry "2.1.0")
+
+(autoload 'org-journal-convert-created-property-timestamps "org-journal" "\
+Convert CREATED property timestamps to `org-journal-created-property-timestamp-format'.
+
+\(fn OLD-FORMAT)" t nil)
+
+(autoload 'org-journal-new-entry "org-journal" "\
+Open today's journal file and start a new entry.
+
+With a PREFIX arg, open the today's file, create a heading if it doesn't exist yet,
+but do not create a new entry.
+
+If given a TIME, create an entry for the time's day. If no TIME was given,
+use the current time (which is interpreted as belonging to yesterday if
+smaller than `org-extend-today-until`).
+
+Whenever a journal entry is created the `org-journal-after-entry-create-hook'
+hook is run.
+
+\(fn PREFIX &optional TIME)" t nil)
+
+(autoload 'org-journal-new-date-entry "org-journal" "\
+Open the journal for the date indicated by point and start a new entry.
+
+If the date is not today, it won't be given a time heading. With one prefix (C-u),
+don't add a new heading.
+
+If the date is in the future, create a schedule entry, unless two universal prefix
+arguments (C-u C-u) are given. In that case insert just the heading.
+
+\(fn PREFIX &optional EVENT)" t nil)
+
+(autoload 'org-journal-new-scheduled-entry "org-journal" "\
+Create a new entry in the future with an active timestamp.
+
+With non-nil prefix argument create a regular entry instead of a TODO entry.
+
+\(fn PREFIX &optional SCHEDULED-TIME)" t nil)
+
+(autoload 'org-journal-reschedule-scheduled-entry "org-journal" "\
+Reschedule an entry in the future.
+
+\(fn &optional TIME)" t nil)
+
+(autoload 'org-journal-open-current-journal-file "org-journal" "\
+Open the current journal file" t nil)
+
+(autoload 'org-journal-invalidate-cache "org-journal" "\
+Clear `org-journal--dates' hash table, and the cache file." t nil)
+
+(autoload 'org-journal-mark-entries "org-journal" "\
+Mark days in the calendar for which a journal entry is present." t nil)
+
+(autoload 'org-journal-read-entry "org-journal" "\
+Open journal entry for selected date for viewing.
+
+\(fn ARG &optional EVENT)" t nil)
+
+(autoload 'org-journal-display-entry "org-journal" "\
+Display journal entry for selected date in another window.
+
+\(fn ARG &optional EVENT)" t nil)
+
+(autoload 'org-journal-read-or-display-entry "org-journal" "\
+Read an entry for the TIME and either select the new window when NOSELECT
+is nil or avoid switching when NOSELECT is non-nil.
+
+\(fn TIME &optional NOSELECT)" nil nil)
+
+(autoload 'org-journal-next-entry "org-journal" "\
+Go to the next journal entry." t nil)
+
+(autoload 'org-journal-previous-entry "org-journal" "\
+Go to the previous journal entry." t nil)
+
+(autoload 'org-journal-search "org-journal" "\
+Search for a string in the journal files.
+
+See `org-read-date' for information on ways to specify dates.
+If a prefix argument is given, search all dates.
+
+\(fn STR &optional PERIOD-NAME)" t nil)
+
+(autoload 'org-journal-search-calendar-week "org-journal" "\
+Search for a string within a current calendar-mode week entries.
+
+\(fn STR)" t nil)
+
+(autoload 'org-journal-search-calendar-month "org-journal" "\
+Search for a string within a current calendar-mode month entries.
+
+\(fn STR)" t nil)
+
+(autoload 'org-journal-search-calendar-year "org-journal" "\
+Search for a string within a current calendar-mode year entries.
+
+\(fn STR)" t nil)
+
+(autoload 'org-journal-search-forever "org-journal" "\
+Search for a string within all entries.
+
+\(fn STR)" t nil)
+
+(autoload 'org-journal-search-future "org-journal" "\
+Search for a string within all future entries.
+
+\(fn STR)" t nil)
+
+(autoload 'org-journal-search-future-scheduled "org-journal" "\
+Search for TODOs within all future entries." t nil)
+
+(add-hook 'org-journal-mode-hook (lambda nil (add-hook org-journal-encrypt-on 'org-journal-encryption-hook nil t)))
+
+(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-journal" '("org-journal-")))
+
+;;;***
+
+;; Local Variables:
+;; version-control: never
+;; no-byte-compile: t
+;; no-update-autoloads: t
+;; coding: utf-8
+;; End:
+;;; org-journal-autoloads.el ends here

elpa/org-journal-2.1.2/org-journal-pkg.el

@@ -0,0 +1,2 @@
+;;; Generated package description from org-journal.el  -*- no-byte-compile: t -*-
+(define-package "org-journal" "2.1.2" "a simple org-mode based journaling mode" '((emacs "25.1") (org "9.1")) :commit "c26e73a017963f6638044f1f63354c453f2db54a" :authors '(("Bastian Bechtold") ("Christian Schwarzgruber")) :maintainer '("Bastian Bechtold") :url "http://github.com/bastibe/org-journal")

settings.org

@@ -282,9 +282,7 @@ This handy function is a customized ripoff of custom-save-all
   (use-package cc-mode :hook (c-mode . (lambda ()
                                          (company-mode)
                                          (format-all-mode)
-                                         (format-all-ensure-formatter)
-                                         (require 'google-c-style)
-                                         (google-set-c-style))))
+                                         (format-all-ensure-formatter))))
 #+end_src
 ** Docker
 *** Docker
@@ -417,6 +415,12 @@ This handy function is a customized ripoff of custom-save-all
     (use-package git-commit
       :hook (git-commit-setup . git-commit-turn-on-flyspell)))
 #+end_src
+** Org Journal
+#+begin_src emacs-lisp
+  (use-package org-journal
+    :bind
+    ("C-c TAB" . org-journal-new-entry))
+#+end_src
 ** Python
 *** Platform specific
 Set python command