switched modules to flakes

users/alice/default.nix

@@ -1,27 +1,8 @@
-{
-  pkgs,
-  lib,
-  config,
-}: let
-  pubKeys = import ./keys/default.nix;
-in {
-  isNormalUser = true;
-  description = "AmethystAndroid";
-  uid = 1000;
-  extraGroups = [
-    "wheel"
-    "media"
-    (lib.mkIf config.networking.networkmanager.enable "networkmanager")
-    (lib.mkIf config.programs.adb.enable "adbusers")
-    (lib.mkIf config.programs.wireshark.enable "wireshark")
-    (lib.mkIf config.programs.virtualisation.docker.enable "docker")
-    "libvirtd"
-    "dialout"
-    "plugdev"
-    "uaccess"
-  ];
-  shell = pkgs.fish;
-  openssh.authorizedKeys.keys = [
-    (lib.mkIf (pubKeys ? ${config.networking.hostName}) pubKeys.${config.networking.hostName})
-  ];
+{ pkgs, lib, config }:
+import ../default.nix {
+  inherit pkgs lib config;
+  userName = "AmethystAndroid";
+  pubKeys = {
+    palatine-hill = "ed25516-AAAAAAA";
+  };
 }

users/alice/keys/default.nix

@@ -1,3 +0,0 @@
-{
-  palatine-hill = "ed25516-AAAAAAA";
-}

users/default.nix

@@ -0,0 +1,21 @@
+{ lib, config, pkgs, userName, pubKeys }:
+{
+  isNormalUser = true;
+  uid = 1000;
+  extraGroups = [
+    "wheel"
+    "media"
+    (lib.mkIf config.networking.networkmanager.enable "networkmanager")
+    (lib.mkIf config.programs.adb.enable "adbusers")
+    (lib.mkIf config.programs.wireshark.enable "wireshark")
+    (lib.mkIf config.programs.virtualisation.docker.enable "docker")
+    "libvirtd"
+    "dialout"
+    "plugdev"
+    "uaccess"
+  ];
+  shell = pkgs.zsh;
+  openssh.authorizedKeys.keys = [
+    (lib.mkIf (pubKeys ? ${config.networking.hostName}) pubKeys.${config.networking.hostName})
+  ];
+}