123

modules/essentials/default.nix

@@ -11,4 +11,25 @@
     ./tty.nix
     ./users.nix
   ];
+
+  users = {
+    users = {
+      "${inputs.zeroq.devices.admin}" = {
+        isNormalUser = true;
+        description = "Jor Oqyude";
+        initialPassword = "1234";
+        extraGroups = [
+          "beets"
+          "audio"
+          "disk"
+          "gamemode"
+          "libvirtd"
+          "networkmanager"
+          "pipewire"
+          "qemu-libvirtd"
+          "wheel"
+        ];
+      };
+    };
+  };
 }

modules/essentials/users.nix

@@ -1,26 +0,0 @@
-{
-  config,
-  ...
-}:
-{
-  users = {
-    users = {
-      oqyude = {
-        isNormalUser = true;
-        description = "Jor Oqyude";
-        initialPassword = "1234";
-        extraGroups = [
-          "beets"
-          "audio"
-          "disk"
-          "gamemode"
-          "libvirtd"
-          "networkmanager"
-          "pipewire"
-          "qemu-libvirtd"
-          "wheel"
-        ];
-      };
-    };
-  };
-}

modules/software/beets/default.nix

@@ -17,12 +17,6 @@ let
   beetsEnv = python3.withPackages (ps: [ ps.beets ]);
 in
 {
-
-  environment.systemPackages = [
-    beetsEnv
-    pkgs.imagemagick
-  ];
-
   fileSystems."/mnt/beets/music" = {
     device = "${inputs.zeroq.dirs.music-library}";
     options = [
@@ -34,9 +28,20 @@ in
   systemd.tmpfiles.rules = [
     #     "d /var/lib/beets 0770 beets beets -"
     #     "d /mnt/beets 0770 beets beets -"
-    "z /mnt/beets 0755 oqyude users -" # beets absolute paths
+    "z /mnt/beets 0700 ${inputs.zeroq.dirs.music-library} users -" # beets absolute paths
   ];
 
+  users = {
+    users = {
+      "${inputs.zeroq.devices.admin}" = {
+        packages = [
+          beetsEnv
+          pkgs.imagemagick
+        ];
+      };
+    };
+  };
+
   #   users = {
   #     groups = {
   #       beets = { };