nix: update to latest nixpkgs

[sourcephile-nix.git] / members / julm.nix

diff --git a/members/julm.nix b/members/julm.nix
index 7e1510d13978cbf139c88efd2788e47ad0f70da2..1cadb082c809510f11d9eed33341740b0cd8626e 100644 (file)
--- a/members/julm.nix
+++ b/members/julm.nix
@@ -1,25 +1,31 @@
-{ pkgs, lib, config, wireguard, ... }:
+{ inputs, pkgs, lib, config, wireguard, ... }:
 let
   inherit (builtins) readFile;
+  inherit (config.users) users;
   userLib = import ./lib.nix { inherit lib; };
 in
 {
 users.users.julm = {
   openssh.authorizedKeys.keys = [
-    (readFile ../../sec/ssh/julm.pub)
-    (readFile ../../sec/ssh/julm-mob.pub)
-    (readFile ../../sec/ssh/julm-mermet.pub)
-    (readFile ../../sec/ssh/julm-losurdo.pub)
+    (readFile (inputs.secrets + "/members/ssh/julm.pub"))
+    (readFile (inputs.secrets + "/members/ssh/julm-mob.pub"))
+    (readFile (inputs.secrets + "/members/ssh/julm-mermet.pub"))
+    (readFile (inputs.secrets + "/members/ssh/julm-losurdo.pub"))
   ];
   useDefaultShell = true;
   isNormalUser = true;
   uid = 1000;
   #uid = userLib.mkUid "julm";
 };
-networking.wireguard.interfaces."wg-intranet".peers = [
+environment.systemPackages = [
+  pkgs.neomutt # hack until neomutt becomes installable by home-manager again
+];
+/*
+networking.wireguard.interfaces."wg-intra".peers = [
   { allowedIPs = [ "192.168.42.3/32" ];
     publicKey = "QV5rA6FU7PyTD7nvFI7H/X+zkjhjP5EzVHfODEpj+BM=";
-    persistentKeepalive = wireguard."wg-intranet".persistentKeepalive;
+    persistentKeepalive = wireguard."wg-intra".persistentKeepalive;
   }
 ];
+*/
 }