summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
Diffstat (limited to 'config')
-rw-r--r--config/emacs/init.el6
1 files changed, 5 insertions, 1 deletions
diff --git a/config/emacs/init.el b/config/emacs/init.el
index ef38196..3c40151 100644
--- a/config/emacs/init.el
+++ b/config/emacs/init.el
@@ -2,7 +2,7 @@
(add-to-list 'package-archives '("melpa" . "http://melpa.org/packages/") t)
(package-initialize)
(custom-set-variables
- '(package-selected-packages '(fzf kaolin-themes evil popper flycheck company lsp-mode cmake-mode nix-mode clang-format direnv magit evil-collection vue-mode typescript-mode)))
+ '(package-selected-packages '(fzf kaolin-themes evil popper flycheck company lsp-mode cmake-mode nix-mode clang-format direnv magit evil-collection vue-mode typescript-mode haml-mode yaml-mode)))
(require 'direnv)
(direnv-mode 1)
@@ -28,6 +28,10 @@
(global-set-key (kbd "C-`") 'popper-cycle)
(global-set-key (kbd "s-`") 'popper-toggle-type)
+(setq-default tab-width 2)
+(setq-default indent-tabs-mode nil)
+(setq-default c-basic-offset 2)
+
(setq evil-want-C-u-scroll t)
(setq evil-undo-system 'undo-redo)
(setq evil-emacs-state-modes nil)