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

refactor(tazjin/nixos): pick correct Emacs from a NixOS option

Browse source 
This gives me the ability to override the Emacs per-machine easily.

Change-Id: Id480889c108833b0a11c377a9b1e946900c5aba1
Reviewed-on: https://cl.tvl.fyi/c/depot/+/9166
Reviewed-by: tazjin <tazjin@tvl.su>
Autosubmit: tazjin <tazjin@tvl.su>
Tested-by: BuildkiteCI
This commit is contained in:
Vincent Ambo 2023-08-29 17:10:11 +03:00 committed by tazjin
parent 804b7fbe73
commit d4c8840c57
2 changed files with 93 additions and 81 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
users/tazjin/nixos/modules/desktop.nix
View file

@ -1,5 +1,5 @@
# EXWM and other desktop configuration. # EXWM and other desktop configuration.
{ depot, lib, pkgs, ... }: { config, depot, lib, pkgs, ... }:
{ {
services = { services = {
@ -29,7 +29,7 @@
windowManager.session = lib.singleton { windowManager.session = lib.singleton {
name = "exwm"; name = "exwm";
start = "${depot.users.tazjin.emacs}/bin/tazjins-emacs"; start = "${config.tazjin.emacs}/bin/tazjins-emacs";
}; };
}; };
}; };

18
users/tazjin/nixos/modules/physical.nix
View file

@ -1,16 +1,27 @@
# Default configuration settings for physical machines that I use. # Default configuration settings for physical machines that I use.
{ lib, pkgs, depot, ... }: { lib, pkgs, config, depot, ... }:
let let
pass-otp = pkgs.pass.withExtensions (e: [ e.pass-otp ]); pass-otp = pkgs.pass.withExtensions (e: [ e.pass-otp ]);
in in
{ {
options = with lib; {
tazjin.emacs = mkOption {
type = types.package;
default = depot.users.tazjin.emacs;
description = ''
Derivation with my Emacs package, with configuration included.
'';
};
};
config = {
# Install all the default software. # Install all the default software.
environment.systemPackages = environment.systemPackages =
# programs from the depot # programs from the depot
(with depot; [ (with depot; [
users.tazjin.screenLock users.tazjin.screenLock
users.tazjin.emacs config.tazjin.emacs
third_party.agenix.cli third_party.agenix.cli
third_party.josh third_party.josh
]) ++ ]) ++
@ -25,7 +36,7 @@ in
direnv direnv
dnsutils dnsutils
electrum electrum
emacs-unstable # emacsclient config.tazjin.emacs.emacs # emacsclient
exa exa
fd fd
file file
@ -88,4 +99,5 @@ in
mosh.enable = true; mosh.enable = true;
ssh.startAgent = true; ssh.startAgent = true;
}; };
};
} }