diff --git a/init.el b/init.el index 8953eaf..fa22626 100644 --- a/init.el +++ b/init.el @@ -24,6 +24,7 @@ (setq mouse-autoselect-window nil) ; stop popups from getting focus (setq display-line-numbers 'relative) ; show relative line-numers (setq column-number-mode t) ; show column number +(recentf-mode 1) ;; package manager (require 'package) @@ -42,7 +43,7 @@ ;; themes (use-package doom-themes :ensure t :config - (load-theme 'doom-dracula t) + (load-theme 'doom-one-light t) (rainbow-mode)) (use-package doom-modeline :ensure t :hook (after-init . doom-modeline-mode)) @@ -60,6 +61,7 @@ :config (evil-mode 1) (global-display-line-numbers-mode)) + (evil-ex-define-cmd "W[rite]" 'evil-write) (define-key evil-insert-state-map (kbd "C-k") nil) (define-key evil-insert-state-map (kbd "C-v") nil) (define-key evil-insert-state-map (kbd "C-v") 'evil-paste-after) @@ -76,6 +78,10 @@ :config (global-undo-tree-mode) (evil-set-undo-system 'undo-tree)) +(use-package evil-escape :ensure t + :config + (setq-default evil-escape-delay 0.2) + (evil-escape-mode 1)) ;; helm config (use-package helm :ensure t @@ -132,6 +138,17 @@ (use-package projectile :ensure t :config (projectile-mode +1)) +;; treemacs +(use-package treemacs :ensure t) +(use-package treemacs-evil :ensure t + :after (treemacs evil)) +(use-package treemacs-projectile :ensure t + :after (treemacs projectile)) +(use-package lsp-treemacs :ensure t + :after (treemacs lsp) + :config + (lsp-treemacs-sync-mode 1)) + ;; which key (use-package which-key :ensure t :config @@ -149,7 +166,8 @@ :mode "\\.nix\\'") ;; terraform (use-package terraform-mode :ensure t - :config (add-hook 'terraform-mode-hook #'terraform-format-on-save-mode)) + :config + (add-hook 'terraform-mode-hook #'terraform-format-on-save-mode)) ;; rego (use-package rego-mode :ensure t) ;; vue @@ -187,7 +205,8 @@ ) (use-package markdown-mode :ensure t :config - (add-hook 'markdown-mode-hook (lambda () (setq indent-tabs-mode nil)))) + (add-hook 'markdown-mode-hook (lambda () (setq indent-tabs-mode nil))) + (set-variable 'markdown-max-image-size '(800 . 600))) ;; php (use-package php-mode :ensure t) ;; k8s @@ -200,9 +219,9 @@ (setq rust-format-on-save t) (add-hook 'rust-mode-hook (lambda () (setq indent-tabs-mode nil)))) ;; python -(use-package lsp-pyright +(use-package python-black :ensure t - :hook (python-mode . (lambda () (require 'lsp-pyright) (lsp)))) + :hook (python-mode . python-black-on-save-mode-enable-dwim)) ;; code-with-fun (use-package evil-org :ensure t @@ -235,6 +254,7 @@ (setq company-idle-delay 0.1 company-minimum-prefix-length 2 company-require-match nil)) +(use-package graphql-mode :ensure t) (use-package highlight-indentation :ensure t) @@ -327,7 +347,8 @@ ;; general config (use-package general :ensure t :config - (global-set-key [escape] #'helm-or-evil-escape) + (global-set-key (kbd "") 'evil-escape) + (global-set-key (kbd "C-c C-g") 'evil-escape) (menu-bar-mode -1) (scroll-bar-mode -1) (tool-bar-mode -1)