nix: update to latest nixos-unstable

[sourcephile-nix.git] / nixos / defaults.nix

diff --git a/nixos/defaults.nix b/nixos/defaults.nix
index aca88a54eb5f4554b2dc23ddb2c8d0a84d3bcbdc..9c986601326ccada2c69aa02ef8152051a65d68f 100644 (file)
--- a/nixos/defaults.nix
+++ b/nixos/defaults.nix
@@ -27,7 +27,11 @@ nix = {
   ];
 };
 environment.etc."nixpkgs".source = pkgs.path;
-environment.etc."nixpkgs-overlays".source = inputs.self + "/nixpkgs";
+environment.etc."nixpkgs-overlays".source =
+  pkgs.writeTextDir "overlays.nix" ''
+    import ${inputs.self + "/nixpkgs/overlays.nix"} ++
+    import ${inputs.julm-nix + "/nixpkgs/overlays.nix"}
+  '';
 
 nixpkgs = {
   config = {
@@ -56,12 +60,12 @@ i18n = {
 
 console = {
   font   = "Lat2-Terminus16";
-  keyMap = "fr";
+  keyMap = lib.mkDefault "fr";
 };
 
 # Always try to start all the units (default.target)
 # because systemd's emergency shell does not try to start sshd.
-# https://wiki.archlinux.org/index.php/systemd#Disable_emergency_mode_on_remote_machine
+# https://wiki.archlinux.org/index.php/systemd#Disable_emergency_mode_on_remote_host
 systemd.enableEmergencyMode = false;
 
 # This is a remote headless server: always reboot on a kernel panic,
@@ -123,6 +127,7 @@ environment.systemPackages = with pkgs; [
   nethogs
   nload
   nmon
+  #ntop
   pv
   rdfind
   smem