Edits to config

.last-package-update-day

@@ -0,0 +1 @@
+737378

init.el

@@ -13,6 +13,10 @@
 
 
 ;;; Sane defaults ;;;
+(setq server-use-tcp t)
+(global-set-key (kbd "<mouse-2>") 'clipboard-yank)
+(setq x-select-enable-primary t)
+(setq x-select-enable-clipboard t)
 (setq-default word-wrap t)              ; wrap lines
 (setq delete-old-versions -1)		; delete excess backup versions silently
 (setq version-control t)		; use version control
@@ -28,6 +32,7 @@
 (setq sentence-end-double-space nil)	; sentence SHOULD end with only a point.
 (setq default-fill-column 80)		; toggle wrapping text at the 80th character
 (setq-default indent-tabs-mode nil)     ; tabs to spaces
+(setq tab-width 2)
 (global-set-key "\C-m" 'newline-and-indent)
 ;; Scratch Buffer
 ;; (setq initial-scratch-message
@@ -125,7 +130,7 @@
     ("c74e83f8aa4c78a121b52146eadb792c9facc5b1f02c917e3dbb454fca931223" "a27c00821ccfd5a78b01e4f35dc056706dd9ede09a8b90c6955ae6a390eb1c1e" "e4c8810d9ab925567a69c11d5c95d198a4e7d05871453b2c92c020712559c4c1" default)))
  '(package-selected-packages
    (quote
-    (haskell-mode intero lsp-haskell projectile cider rainbow-delimiters scel sclang w3m auctex-latexmk company-auctex company-math magit telephone-line focus latex-preview-pane tex auctex org-bullets syndicate evil-org smartparens-config smartparens flx counsel swiper ivy xresources-theme evil-commentary evil-escape evil undo-tree general use-package))))
+    (org-journal yascroll org-plus-contrib minimap clj-refactor racer toml-mode emacs-racer flycheck-rust rust-mode flycheck-pos-tip flycheck-clojure neotree all-the-icons aggressive-indent aggresive-indent aggresive-indent-mode editorconfig haskell-mode intero lsp-haskell projectile cider rainbow-delimiters scel sclang w3m auctex-latexmk company-auctex company-math magit telephone-line focus latex-preview-pane tex auctex org-bullets syndicate evil-org smartparens-config smartparens flx counsel swiper ivy xresources-theme evil-commentary evil-escape evil undo-tree general use-package))))
 (custom-set-faces
  ;; custom-set-faces was added by Custom.
  ;; If you edit it by hand, you could mess it up, so be careful.
@@ -162,7 +167,17 @@
   :after company
   :config (company-quickhelp-mode))
 
-; lsp
+                                        ;flycheck
+(use-package flycheck
+  :config
+  (global-flycheck-mode))
+
+(use-package flycheck-pos-tip
+  :after flycheck
+  :config
+  (with-eval-after-load 'flycheck
+    (flycheck-pos-tip-mode)))
+                                        ; lsp
 (use-package lsp-mode
   :hook (XXX-mode . lsp)
   :commands lsp)
@@ -234,6 +249,25 @@
 ; fix those pesky highligts
 (set-face-attribute 'region nil :background "brightblack")
 
+                                        ;all-the-icons
+(use-package all-the-icons)
+
+                                        ;neo-tree
+(use-package neotree
+  :config
+  (setq neo-theme (if (display-graphic-p) 'icons 'arrow))
+  (global-set-key [f8] 'neotree-toggle))
+                                        ;which-key
+(use-package which-key
+  :config
+  (which-key-mode)  
+  (setq which-key-allow-evil-operators t))
+
+;rainbow-delimiters
+(use-package rainbow-delimiters
+  :config
+  (add-hook 'prog-mode-hook #'rainbow-delimiters-mode))
+
 ; rich-minority
 (use-package rich-minority
   :config
@@ -287,7 +321,11 @@
 ; org
 (use-package org
   :mode ("\\.org\\'" . org-mode)
-  :interpreter ("org" . org-mode))
+  :interpreter ("org" . org-mode)
+  :config
+  (custom-set-variables
+   '(org-directory "~/.org")
+   '(org-agenda-files (list org-directory))))
 
 ; evil-org
 (use-package evil-org
@@ -298,7 +336,13 @@
             (lambda ()
               (evil-org-set-key-theme '(textobjects insert navigation additional shift todo heading))))
   (require 'evil-org-agenda)
-    (evil-org-agenda-set-keys))
+  (evil-org-agenda-set-keys))
+
+                                        ;org-journal
+(use-package org-journal
+  :custom
+  (org-journal-dir "~/org/journal/")
+  (org-journal-date-format "%A, %d %B %Y"))
 
 ;;; LaTeX
 
@@ -330,7 +374,7 @@
            "pdflatex -shell-escape"
            ConTeXt-engine))
        ;; (setq-default TeX-engine 'default-shell-escape)
-            ))
+       ))
   (setq reftex-plug-into-AUCTeX t))
 
 (use-package company-auctex
@@ -350,22 +394,54 @@
 ;;; projects
 
 ; projectile
-(use-package projectile)
+(use-package projectile
+  :general
+  (general-nmap
+     "p" '(:keymap projectile-command-map :wk "projectile prefix")))
 
 ; magit
 (use-package magit)
 
 
 ;;; Misc
+
 (use-package w3m)
 
 (use-package rainbow-delimiters
   :config
   (add-hook 'prog-mode-hook #'rainbow-delimiters-mode))
 
-;(add-to-list 'load-path "~/.emacs.d/scel/el")
-;(require 'sclang)
+(use-package editorconfig
+  :config
+  (editorconfig-mode 1))
 
+(use-package aggressive-indent
+  :config
+  (global-aggressive-indent-mode 1))
+
+                                        ;(add-to-list 'load-path "~/.emacs.d/scel/el")
+                                        ;(require 'sclang)
+
+;;; Rust
+(use-package rust-mode
+  :mode ("\\.rs\\'" . rust-mode)
+  :interpreter ("rust" . rust-mode))
+
+(use-package flycheck-rust
+  :after rust-mode)
+
+(use-package racer
+  :after rust-mode
+  :config
+  (add-hook 'rust-mode-hook #'racer-mode)
+  (add-hook 'racer-mode-hook #'eldoc-mode)
+  (add-hook 'racer-mode-hook #'company-mode)
+  (define-key rust-mode-map (kbd "TAB") #'company-indent-or-complete-common)
+  (setq company-tooltip-align-annotations t))
+
+(use-package toml-mode
+  :mode ("\\.toml\\'" . toml-mode)
+  :interpreter ("rust" . toml-mode))
 
 ;;; Haskell
 (use-package haskell-mode
@@ -377,8 +453,33 @@
     (add-hook 'haskell-mode-hook #'lsp))
 
 
+;;; Clojure
+(use-package clojure-mode
+  :mode ("\\.clj*\\'" . clojure-mode)
+  :interpreter ("haskell" . clojure-mode))
+
+(use-package cider
+  :after clojure-mode
+  :config
+  (add-hook 'clojure-mode-hook #'cider-mode)
+  (setq nrepl-hide-special-buffers t))
+
+(use-package flycheck-clojure
+  :after flycheck
+  :config
+  (eval-after-load 'flycheck '(flycheck-clojure-setup))
+  (add-hook 'after-init-hook #'global-flycheck-mode))
+
 ;;; Misc settings
 
 (general-define-key
  :states 'normal
  "rl" 'load-file "~/emacs.d/init.el")
+
+(defun goto-match-paren (arg)
+    "Go to the matching parenthesis if on parenthesis, otherwise insert %.
+vi style of % jumping to matching brace."
+    (interactive "p")
+      (cond ((looking-at "\\s\(\") (forward-list 1) (backward-char 1))
+        ((looking-at \"\\s\)\") (forward-char 1) (backward-list 1))
+        (t (self-insert-command (or arg 1)))))\)"))))