Redo keys

1 files changed, 32 insertions, 10 deletions

diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 417eda9..a830834 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -3,8 +3,20 @@
 (require 'package)
 (add-to-list 'load-path "~/.emacs.d/lisp/")
 (load "~/.emacs.d/custom.el")
-(load "~/.emacs.d/lisp/init-keys.el")
+;;(load "~/.emacs.d/lisp/init-keys.el")
 ;;(load "~/.emacs.d/lisp/init-exwm.el")
+;;Ibuffer
+(global-set-key (kbd "C-x C-b") 'ibuffer)
+;;Counsel
+(global-set-key (kbd "M-;") 'counsel-M-x)
+;;Window control map
+(define-prefix-command 'window-control-map)
+(global-set-key (kbd "C-w") 'window-control-map)
+(define-key window-control-map (kbd "C-v") 'split-window-right)
+(define-key window-control-map (kbd "C-n") 'windmove-right)
+(define-key window-control-map (kbd "C-b") 'windmove-left)
+(define-key window-control-map (kbd "C-q") 'delete-window)
+
 (use-package corfu)
 (use-package hacker-typer)
 
@@ -144,18 +156,18 @@
 
 
 
- (apollo/leader-keys
-    "t" '(:ignore t :which-key "toggles")
-    "tt" '(counsel-load-theme :which-key "choose theme"))
+;;  (apollo/leader-keys
+;;     "t" '(:ignore t :which-key "toggles")
+;;     "tt" '(counsel-load-theme :which-key "choose theme"))
 
 
 
-(apollo/leader-keys
-  "g" '(:ignore t :which-key "Git")
-  "gs" '(magit-status :which-key "status"))
+;; (apollo/leader-keys
+;;   "g" '(:ignore t :which-key "Git")
+;;   "gs" '(magit-status :which-key "status"))
 
-(apollo/leader-keys
-"f" '(counsel-find-file :which-key "Find File"))
+;; (apollo/leader-keys
+;; "f" '(counsel-find-file :which-key "Find File"))
 
 (defun apollo/org-mode-setup ()
   (setq evil-auto-indent nil)
@@ -358,6 +370,16 @@
     (if (looking-at-p "^ +\/?> *$")
         (delete-char sgml-basic-offset)))))
 
+;; (use-package html-mode
+;;   :mode ".html"
+;;   :hook (html-mode . lsp-deferred)
+;;   :config
+;;     (defadvice js-jsx-indent-line (after js-jsx-indent-line-after-hack activate)
+;;   "Workaround sgml-mode and follow airbnb component style."
+;;   (save-excursion
+;;     (beginning-of-line)
+;;     (if (looking-at-p "^ +\/?> *$")
+;;         (delete-char sgml-basic-offset)))))
 
 (use-package typescript-mode
 :mode ".ts'"
@@ -466,7 +488,7 @@
  '(custom-safe-themes
    '("944d52450c57b7cbba08f9b3d08095eb7a5541b0ecfb3a0a9ecd4a18f3c28948" "3199be8536de4a8300eaf9ce6d864a35aa802088c0925e944e2b74a574c68fd0" "443e2c3c4dd44510f0ea8247b438e834188dc1c6fb80785d83ad3628eadf9294" "554c2be54aecbbd3a6317906ada2e8f25f50f8d6bf3d9c22e3b30e3700d0bbd1" "5f128efd37c6a87cd4ad8e8b7f2afaba425425524a68133ac0efd87291d05874" "bf948e3f55a8cd1f420373410911d0a50be5a04a8886cabe8d8e471ad8fdba8e" "fb2c27e7ad4a81c2f57bceeca0faeb1c84fb7a167c097b998e2a1ea314455fd6" "47f3e55e4e3d570d5513d4cc58047dc059bd6ab3d135c796c4ccbfb77d4eb88b" "1070069a4671554a2c00b8375485896c1aa8144f5b8d99b86845069351770ee9" "e8483bc21cf667971eabdbb01203e3a471de1b59a4e532368b7a20f5665d686a" "b7bf7b95fb796614f0b36a7c4906a93db75ad0c6146f336c7ed085f6fceef93d" "05b767a3f3a37ac46353fd88f194934d82eb6c3644c3b8da883752f57513e7aa" default))
  '(package-selected-packages
-   '(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)))
+   '(html-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.