X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=modules%2Fprivate%2Fsystem.nix;h=d0943abef708036d34531ccdae9e0e8b4a8bad72;hb=bbea22c02b6c059a6be1064391f06737ee244ba6;hp=916173883aa49548d8b7aeb9e87dcfcc2c82b472;hpb=4e3e4761c8566cbc47c64d66bfc21bb6dee32860;p=perso%2FImmae%2FConfig%2FNix.git diff --git a/modules/private/system.nix b/modules/private/system.nix index 9161738..d0943ab 100644 --- a/modules/private/system.nix +++ b/modules/private/system.nix @@ -1,31 +1,40 @@ -{ pkgs, lib, config, name, ... }: +{ pkgs, lib, config, name, nodes, ... }: { config = { - services.duplyBackup.profiles.system = { - rootDir = "/var/lib"; - excludeFile = lib.mkAfter '' - + /var/lib/nixos - + /var/lib/udev - + /var/lib/udisks2 - + /var/lib/systemd - + /var/lib/private/systemd - - /var/lib - ''; + deployment.secrets."secret_vars.yml" = { + source = builtins.toString ../../nixops/secrets/vars.yml; + destination = config.secrets.secretsVars; + owner.user = "root"; + owner.group = "root"; + permissions = "0400"; }; + + networking.extraHosts = builtins.concatStringsSep "\n" + (lib.mapAttrsToList (n: v: "${lib.head v.config.hostEnv.ips.main.ip4} ${n}") nodes); + + users.extraUsers.root.openssh.authorizedKeys.keys = [ config.myEnv.sshd.rootKeys.nix_repository ]; + secrets.deleteSecretsVars = true; + secrets.gpgKeys = [ + ../../nixops/public_keys/Immae.pub + ]; + secrets.secretsVars = "/run/keys/vars.yml"; + + services.openssh.enable = true; + nixpkgs.overlays = builtins.attrValues (import ../../overlays) ++ [ (self: super: { postgresql = self.postgresql_pam; mariadb = self.mariadb_pam; }) # don’t put them as generic overlay because of home-manager ]; - _module.args = { - pkgsNext = import {}; - pkgsPrevious = import {}; - }; + nixpkgs.config.permittedInsecurePackages = [ + "nodejs-10.24.1" + ]; services.journald.extraConfig = '' - MaxLevelStore="warning" - MaxRetentionSec="1year" + #Should be "warning" but disabled for now, it prevents anything from being stored + MaxLevelStore=info + MaxRetentionSec=1year ''; users.users = @@ -34,6 +43,7 @@ home = "/home/${x.name}"; createHome = true; linger = true; + # Enable in latest unstable homeMode = "755"; } // x)) (config.hostEnv.users pkgs)) // { root.packages = let @@ -43,7 +53,7 @@ ''; in [ - pkgs.telnet + pkgs.inetutils pkgs.htop pkgs.iftop pkgs.bind.dnsutils @@ -52,9 +62,9 @@ pkgs.whois pkgs.ngrep pkgs.tcpdump - pkgs.tshark + pkgs.wireshark-cli pkgs.tcpflow - pkgs.mitmproxy + # pkgs.mitmproxy # failing pkgs.nmap pkgs.p0f pkgs.socat @@ -65,16 +75,28 @@ pkgs.cnagios nagios-cli + + pkgs.pv + pkgs.smartmontools ]; }; - users.mutableUsers = false; + users.mutableUsers = lib.mkDefault false; environment.etc.cnagios.source = "${pkgs.cnagios}/share/doc/cnagios"; environment.systemPackages = [ pkgs.git pkgs.vim + pkgs.rsync + pkgs.strace ] ++ (lib.optional (builtins.length (config.hostEnv.users pkgs) > 0) pkgs.home-manager); + + systemd.targets.maintenance = { + description = "Maintenance target with only sshd"; + after = [ "network-online.target" "sshd.service" ]; + requires = [ "network-online.target" "sshd.service" ]; + unitConfig.AllowIsolate = "yes"; + }; }; }