Redo general, add hackertyper

1 files changed, 7 insertions, 40 deletions

diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 20d33a0..417eda9 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -6,7 +6,7 @@
 (load "~/.emacs.d/lisp/init-keys.el")
 ;;(load "~/.emacs.d/lisp/init-exwm.el")
 (use-package corfu)
-
+(use-package hacker-typer)
 
 (setq package-archives '(("melpa" . "https://melpa.org/packages/")
 			 ("org" . "https://orgmode.org/elpa/")
@@ -138,46 +138,15 @@
   (global-set-key (kbd "<escape>") 'keyboard-escape-quit)
 
 (define-prefix-command 'window)
-(use-package general
-   :config
-   (general-create-definer apollo/leader-keys
-     :keymaps '(normal insert visual emacs)
-     :prefix "SPC"
-     :global-prefix "C-SPC")
-
-   (apollo/leader-keys
-    "t" '(:ignore t :which-key "toggles")
-    "tt" '(counsel-load-theme :which-key "choose theme")))
 
 
-;; (use-package evil
-;;     :init
-;;     (setq evil-want-integration t)
-;;     (setq evil-want-keybinding nil)
-;;     (setq evil-want-C-u-scroll t)
-;;     (setq evil-want-C-i-jump nil)
-;;     ;;:hook (evil-mode . apollo/evil-hook)
-;;     :config
-;;     (evil-mode 1)
-;;     (define-key evil-insert-state-map (kbd "C-f") 'evil-normal-state)
+(require 'general)
 
-;;     (evil-global-set-key 'motion "j" 'evil-next-visual-line)
-;;     (evil-global-set-key 'motion "k" 'evil-previous-visual-line)
 
-;;     (evil-set-initial-state 'messages-buffer-mode 'normal)
-;;     (evil-set-initial-state 'dashboard-mode 'normal)
-;;     (evil-define-key 'normal dire-mode-map
-;;     (kbd "h")     'dired-up-directory
-;;     (kbd "l")     'dired-find-file
-;;     (kbd "m")     'dired-mark
-;;     (kbd "R")     'dired-do-rename
-;;     (kbd "D")     'dired-do-delete)
-;;     )
 
-;; (use-package evil-collection
-;;     :after evil
-;;     :config
-;;     (evil-collection-init))
+ (apollo/leader-keys
+    "t" '(:ignore t :which-key "toggles")
+    "tt" '(counsel-load-theme :which-key "choose theme"))
 
 
 
@@ -376,9 +345,7 @@
 (use-package json-mode
     :mode ".json"
     :hook (json-mode . lsp-deferred))
-;; (use-package js2-mode
-;;   :mode "\\.js\\'")
-;; (provide 'init-javascript)
+
 
 (use-package rjsx-mode
   :mode ".js"
@@ -499,7 +466,7 @@
  '(custom-safe-themes
    '("944d52450c57b7cbba08f9b3d08095eb7a5541b0ecfb3a0a9ecd4a18f3c28948" "3199be8536de4a8300eaf9ce6d864a35aa802088c0925e944e2b74a574c68fd0" "443e2c3c4dd44510f0ea8247b438e834188dc1c6fb80785d83ad3628eadf9294" "554c2be54aecbbd3a6317906ada2e8f25f50f8d6bf3d9c22e3b30e3700d0bbd1" "5f128efd37c6a87cd4ad8e8b7f2afaba425425524a68133ac0efd87291d05874" "bf948e3f55a8cd1f420373410911d0a50be5a04a8886cabe8d8e471ad8fdba8e" "fb2c27e7ad4a81c2f57bceeca0faeb1c84fb7a167c097b998e2a1ea314455fd6" "47f3e55e4e3d570d5513d4cc58047dc059bd6ab3d135c796c4ccbfb77d4eb88b" "1070069a4671554a2c00b8375485896c1aa8144f5b8d99b86845069351770ee9" "e8483bc21cf667971eabdbb01203e3a471de1b59a4e532368b7a20f5665d686a" "b7bf7b95fb796614f0b36a7c4906a93db75ad0c6146f336c7ed085f6fceef93d" "05b767a3f3a37ac46353fd88f194934d82eb6c3644c3b8da883752f57513e7aa" default))
  '(package-selected-packages
-   '(autocomplete ac-slime rjsx-mode telega monkeytype evil-collection lsp-intellij lsp-mode yasnippet lsp-treemacs helm-lsp projectile hydra flycheck company avy which-key helm-xref dap-mode zenburn-theme json-mode)))
+   '(hacker-typer autocomplete ac-slime rjsx-mode telega monkeytype evil-collection lsp-intellij lsp-mode yasnippet lsp-treemacs helm-lsp projectile hydra flycheck company avy which-key helm-xref dap-mode zenburn-theme json-mode)))
 (custom-set-faces
  ;; custom-set-faces was added by Custom.
  ;; If you edit it by hand, you could mess it up, so be careful.