modules/emacs: Switching to self-hosted build and adding some pkgsHEADmaster

The reason for this is that nix-darwin is broken (or generally nix on
MacOS), and I need to be able to build emacs with just nix-build.
There is some refactoring coming up for this anyway, where modules
should be self-contained settings, that are enabled by configuration/
and roots/.

2 files changed, 9 insertions, 10 deletions

diff --git a/modules/workstation/emacs/default.nix b/modules/workstation/emacs/default.nix
index 63135a56f51..c76029fe1dd 100644
--- a/modules/workstation/emacs/default.nix
+++ b/modules/workstation/emacs/default.nix
@@ -1,7 +1,6 @@
-{ pkgs, ... }:
+with import <nixpkgs> {};
 
-let
-  emacs = with pkgs; emacsWithPackages (epkgs:
+pkgs.emacsWithPackages (epkgs:
     (with epkgs; [
       (runCommand "init.el" {} ''
           mkdir -p $out/share/emacs/site-lisp
@@ -17,6 +16,7 @@ let
       python-mode
       rust-mode
 
+      centaur-tabs
       color-identifiers-mode
       color-theme-sanityinc-tomorrow
       company
@@ -31,16 +31,15 @@ let
       multiple-cursors
       notmuch
       org
+      paredit
       protobuf-mode
       scad-mode
       smex
       sublimity
+      treemacs
       undo-tree
       visual-fill-column
+      vterm
       which-key
       yasnippet
-    ]));
-in
-{
-  home.packages = [ emacs pkgs.direnv ];
-}
+    ]))
diff --git a/modules/workstation/emacs/init.el b/modules/workstation/emacs/init.el
index 28b8146f632..48702f70464 100644
--- a/modules/workstation/emacs/init.el
+++ b/modules/workstation/emacs/init.el
@@ -78,7 +78,7 @@
 ;; Some editing niceties
 (delete-selection-mode 1)
 (show-paren-mode 1)
-(setq-default truncate-lines t)
+(setq-default truncate-lines 1)
 
 ;; Explicitly enable lsp-mode for certain languages
 (add-hook 'rust-mode-hook #'lsp)
@@ -195,7 +195,7 @@
          (reg-start (point))
          (reg-end reg-start)
 
-         ;; De we delete a trailing \n
+         ;; Do we delete a trailing \n
          del-nl-trail)
 
     ;; Find the text borders