misc updatesHEADmaster

1 files changed, 27 insertions, 4 deletions

diff --git a/config.org b/config.org
index d04570e..0963c0a 100644
--- a/config.org
+++ b/config.org
@@ -251,7 +251,19 @@ Use [[https://magit.vc/][magit]] to supplement emacs built in version control sy
   :commands (magit-status magit-blame magit-log-buffer-file)
   :bind (("C-c v s" . magit-status)
          ("C-c v B" . magit-blame)
-         ("C-c v L" . magit-log-buffer-file)))
+         ("C-c v L" . magit-log-buffer-file))
+  :init
+  (setq     ;; Use ivy for magit
+    magit-completing-read-function 'ivy-completing-read))
+#+END_SRC
+
+Use magithub for magit/github integration
+
+#+BEGIN_SRC emacs-lisp
+(use-package magithub
+  :ensure t
+  :config
+  (magithub-feature-autoinject t))
 #+END_SRC
 ** diff-hl
 [[https://github.com/dgutov/diff-hl][diff-hl]] displays diff information in the margin
@@ -355,8 +367,6 @@ the mouse to click a directory or filename.
     ivy-initial-inputs-alist nil
     ;; Display recently opened files when switching buffers
     ivy-use-virtual-buffers t
-    ;; Use ivy for magit
-    magit-completing-read-function 'ivy-completing-read
     ;; Use ivy for projectile
     projectile-completion-system 'ivy
     ;; Allow the input to be selectable with C-P RET. Useful for creating files
@@ -562,6 +572,13 @@ This part is for setting up python mode in the way I prefer.
   (setq-local indent-tabs-mode nil))
 (add-hook 'python-mode-hook 'my-python-setup)
 #+END_SRC
+** Java
+#+BEGIN_SRC emacs-lisp
+(defun my-java-setup ()
+  (company-mode)
+  (auto-fill-mode 1))
+(add-hook 'java-mode-hook 'my-java-setup)
+#+END_SRC
 ** Rust
 Installation:
 - Install Rust: https://www.rust-lang.org/en-US/install.html
@@ -645,7 +662,7 @@ go get -u golang.org/x/tools/cmd/goimports
 * org-mode
 ** Setup
 #+BEGIN_SRC emacs-lisp
-(setq org-directory "~/org"
+(setq org-directory "~/Resilio Sync/org"
 
   ;; Indents headers instead of displaying all of the asterisks
   org-startup-indented t
@@ -670,9 +687,15 @@ go get -u golang.org/x/tools/cmd/goimports
   ;; Define a default width for inline images. this can be overridden
   ;; by +ATTR_*: width="200"
   org-image-actual-width '(400)
+
+  ;; Default org-archive-subtree location. Use an archive subdirectory
+  ;; This can be over-written using something like #+ARCHIVE: ::* Archived Tasks
+  org-archive-location "archive/%s_archive::"
 )
 
 (defun my-org-mode-setup ()
+  (setq-local fill-column 79)
+  (auto-fill-mode 1)
   (setq-local display-line-numbers-width 4))
 
 (add-hook 'org-mode-hook 'my-org-mode-setup)