modules/darwin: switch to srvos server
This commit is contained in:
parent
35c0742449
commit
64675a0aa0
4 changed files with 3 additions and 57 deletions
modules/darwin/common
|
@ -1,45 +1,24 @@
|
|||
{ inputs, ... }:
|
||||
{
|
||||
imports = [
|
||||
inputs.srvos.darwinModules.server
|
||||
./apfs-cleanup.nix
|
||||
./network.nix
|
||||
./optimise.nix
|
||||
./packages.nix
|
||||
./reboot.nix
|
||||
./software-update.nix
|
||||
./telegraf.nix
|
||||
./upgrade-diff.nix
|
||||
./users.nix
|
||||
../../shared/known-hosts.nix
|
||||
../../shared/nix-daemon.nix
|
||||
inputs.agenix.darwinModules.age
|
||||
];
|
||||
|
||||
services.nix-daemon.enable = true;
|
||||
# https://github.com/NixOS/nix/issues/7273
|
||||
nix.settings.auto-optimise-store = false;
|
||||
|
||||
programs.zsh.enable = true;
|
||||
|
||||
documentation.enable = false;
|
||||
|
||||
programs.info.enable = false;
|
||||
|
||||
# srvos
|
||||
nix.settings.builders-use-substitutes = true;
|
||||
|
||||
# srvos
|
||||
nix.settings.experimental-features = [
|
||||
"nix-command"
|
||||
"flakes"
|
||||
];
|
||||
|
||||
system.includeUninstaller = false;
|
||||
|
||||
# srvos
|
||||
environment.etc."ssh/sshd_config.d/darwin.conf".text = ''
|
||||
AuthorizedKeysFile none
|
||||
HostKey /etc/ssh/ssh_host_ed25519_key
|
||||
KbdInteractiveAuthentication no
|
||||
PasswordAuthentication no
|
||||
'';
|
||||
|
||||
system.activationScripts.postActivation.text = ''
|
||||
|
@ -47,6 +26,4 @@
|
|||
mdutil -a -i off -d &> /dev/null
|
||||
mdutil -a -E &> /dev/null
|
||||
'';
|
||||
|
||||
time.timeZone = "GMT";
|
||||
}
|
||||
|
|
|
@ -1,11 +0,0 @@
|
|||
{
|
||||
# https://github.com/NixOS/nix/issues/7273
|
||||
nix.settings.auto-optimise-store = false;
|
||||
|
||||
nix.optimise.interval = [
|
||||
{
|
||||
Hour = 5;
|
||||
Minute = 45;
|
||||
}
|
||||
];
|
||||
}
|
|
@ -2,15 +2,6 @@
|
|||
{
|
||||
# srvos
|
||||
|
||||
environment.systemPackages = map lib.lowPrio [
|
||||
pkgs.curl
|
||||
pkgs.dnsutils
|
||||
pkgs.gitMinimal
|
||||
pkgs.htop
|
||||
pkgs.jq
|
||||
pkgs.tmux
|
||||
];
|
||||
|
||||
programs.vim = {
|
||||
enable = true;
|
||||
# evaluation warning: 'vam' attribute is deprecated
|
||||
|
|
|
@ -1,11 +0,0 @@
|
|||
{ config, pkgs, ... }:
|
||||
{
|
||||
# srvos
|
||||
system.activationScripts.preActivation.text = ''
|
||||
if [[ -e /run/current-system ]]; then
|
||||
echo "--- diff to current-system"
|
||||
${pkgs.nvd}/bin/nvd --nix-bin-dir=${config.nix.package}/bin diff /run/current-system "$systemConfig"
|
||||
echo "---"
|
||||
fi
|
||||
'';
|
||||
}
|
Loading…
Add table
Reference in a new issue