modules/userdata: refactor

3 files changed, 28 insertions, 23 deletions

diff --git a/hosts/cez/configuration.nix b/hosts/cez/configuration.nix
index 2df69ef..05c3b9f 100644
--- a/hosts/cez/configuration.nix
+++ b/hosts/cez/configuration.nix
@@ -39,12 +39,13 @@ in
     getty.autologinUser = user;
   };
 
-  userdata.packages = with pkgs; [
-    geoipWithDatabase
-    ffmpeg
-    (pass.withExtensions (exts: [ exts.pass-otp ]))
-  ];
-
   programs.adb.enable = true;
-  userdata.groups = [ "adbusers" ];
+  users.users.${user} = {
+    extraGroups = [ "adbusers" ];
+    packages = with pkgs; [
+      geoipWithDatabase
+      ffmpeg
+      (pass.withExtensions (exts: [ exts.pass-otp ]))
+    ];
+  };
 }
diff --git a/hosts/cez/modules/wayland.nix b/hosts/cez/modules/wayland.nix
index 69e738a..085c950 100644
--- a/hosts/cez/modules/wayland.nix
+++ b/hosts/cez/modules/wayland.nix
@@ -9,7 +9,6 @@ in
     bemenu
     sway
     i3status
-    pinentry-bemenu
     swaylock
     swayidle
     swaybg
@@ -19,18 +18,23 @@ in
     xdg-utils
     libnotify
   ];
-  users.users.${user}.packages = with pkgs; [
-    zathura
-    mpv
-    imv
-    wtype
-    qemu
-    OVMFFull
-    grim
-    slurp
-    tor-browser-bundle-bin
-    element-desktop-wayland
-  ];
+
+  users.users.${user} = {
+    extraGroups = [ "seat" ];
+    packages = with pkgs; [
+      zathura
+      mpv
+      imv
+      wtype
+      qemu
+      OVMFFull
+      grim
+      slurp
+      tor-browser-bundle-bin
+      element-desktop-wayland
+      pinentry-bemenu
+    ];
+  };
 
   # font
   fonts = {
@@ -73,7 +77,6 @@ in
     };
   };
 
-  userdata.groups = [ "seat" ];
   security.pam.services.swaylock.text = "auth include login";
   hardware.opengl.enable = true;
 }
diff --git a/hosts/kay/modules/sftp.nix b/hosts/kay/modules/sftp.nix
index b969652..07b1449 100644
--- a/hosts/kay/modules/sftp.nix
+++ b/hosts/kay/modules/sftp.nix
@@ -2,7 +2,8 @@
 
 let
   storage = "/hdd/users";
-  pubkeys = config.userdata.pubKeys;
+  user = config.userdata.user;
+  pubKeys = config.users.users.${user}.openssh.authorizedKeys.keys;
 in
 {
   users = {
@@ -15,7 +16,7 @@ in
       openssh.authorizedKeys.keys = [
         "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFmA1dyV+o9gfoxlbVG0Y+dn3lVqdFs5fMqfxyNc5/Lr sftp@cez"
         "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDCbgjAfyDNtLNyOS+sfLirYtfEAkGqV54LOwabpWkvf sftp@veu"
-      ] ++ pubkeys;
+      ] ++ pubKeys;
     };
 
     users."nazer" = {