home/gdb/gdbinit

@@ -20,5 +20,3 @@ 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,9 +37,6 @@ in
       };
     };
 
-    # Set-up media group
-    users.groups.media = { };
-
     my.services.nginx.virtualHosts = [
       {
         subdomain = "library";

modules/services/jellyfin.nix

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

modules/services/paperless.nix

@@ -93,9 +93,6 @@ 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,7 +32,5 @@ 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,9 +15,6 @@ in
       group = "media";
     };
 
-    # Set-up media group
-    users.groups.media = { };
-
     my.services.nginx.virtualHosts = [
       {
         subdomain = "sabnzbd";

modules/services/transmission.nix

@@ -72,9 +72,6 @@ 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,6 +6,7 @@
     ./boot.nix
     ./documentation.nix
     ./language.nix
+    ./media.nix
     ./nix.nix
     ./packages.nix
     ./users.nix

modules/system/media.nix

@@ -0,0 +1,17 @@
+# 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 }:
-pkgs.lib.makeScope pkgs.newScope (pkgs: {
+rec {
   bw-pass = pkgs.callPackage ./bw-pass { };
 
   comma = pkgs.callPackage ./comma { };
@@ -24,7 +24,9 @@ pkgs.lib.makeScope pkgs.newScope (pkgs: {
 
   volantes-cursors = pkgs.callPackage ./volantes-cursors { };
 
-  unbound-zones-adblock = pkgs.callPackage ./unbound-zones-adblock { };
+  unbound-zones-adblock = pkgs.callPackage ./unbound-zones-adblock {
+    inherit unified-hosts-lists;
+  };
 
   unified-hosts-lists = pkgs.callPackage ./unified-hosts-lists { };
-})
+}