home-manager/sajenim/features/desktop/default.nix

@@ -5,7 +5,6 @@
 }: {
   imports = [
     ./cava
-    ./discord
     ./dunst
     ./mpv
     ./obs

home-manager/sajenim/features/desktop/discord/default.nix

@@ -1,15 +0,0 @@
-{
-  pkgs,
-  ...
-}: {
-  nixpkgs.overlays = [
-    (final: prev: {
-      discord = prev.discord.override {withOpenASAR = true;};
-    })
-  ];
-
-  home.packages = with pkgs; [
-    discord
-    betterdiscordctl
-  ];
-}

home-manager/sajenim/features/editors/default.nix

@@ -37,6 +37,14 @@
       ])
     ]); # https://github.com/theCapypara/nix-jetbrains-plugins
 
+  # Allow unfree packages for proprietary software
+  nixpkgs.config.allowUnfreePredicate = pkg:
+    builtins.elem (lib.getName pkg) [
+      "claude-code"
+      "idea-ultimate"
+      "idea-ultimate-with-plugins" 
+    ];
+
   # Copy our configuration files to home directory
   home.file = {
     ".ideavimrc".source = ./ideavimrc;

home-manager/sajenim/global/default.nix

@@ -1,4 +1,4 @@
-{outputs, lib, ...}: {
+{outputs, ...}: {
   imports = [
     ./zsh.nix
   ];
@@ -11,19 +11,6 @@
     ];
     config = {
       allowUnfree = false;
-      # Centralized unfree package allowlist.
-      # Note: nixpkgs.config.allowUnfreePredicate doesn't merge across modules - only the
-      # last definition wins. To maintain explicit control over unfree packages, we list
-      # all allowed packages here rather than scattering predicates across feature modules.
-      allowUnfreePredicate = pkg:
-        builtins.elem (lib.getName pkg) [
-          # Editors
-          "claude-code"
-          "idea-ultimate"
-          "idea-ultimate-with-plugins"
-          # Desktop
-          "discord"
-        ];
     };
   };
 

nixos/common/global/default.nix

@@ -1,4 +1,4 @@
-{outputs, lib, ...}: {
+{outputs, ...}: {
   imports = [
     ./age.nix
     ./env.nix
@@ -15,18 +15,6 @@
     ];
     config = {
       allowUnfree = false;
-      # Centralized unfree package allowlist for NixOS system configuration.
-      # Note: nixpkgs.config.allowUnfreePredicate doesn't merge across modules - only the
-      # last definition wins. To maintain explicit control over unfree packages, we list
-      # all allowed packages here rather than scattering predicates across system modules.
-      allowUnfreePredicate = pkg:
-        builtins.elem (lib.getName pkg) [
-          # Gaming
-          "steam"
-          "steam-unwrapped"
-          # Services
-          "minecraft-server"
-        ];
     };
   };
 

nixos/common/users/sajenim/steam/default.nix

@@ -27,4 +27,10 @@
     "d /home/sajenim/.local 0755 sajenim users -"
     "d /home/sajenim/.local/share 0755 sajenim users -"
   ];
+
+  nixpkgs.config.allowUnfreePredicate = pkg:
+    builtins.elem (lib.getName pkg) [
+      "steam"
+      "steam-unwrapped"
+    ];
 }

nixos/viridian/services/minecraft/default.nix

@@ -116,4 +116,9 @@ in {
       }
     ];
   };
+
+  # Allow unfree packages.
+  nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
+    "minecraft-server"
+  ];
 }