3 files changed, 14 insertions, 12 deletions
diff --git a/users/tazjin/emacs/config/init.el b/users/tazjin/emacs/config/init.el
index ced3bf2ff83b..a0adcf6cfaec 100644
--- a/users/tazjin/emacs/config/init.el
+++ b/users/tazjin/emacs/config/init.el
@@ -72,7 +72,8 @@
 (use-package rainbow-mode)
 (use-package s)
 (use-package string-edit-at-point)
-(use-package term-switcher)
+(use-package term-switcher
+  :bind (:map global-map ("<f5>" . #'ts/switch-to-terminal)))
 
 (use-package undo-tree
   :config (global-undo-tree-mode)
@@ -126,12 +127,9 @@
 
 (use-package f)
 
-(use-package go-mode
-  :bind (:map go-mode-map ("C-c C-r" . recompile))
-  :hook ((go-mode . (lambda ()
-                      (setq tab-width 2)
-                      (setq-local compile-command
-                                  (concat "go build " buffer-file-name))))))
+(use-package go-ts-mode
+  :custom
+  (go-ts-mode-indent-offset 4))
 
 (use-package haskell-mode)
 
@@ -169,7 +167,7 @@
   (setq common-lisp-hyperspec-root "file:///home/tazjin/docs/lisp/"))
 
 (use-package telega
-  :bind (:map global-map ("s-c" . (lambda (p) (interactive "P")
+  :bind (:map global-map ("C-x c" . (lambda (p) (interactive "P")
                                     (if p (call-interactively #'telega-chat-with)
                                       (telega))))
          :map telega-chat-button-map ("a" . ignore))
@@ -241,8 +239,7 @@
 
 ;; Load all other Emacs configuration. These configurations are
 ;; added to `load-path' by Nix.
-(mapc 'require '(desktop
-                 mail-setup
+(mapc 'require '(mail-setup
                  look-and-feel
                  functions
                  settings
diff --git a/users/tazjin/emacs/config/settings.el b/users/tazjin/emacs/config/settings.el
index 6c66ca608d6e..afe181b70bdf 100644
--- a/users/tazjin/emacs/config/settings.el
+++ b/users/tazjin/emacs/config/settings.el
@@ -19,6 +19,9 @@
       ediff-split-window-function 'split-window-horizontally
       initial-major-mode 'emacs-lisp-mode)
 
+(setq-default tab-width 4)
+(setq-default fill-column 80)
+
 (add-to-list 'safe-local-variable-values '(lexical-binding . t))
 (add-to-list 'safe-local-variable-values '(whitespace-line-column . 80))
 
diff --git a/users/tazjin/emacs/default.nix b/users/tazjin/emacs/default.nix
index 46843432f189..80a922043277 100644
--- a/users/tazjin/emacs/default.nix
+++ b/users/tazjin/emacs/default.nix
@@ -3,14 +3,14 @@
 { depot, lib, pkgs, ... }:
 
 pkgs.makeOverridable
-  ({ emacs ? pkgs.emacs29 }:
+  ({ emacs ? pkgs.emacs29-pgtk }:
   let
     emacsPackages = (pkgs.emacsPackagesFor emacs);
     emacsWithPackages = emacsPackages.emacsWithPackages;
 
     # If switching telega versions, use this variable because it will
     # keep the version check, binary path and so on in sync.
-    currentTelega = epkgs: epkgs.melpaPackages.telega;
+    currentTelega = epkgs: epkgs.telega;
 
     # $PATH for binaries that need to be available to Emacs
     emacsBinPath = lib.makeBinPath [
@@ -41,6 +41,7 @@ pkgs.makeOverridable
       tree-sitter-rust
       tree-sitter-sql
       tree-sitter-toml
+      tree-sitter-typescript
       tree-sitter-yaml
     ]);
 
@@ -112,6 +113,7 @@ pkgs.makeOverridable
 
       # Custom depot packages (either ours, or overridden ones)
       tvlPackages.dottime
+      tvlPackages.niri
       tvlPackages.nix-util
       tvlPackages.passively
       tvlPackages.rcirc