2 files changed, 32 insertions, 15 deletions
diff --git a/users/glittershark/emacs.d/config.el b/users/glittershark/emacs.d/config.el
index 91100017c346..18cd69ca625a 100644
--- a/users/glittershark/emacs.d/config.el
+++ b/users/glittershark/emacs.d/config.el
@@ -13,11 +13,7 @@
       doom-variable-pitch-font (font-spec :family "DejaVu Sans")
       doom-unicode-font (font-spec :family "Meslo LGSDZ Nerd Font"))
 
-(after! rust
-  ;; (require 'ein)
-  (setq rust-format-on-save t)
-  (add-hook! :after rust-mode-hook #'lsp)
-  (add-hook! :after rust-mode-hook #'rust-enable-format-on-save))
+(require 's)
 
 (load! "utils")
 (load! "company-sql")
@@ -31,10 +27,16 @@
 (load! "email")
 (load! "cpp")
 (load! "lisp")
+(load! "slack")
 
-(require 's)
 (require 'tvl)
 
+(after! rust
+  ;; (require 'ein)
+  (setq rust-format-on-save t)
+  (add-hook! :after rust-mode-hook #'lsp)
+  (add-hook! :after rust-mode-hook #'rust-enable-format-on-save))
+
 (add-hook! rust-mode
   (flycheck-rust-setup)
   (flycheck-mode)
@@ -371,11 +373,6 @@
   (set-face-attribute 'slack-message-output-text nil :height 1.0)
   )
 
-(after! slack
-  (set-face-foreground 'slack-message-output-header +solarized-s-base01)
-  (set-face-attribute 'slack-message-output-header nil :underline nil)
-  (set-face-attribute 'slack-message-output-text nil :height 1.0))
-
 (after! evil
   (setq evil-shift-width 2))
 
@@ -546,10 +543,6 @@
               (bound-and-true-p brittany-haskell-mode))
      (urbint/format-haskell-source))))
 
-(require 'slack)
-(setq slack-buffer-emojify 't
-      slack-prefer-current-team 't)
-
 (require 'alert)
 (setq alert-default-style 'libnotify)
 
diff --git a/users/glittershark/emacs.d/slack.el b/users/glittershark/emacs.d/slack.el
new file mode 100644
index 000000000000..8e21c4f74d57
--- /dev/null
+++ b/users/glittershark/emacs.d/slack.el
@@ -0,0 +1,24 @@
+;;; ~/code/depot/users/glittershark/emacs.d/slack.el -*- lexical-binding: t; -*-
+
+(after! slack
+  (set-face-foreground 'slack-message-output-header +solarized-s-base01)
+  (set-face-attribute 'slack-message-output-header nil :underline nil)
+  (set-face-attribute 'slack-message-output-text nil :height 1.0))
+
+(require 'slack)
+(setq slack-buffer-emojify 't
+      slack-prefer-current-team 't
+      slack-thread-also-send-to-room nil)
+
+(set-popup-rule! "^\\*Slack"
+  :quit nil
+  :select t
+  :side 'bottom
+  :ttl nil
+  :size 0.3)
+
+(add-hook #'slack-message-buffer-mode-hook
+          (lambda () (toggle-truncate-lines -1)))
+
+(map! (:map slack-message-buffer-mode-map
+       :n "q" #'delete-window))