From eddb9d32ba4421eb1669f264162f335c41b09639 Mon Sep 17 00:00:00 2001
From: Matthew Lemon <lemon@matthewlemon.com>
Date: Sat, 21 Dec 2019 20:46:16 +0000
Subject: removed evil and some tweaks

---
 custom-settings.el |  2 +-
 init.el            | 46 ++++++++++++++++++++++++----------------------
 2 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/custom-settings.el b/custom-settings.el
index f069678..af5228d 100644
--- a/custom-settings.el
+++ b/custom-settings.el
@@ -41,7 +41,7 @@
  '(org-sort-agenda-notime-is-late nil t)
  '(package-selected-packages
    (quote
-    (dracula-theme evil-mode yasnippet-snippets oauth2 highlight-symbol rainbow-delimiters git-gutter Ivy org-caldav which-key-mode org-plus-contrib use-package ac-cider magit blacken py-autopep8 flycheck elpy yasnippet company-lsp company lsp-ui go-autocomplete lsp-mode go-mode markdown-mode gruvbox-theme helm org cider slime evil)))
+    (monokai-theme color-theme-monokai color-theme-sanityinc-tomorrow dracula-theme evil-mode yasnippet-snippets highlight-symbol rainbow-delimiters git-gutter Ivy org-caldav which-key-mode org-plus-contrib use-package ac-cider magit blacken py-autopep8 flycheck elpy yasnippet company-lsp company lsp-ui go-autocomplete lsp-mode go-mode markdown-mode gruvbox-theme helm org cider slime evil)))
  '(pdf-view-midnight-colors (quote ("#fdf4c1" . "#282828")))
  '(pos-tip-background-color "#36473A")
  '(pos-tip-foreground-color "#FFFFC8")
diff --git a/init.el b/init.el
index 84e000d..760573d 100644
--- a/init.el
+++ b/init.el
@@ -28,6 +28,9 @@
 (require 'use-package-ensure)
 (setq use-package-always-ensure t)
 
+;; Themes
+(use-package monokai-theme)
+
 ;; Highlight line
 ;;(setq set-face-background hl-line-face "pale goldenrod")
 ;;(hl-line-mode 1)
@@ -105,25 +108,25 @@
 
 
 ;; Evil mode
-(use-package evil
-  :config
-  (evil-mode 1)
-  (mapc (lambda (mode)
-        (evil-set-initial-state mode 'emacs)) '(elfeed-show-mode
-                                                elfeed-search-mode
-                                                forge-pullreq-list-mode
-                                                forge-topic-list-mode
-                                                dired-mode
-                                                help-mode
-                                                info
-                                                tide-references-mode
-                                                image-dired-mode
-                                                image-dired-thumbnail-mode
-                                                eww-mode))
-
-  (define-key evil-normal-state-map (kbd "{") 'evil-next-buffer)
-  (define-key evil-normal-state-map (kbd "}") 'evil-prev-buffer)
-  )
+;; (use-package evil
+;;   :config
+;;   (evil-mode 1)
+;;   (mapc (lambda (mode)
+;;         (evil-set-initial-state mode 'emacs)) '(elfeed-show-mode
+;;                                                 elfeed-search-mode
+;;                                                 forge-pullreq-list-mode
+;;                                                 forge-topic-list-mode
+;;                                                 dired-mode
+;;                                                 help-mode
+;;                                                 info
+;;                                                 tide-references-mode
+;;                                                 image-dired-mode
+;;                                                 image-dired-thumbnail-mode
+;;                                                 eww-mode))
+
+;;   (define-key evil-normal-state-map (kbd "{") 'evil-next-buffer)
+;;   (define-key evil-normal-state-map (kbd "}") 'evil-prev-buffer)
+;;   )
 
 ;; Ace Jump
 (use-package ace-jump-mode
@@ -139,7 +142,6 @@
 (tooltip-mode -1)
 (menu-bar-mode -1)
 
-(use-package oauth2)
 
 ;; org-caldav
 (use-package org-caldav
@@ -278,7 +280,7 @@
   (ivy-mode 1)
   (global-set-key (kbd "C-s") 'swiper-isearch)
   (global-set-key (kbd "M-x") 'counsel-M-x)
-  (global-set-key (kbd "C-x C-f") 'counsel-find-file)
+  ;; (global-set-key (kbd "C-x C-f") 'counsel-find-file)
   (global-set-key (kbd "M-y") 'counsel-yank-pop)
   (global-set-key (kbd "<f1> f") 'counsel-describe-function)
   (global-set-key (kbd "<f1> v") 'counsel-describe-variable)
@@ -286,7 +288,7 @@
   (global-set-key (kbd "<f2> i") 'counsel-info-lookup-symbol)
   (global-set-key (kbd "<f2> u") 'counsel-unicode-char)
   (global-set-key (kbd "<f2> j") 'counsel-set-variable)
-  (global-set-key (kbd "C-x b") 'ivy-switch-buffer)
+  ;; (global-set-key (kbd "C-x b") 'ivy-switch-buffer)
   (global-set-key (kbd "C-c v") 'ivy-push-view)
   (global-set-key (kbd "C-c V") 'ivy-pop-view)
   (global-set-key (kbd "C-c g") 'counsel-git)
-- 
cgit v1.2.3