modules: system: remove 'media'

It was not the idiomatic way to do this.

home/gdb/gdbinit

@@ -20,3 +20,5 @@ set auto-load python-scripts
 
 # Allow autoloading project-local .gdbinit files
 set auto-load safe-path ~/git/
+# Allow autoloading from the Nix store
+set auto-load safe-path /nix/store

modules/services/calibre-web.nix

@@ -37,6 +37,9 @@ in
       };
     };
 
+    # Set-up media group
+    users.groups.media = { };
+
     my.services.nginx.virtualHosts = [
       {
         subdomain = "library";

modules/services/jellyfin.nix

@@ -14,6 +14,9 @@ in
       group = "media";
     };
 
+    # Set-up media group
+    users.groups.media = { };
+
     my.services.nginx.virtualHosts = [
       {
         subdomain = "jellyfin";

modules/services/paperless.nix

@@ -93,6 +93,9 @@ in
       ];
     };
 
+    # Set-up media group
+    users.groups.media = { };
+
     systemd.services.paperless-ng-server = {
       # Make sure the DB is available
       after = [ "postgresql.service" ];

modules/services/pirate.nix

@@ -32,5 +32,7 @@ in
   config = lib.mkIf cfg.enable {
     services = managers;
     my.services.nginx.virtualHosts = redirections;
+    # Set-up media group
+    users.groups.media = { };
   };
 }

modules/services/sabnzbd.nix

@@ -15,6 +15,9 @@ in
       group = "media";
     };
 
+    # Set-up media group
+    users.groups.media = { };
+
     my.services.nginx.virtualHosts = [
       {
         subdomain = "sabnzbd";

modules/services/transmission.nix

@@ -72,6 +72,9 @@ in
       };
     };
 
+    # Set-up media group
+    users.groups.media = { };
+
     # Default transmission webui, I prefer combustion but its development
     # seems to have stalled
     my.services.nginx.virtualHosts = [

modules/system/default.nix

@@ -6,7 +6,6 @@
     ./boot.nix
     ./documentation.nix
     ./language.nix
-    ./media.nix
     ./nix.nix
     ./packages.nix
     ./users.nix

modules/system/media.nix

@@ -1,17 +0,0 @@
-# Abstracting away the need for a common 'media' group
-
-{ config, lib, ... }:
-let
-  mediaServices = with config.my.services; [
-    calibre-web
-    jellyfin
-    paperless
-    pirate
-    sabnzbd
-    transmission
-  ];
-  needed = builtins.any (service: service.enable) mediaServices;
-in
-{
-  config.users.groups.media = lib.mkIf needed { };
-}

pkgs/default.nix

@@ -1,5 +1,5 @@
 { pkgs }:
-rec {
+pkgs.lib.makeScope pkgs.newScope (pkgs: {
   bw-pass = pkgs.callPackage ./bw-pass { };
 
   comma = pkgs.callPackage ./comma { };
@@ -24,9 +24,7 @@ rec {
 
   volantes-cursors = pkgs.callPackage ./volantes-cursors { };
 
-  unbound-zones-adblock = pkgs.callPackage ./unbound-zones-adblock {
-    inherit unified-hosts-lists;
-  };
+  unbound-zones-adblock = pkgs.callPackage ./unbound-zones-adblock { };
 
   unified-hosts-lists = pkgs.callPackage ./unified-hosts-lists { };
-}
+})