diff --git a/doomemacs/.doom.d/config.el b/doomemacs/.doom.d/config.el index 8449862..1187d45 100644 --- a/doomemacs/.doom.d/config.el +++ b/doomemacs/.doom.d/config.el @@ -78,3 +78,8 @@ ;; Indentation ;; (setq-default tab-width 4) ;; (setq-default indent-tabs-mode t) + +;; (elcord-mode) + +;; Find file +(global-set-key (kbd "M-f") 'counsel-find-file) diff --git a/emacs/.config/emacs/config.el b/emacs/.config/emacs/config.el index 741465f..e29b50a 100644 --- a/emacs/.config/emacs/config.el +++ b/emacs/.config/emacs/config.el @@ -11,11 +11,11 @@ ;; Enable line numbers (global-display-line-numbers-mode 1) -;; Indentation +;; Indentaion (setq - indent-tabs-mode t - tab-width 4 -) + indent-tabs-mode t + tab-width 4 + ) (define-key evil-insert-state-map (kbd "TAB") 'tab-to-tab-stop) ;; TODO keywords etc diff --git a/emacs/.config/emacs/init.el b/emacs/.config/emacs/init.el index e3542da..5e7ed38 100644 --- a/emacs/.config/emacs/init.el +++ b/emacs/.config/emacs/init.el @@ -38,8 +38,15 @@ ;; If there is more than one, they won't work right. '(custom-safe-themes '("e3daa8f18440301f3e54f2093fe15f4fe951986a8628e98dcd781efbec7a46f2" "7a424478cb77a96af2c0f50cfb4e2a88647b3ccca225f8c650ed45b7f50d9525" "02f57ef0a20b7f61adce51445b68b2a7e832648ce2e7efb19d217b6454c1b644" "a44e2d1636a0114c5e407a748841f6723ed442dc3a0ed086542dc71b92a87aee" "7e377879cbd60c66b88e51fad480b3ab18d60847f31c435f15f5df18bdb18184" default)) + '(elcord-display-buffer-details nil) + '(elcord-display-elapsed t) + '(elcord-editor-icon "emacs_material_icon") + '(elcord-idle-message "Thinking...") + '(elcord-idle-timer 300) + '(elcord-quiet t) + '(elcord-use-major-mode-as-main-icon nil) '(package-selected-packages - '(format-all hl-todo elcord evil-tabs evil-commentary format-all auto-complete editorconfig haskell-mode counsel ivy go-mode rust-mode use-package treemacs-evil treemacs projectile doom-themes lsp-mode evil))) + '(evil-smartparens smartparens web-mode sublimity typescript-mode glsl-mode format-all hl-todo elcord evil-tabs evil-commentary format-all auto-complete editorconfig haskell-mode counsel ivy go-mode rust-mode use-package treemacs-evil treemacs projectile doom-themes lsp-mode evil))) (custom-set-faces ;; custom-set-faces was added by Custom. @@ -131,3 +138,18 @@ ;; Loading config stuff (load "$HOME/.config/emacs/config.el") + +;; Lang stuff + +;; Typescript / webmode stuff +(setq web-mode-markup-indent-offset 2) +(setq web-mode-code-indent-offset 2) +(setq web-mode-css-indent-offset 2) +(use-package web-mode + :ensure t + :mode (("\\.js\\'" . web-mode) + ("\\.jsx\\'" . web-mode) + ("\\.ts\\'" . web-mode) + ("\\.tsx\\'" . web-mode) + ("\\.html\\'" . web-mode)) + :commands web-mode) diff --git a/xmonad/.xmonad/bin/autostart.sh b/xmonad/.xmonad/bin/autostart.sh index 9d70247..637ccae 100755 --- a/xmonad/.xmonad/bin/autostart.sh +++ b/xmonad/.xmonad/bin/autostart.sh @@ -33,4 +33,4 @@ eval $(gnome-keyring-daemon --start) export SSH_AUTH_SOCK # Emacs daemon -emacs --daemon & +# emacs --daemon &