machines/katara: extract lib & add xmpp-client

Some stuff is needed in multiple files, like the home directory.
Extracted out into lib.nix.
xmpp-client uses that to create a wrapper for splicing the password into
the config at program invocation.

1 files changed, 3 insertions, 15 deletions

diff --git a/machines/profpatsch/base.nix b/machines/profpatsch/base.nix
index c3bd1e73..19b3aa09 100644
--- a/machines/profpatsch/base.nix
+++ b/machines/profpatsch/base.nix
@@ -1,22 +1,10 @@
 # A base configuration that still assumes a workstation
 { pkgs, lib, ... }:
 let
-  myPkgs = import ./pkgs.nix { inherit pkgs lib; };
-  fish = pkgs.fish;
-
-  authKeys = ["ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDJhthfk38lzDvoI7lPqRneI0yBpZEhLDGRBpcXzpPSu+V0YlgrDix5fHhBl+EKfw4aeQNvQNuAky3pDtX+BDK1b7idbz9ZMCExy2a1kBKDVJz/onLSQxiiZMuHlAljVj9iU4uoTOxX3vB85Ok9aZtMP1rByRIWR9e81/km4HdfZTCjFVRLWfvo0s29H7l0fnbG9bb2E6kydlvjnXJnZFXX+KUM16X11lK53ilPdPJdm87VtxeSKZ7GOiBz6q7FHzEd2Zc3CnzgupQiXGSblXrlN22IY3IWfm5S/8RTeQbMLVoH0TncgCeenXH7FU/sXD79ypqQV/WaVVDYMOirsnh/ philip@nyx"];
-
-  philip = rec {
-    name = "philip";
-    extraGroups = [ "wheel" "networkmanager" ];
-    uid = 1000;
-    createHome = true;
-    home = "/home/philip";
-    passwordFile = "${home}/.config/passwd";
-    shell = "${lib.getBin fish}/bin/fish";
-    openssh.authorizedKeys.keys = authKeys;
-  };
+  myPkgs = import ./pkgs.nix { inherit pkgs lib myLib; };
+  myLib  = import ./lib.nix  { inherit pkgs lib; };
 
+  philip = myLib.philip;
 
 in {