1 files changed, 61 insertions, 13 deletions
diff --git a/emacs.el b/emacs.el
index 21d3211..363be71 100644
--- a/emacs.el
+++ b/emacs.el
@@ -3,27 +3,75 @@
 
 (provide 'johannst)
 
+;; config
+(custom-set-variables
+ '(font-use-system-font t)
+ '(indent-tabs-mode nil)
+ '(inhibit-startup-screen t)
+ '(tool-bar-mode nil)
+ '(whitespace-style '(trailing tabs newline tab-mark newline-mark))
+ )
+
 ;; fix 'bad request' on package-refresh-contents (should be fixed with emcas 26.3)
 (setq gnutls-algorithm-priority "NORMAL:-VERS-TLS1.3")
 
 ;; ELPA & MELPA
 (require 'package)
-(add-to-list 'package-archives '("melpa" . "https://melpa.org/packages/"))
-(add-to-list 'package-archives '("gnu" . "https://elpa.gnu.org/packages/") t)
+(add-to-list 'package-archives '("melpa" . "http://melpa.org/packages/") t)
+(add-to-list 'package-archives '("gnu" . "http://elpa.gnu.org/packages/") t)
+(setq package-enable-at-startup nil)
 (package-initialize)
 
-;; config
-(custom-set-variables
- '(font-use-system-font t)
- '(package-selected-packages (quote (spacemacs-theme evil magit rust-mode cargo)))
- '(semantic-mode t)
- '(tool-bar-mode nil)
- '(indent-tabs-mode nil)
-)
+;; bootstrap use-package
+(unless (package-installed-p 'use-package)
+  (package-refresh-contents)
+  (package-install 'use-package))
+(eval-when-compile
+  (require 'use-package))
 
 ;; theme
-(load-theme 'spacemacs-dark t)
+(use-package spacemacs-theme
+  :ensure t
+  :defer t
+  :init
+  (load-theme 'spacemacs-dark t)
+  )
+
+;; evil
+(use-package evil
+  :ensure t
+  :config
+  (evil-mode t)
+  )
+
+;; org
+(use-package org
+  :config
+  (setq org-log-done t)
+  )
+
+;; help
+(use-package helm
+  :ensure t
+  :config
+  (helm-mode t)
+  )
+
+;; rust-mode
+(use-package rust-mode
+  :ensure t
+  :config
+  (helm-mode t)
+  )
 
-;; rust foo
-(add-hook 'rust-mode-hook 'cargo-minor-mode)
+;; cargo
+(use-package cargo
+  :ensure t
+  :config
+  (add-hook 'rust-mode-hook 'cargo-minor-mode)
+  )
 
+;; magit
+(use-package magit
+  :ensure t
+  )