From f8cea6f6c8a8ce35533d7fa978dbff8cd5427b7c Mon Sep 17 00:00:00 2001
From: sinanmohd <sinan@sinanmohd.com>
Date: Mon, 8 Jan 2024 23:09:42 +0530
Subject: modules/userdata: refactor

---
 hosts/cez/configuration.nix   | 15 ++++++++-------
 hosts/cez/modules/wayland.nix | 31 +++++++++++++++++--------------
 2 files changed, 25 insertions(+), 21 deletions(-)

(limited to 'hosts/cez')

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;
 }
-- 
cgit v1.2.3