mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(ops/nixos/nugget): Ensure that 'nuggetEmacs' is used for EXWM

Browse source
This commit is contained in:
Vincent Ambo 2020-03-12 23:49:39 +00:00
parent 080c3591ca
commit 576f190972
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
ops/nixos/nugget/default.nix
View file

@ -7,6 +7,12 @@ config: let
}; };
lieer = (depot.third_party.lieer {}); lieer = (depot.third_party.lieer {});
# google-c-style is installed only on nugget because other
# machines get it from, eh, elsewhere.
nuggetEmacs = (depot.tools.emacs.overrideEmacs(epkgs: epkgs ++ [
depot.third_party.emacsPackages.google-c-style
]));
in depot.lib.fix(self: { in depot.lib.fix(self: {
imports = [ imports = [
../modules/tailscale.nix ../modules/tailscale.nix
@ -91,15 +97,10 @@ in depot.lib.fix(self: {
# programs from the depot # programs from the depot
(with depot; [ (with depot; [
lieer lieer
nuggetEmacs
ops.kontemplate ops.kontemplate
third_party.git third_party.git
third_party.tailscale third_party.tailscale
# google-c-style is installed only on nugget because other
# machines get it from, eh, elsewhere.
(tools.emacs.overrideEmacs(epkgs: epkgs ++ [
third_party.emacsPackages.google-c-style
]))
]) ++ ]) ++
# programs from nixpkgs # programs from nixpkgs
@ -222,7 +223,7 @@ in depot.lib.fix(self: {
windowManager.session = lib.singleton { windowManager.session = lib.singleton {
name = "exwm"; name = "exwm";
start = "${depot.tools.emacs}/bin/tazjins-emacs"; start = "${nuggetEmacs}/bin/tazjins-emacs";
}; };
}; };