pestctrl/nixos-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Define emacs in one place

Browse source
This commit is contained in:
Benson Chu 2025-06-15 11:06:50 -05:00
parent fab03630a5
commit e152da7a94
4 changed files with 22 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
common/base-packages.nix
View file

@ -17,16 +17,8 @@
nfs-utils nfs-utils
sshfs sshfs
# unstable.emacs myEmacs
#
# Probably this is being overwritten by home-manager.
#
# TODO: Resolve the disparity.
((emacsPackagesFor emacs-unstable).emacsWithPackages
(epkgs: with epkgs; [
treesit-grammars.with-all-grammars
mu4e
]))
notmuch mu isync notmuch mu isync
keychain ledger gnupg keychain ledger gnupg
ledger2beancount beancount fava ledger2beancount beancount fava

10
common/exwm.nix
View file

@ -1,12 +1,4 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
let
emacs =
((pkgs.emacsPackagesFor pkgs.emacs-unstable).emacsWithPackages
(epkgs: with epkgs; [
treesit-grammars.with-all-grammars
mu4e
]));
in
{ {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
picom picom
@ -19,7 +11,7 @@ in
windowManager.session = [{ windowManager.session = [{
name = "my-exwm"; name = "my-exwm";
start = '' start = ''
${emacs}/bin/emacs -l /home/benson/.emacs.d/init.el ${pkgs.myEmacs}/bin/emacs -l /home/benson/.emacs.d/init.el
''; '';
}]; }];

16
common/overlays.nix
View file

@ -10,4 +10,20 @@ inputs:
dontStrip = true; dontStrip = true;
}); });
}) })
(final: prev:
let
emacs-with-xrandr = final.emacs-unstable.overrideAttrs (
oa: {
buildInputs = oa.buildInputs ++ [ prev.xorg.libXrandr ];
}
);
in {
myEmacs =
((prev.emacsPackagesFor emacs-with-xrandr)
.emacsWithPackages (epkgs: with epkgs; [
treesit-grammars.with-all-grammars
mu4e
]));
})
] ]

17
home/users/benson.nix
View file

@ -1,16 +1,5 @@
{ inputs, config, pkgs, lib, ... }@args: { inputs, config, pkgs, lib, ... }@args:
let {
emacs-with-xrandr = pkgs.emacs-unstable.overrideAttrs (
oa: {
buildInputs = oa.buildInputs ++ [ pkgs.xorg.libXrandr ];
}
);
my-emacs = ((pkgs.emacsPackagesFor emacs-with-xrandr)
.emacsWithPackages (epkgs: with epkgs; [
treesit-grammars.with-all-grammars
mu4e
]));
in {
imports = [ imports = [
../modules ../modules
../../submodules ../../submodules
@ -113,7 +102,7 @@ in {
smtp.host = "smtp.fastmail.com"; smtp.host = "smtp.fastmail.com";
userName = "bensonchu@fastmail.com"; userName = "bensonchu@fastmail.com";
passwordCommand = ''${my-emacs}/bin/emacsclient -e '(get-authinfo "imap.fastmail.com" "993" "bensonchu457@fastmail.com")' | ${pkgs.coreutils}/bin/tr -d '"' ''; passwordCommand = ''${pkgs.myEmacs}/bin/emacsclient -e '(get-authinfo "imap.fastmail.com" "993" "bensonchu457@fastmail.com")' | ${pkgs.coreutils}/bin/tr -d '"' '';
mu.enable = true; mu.enable = true;
}; };
@ -134,7 +123,7 @@ in {
}; };
emacs = { emacs = {
package = my-emacs; package = pkgs.myEmacs;
enable = true; enable = true;
}; };