X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=modules%2Fprivate%2Fsystem.nix;h=6b4ef6e4e4ad75e0e925bb7da29e9433b6886e6c;hb=34abd6afa44c620a56416bd423a2438a09bd1ce4;hp=0ab4a81df7ac6223c99d931407564102773e9fa0;hpb=31e11cdfcb4455f51c8db27958d6ae8db8820401;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/modules/private/system.nix b/modules/private/system.nix
index 0ab4a81..6b4ef6e 100644
--- a/modules/private/system.nix
+++ b/modules/private/system.nix
@@ -1,6 +1,12 @@
-{ pkgs, lib, config, name, ... }:
+{ pkgs, lib, config, name, nodes, ... }:
 {
   config = {
+    networking.extraHosts = builtins.concatStringsSep "\n"
+      (lib.mapAttrsToList (n: v: "${v.config.hostEnv.ips.main.ip4} ${n}") nodes);
+
+    users.extraUsers.root.openssh.authorizedKeys.keyFiles = [ "${config.myEnv.privateFiles}/id_ed25519.pub" ];
+    services.openssh.enable = true;
+
     services.duplyBackup.profiles.system = {
       rootDir = "/var/lib";
       excludeFile = lib.mkAfter ''
@@ -18,10 +24,6 @@
         mariadb = self.mariadb_pam;
       }) # don’t put them as generic overlay because of home-manager
     ];
-    _module.args = {
-      pkgsNext = import <nixpkgsNext> {};
-      pkgsPrevious = import <nixpkgsPrevious> {};
-    };
 
     services.journald.extraConfig = ''
       MaxLevelStore="warning"
@@ -54,7 +56,7 @@
             pkgs.tcpdump
             pkgs.tshark
             pkgs.tcpflow
-            pkgs.mitmproxy
+            # pkgs.mitmproxy # failing
             pkgs.nmap
             pkgs.p0f
             pkgs.socat
@@ -65,6 +67,9 @@
 
             pkgs.cnagios
             nagios-cli
+
+            pkgs.pv
+            pkgs.smartmontools
           ];
       };
 
@@ -74,6 +79,8 @@
     environment.systemPackages = [
       pkgs.git
       pkgs.vim
+      pkgs.rsync
+      pkgs.strace
     ] ++
     (lib.optional (builtins.length (config.hostEnv.users pkgs) > 0) pkgs.home-manager);