From f9d749729abd3905cf414ed790e9f41b6797700f Mon Sep 17 00:00:00 2001 From: "E. Almqvist" Date: Sat, 7 Jan 2023 19:08:24 +0100 Subject: [PATCH 1/4] Emacs config update --- doomemacs/.doom.d/config.el | 3 +++ emacs/.config/emacs/init.el | 7 +++++++ 2 files changed, 10 insertions(+) diff --git a/doomemacs/.doom.d/config.el b/doomemacs/.doom.d/config.el index 9666f1a..1187d45 100644 --- a/doomemacs/.doom.d/config.el +++ b/doomemacs/.doom.d/config.el @@ -80,3 +80,6 @@ ;; (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/init.el b/emacs/.config/emacs/init.el index e3542da..94069a6 100644 --- a/emacs/.config/emacs/init.el +++ b/emacs/.config/emacs/init.el @@ -38,6 +38,13 @@ ;; 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 nil) + '(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))) From bc6dc1edab7b66e9ea00aa046d6c7c14570a0d62 Mon Sep 17 00:00:00 2001 From: "E. Almqvist" Date: Thu, 12 Jan 2023 20:41:28 +0100 Subject: [PATCH 2/4] Update --- emacs/.config/emacs/init.el | 4 ++-- xmonad/.xmonad/bin/autostart.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/emacs/.config/emacs/init.el b/emacs/.config/emacs/init.el index 94069a6..b0fc7f7 100644 --- a/emacs/.config/emacs/init.el +++ b/emacs/.config/emacs/init.el @@ -39,14 +39,14 @@ '(custom-safe-themes '("e3daa8f18440301f3e54f2093fe15f4fe951986a8628e98dcd781efbec7a46f2" "7a424478cb77a96af2c0f50cfb4e2a88647b3ccca225f8c650ed45b7f50d9525" "02f57ef0a20b7f61adce51445b68b2a7e832648ce2e7efb19d217b6454c1b644" "a44e2d1636a0114c5e407a748841f6723ed442dc3a0ed086542dc71b92a87aee" "7e377879cbd60c66b88e51fad480b3ab18d60847f31c435f15f5df18bdb18184" default)) '(elcord-display-buffer-details nil) - '(elcord-display-elapsed 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))) + '(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. 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 & From a7eeda6516fc6219291caba2e917544131575588 Mon Sep 17 00:00:00 2001 From: "E. Almqvist" Date: Mon, 16 Jan 2023 20:49:06 +0100 Subject: [PATCH 3/4] Emacs fixes for typescript & webmode --- emacs/.config/emacs/init.el | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/emacs/.config/emacs/init.el b/emacs/.config/emacs/init.el index b0fc7f7..03c78fc 100644 --- a/emacs/.config/emacs/init.el +++ b/emacs/.config/emacs/init.el @@ -46,7 +46,7 @@ '(elcord-quiet t) '(elcord-use-major-mode-as-main-icon nil) '(package-selected-packages - '(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))) + '(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. @@ -138,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) From b186c7242620bbfeedca4cd62ecde0b33bcc9d02 Mon Sep 17 00:00:00 2001 From: "E. Almqvist" Date: Mon, 16 Jan 2023 22:12:09 +0100 Subject: [PATCH 4/4] Emacs tweaks --- emacs/.config/emacs/config.el | 8 ++++---- emacs/.config/emacs/init.el | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) 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 03c78fc..5e7ed38 100644 --- a/emacs/.config/emacs/init.el +++ b/emacs/.config/emacs/init.el @@ -46,7 +46,7 @@ '(elcord-quiet t) '(elcord-use-major-mode-as-main-icon nil) '(package-selected-packages - '(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))) + '(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.