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.
{ depot, lib, pkgs, ... }:
{ config, depot, lib, pkgs, ... }:
{
services = {
@ -29,7 +29,7 @@
windowManager.session = lib.singleton {
name = "exwm";
start = "${depot.users.tazjin.emacs}/bin/tazjins-emacs";
start = "${config.tazjin.emacs}/bin/tazjins-emacs";
};
};
};

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

@ -1,91 +1,103 @@
# Default configuration settings for physical machines that I use.
{ lib, pkgs, depot, ... }:
{ lib, pkgs, config, depot, ... }:
let
pass-otp = pkgs.pass.withExtensions (e: [ e.pass-otp ]);
in
{
# Install all the default software.
environment.systemPackages =
# programs from the depot
(with depot; [
users.tazjin.screenLock
users.tazjin.emacs
third_party.agenix.cli
third_party.josh
]) ++
options = with lib; {
tazjin.emacs = mkOption {
type = types.package;
default = depot.users.tazjin.emacs;
description = ''
Derivation with my Emacs package, with configuration included.
'';
};
};
# programs from nixpkgs
(with pkgs; [
(aspellWithDicts (d: [ d.ru ]))
amber
bat
curl
ddcutil
direnv
dnsutils
electrum
emacs-unstable # emacsclient
exa
fd
file
gdb
gh
git
gnupg
gtk3 # for gtk-launch
htop
hyperfine
iftop
imagemagick
jq
lieer
maim
man-pages
moreutils
mosh
msmtp
mullvad-vpn
networkmanagerapplet
nix-prefetch-github
nmap
notmuch
openssh
openssl
pass-otp
pavucontrol
pinentry
pinentry-emacs
pulseaudio # for pactl
pwgen
quasselClient
rink
ripgrep
rust-analyzer
rustup
screen
thunderbird
tig
tokei
tree
unzip
vlc
volumeicon
whois
xclip
xsecurelock
zoxide
]);
config = {
# Install all the default software.
environment.systemPackages =
# programs from the depot
(with depot; [
users.tazjin.screenLock
config.tazjin.emacs
third_party.agenix.cli
third_party.josh
]) ++
# Run services & configure programs for all machines.
services.fwupd.enable = true;
# programs from nixpkgs
(with pkgs; [
(aspellWithDicts (d: [ d.ru ]))
amber
bat
curl
ddcutil
direnv
dnsutils
electrum
config.tazjin.emacs.emacs # emacsclient
exa
fd
file
gdb
gh
git
gnupg
gtk3 # for gtk-launch
htop
hyperfine
iftop
imagemagick
jq
lieer
maim
man-pages
moreutils
mosh
msmtp
mullvad-vpn
networkmanagerapplet
nix-prefetch-github
nmap
notmuch
openssh
openssl
pass-otp
pavucontrol
pinentry
pinentry-emacs
pulseaudio # for pactl
pwgen
quasselClient
rink
ripgrep
rust-analyzer
rustup
screen
thunderbird
tig
tokei
tree
unzip
vlc
volumeicon
whois
xclip
xsecurelock
zoxide
]);
# Disable the broken NetworkManager-wait-online.service
systemd.services.NetworkManager-wait-online.enable = lib.mkForce false;
# Run services & configure programs for all machines.
services.fwupd.enable = true;
programs = {
fish.enable = true;
mosh.enable = true;
ssh.startAgent = true;
# Disable the broken NetworkManager-wait-online.service
systemd.services.NetworkManager-wait-online.enable = lib.mkForce false;
programs = {
fish.enable = true;
mosh.enable = true;
ssh.startAgent = true;
};
};
}