attempt to use pkgs for unfree predicate

still not working

flake.nix

@@ -111,8 +111,6 @@
         gitName = fullName;
         gitEmail = "7386960+nmasur@users.noreply.github.com";
         mail.server = "noahmasur.com";
-        mail.imapHost = "imap.purelymail.com";
-        mail.smtpHost = "smtp.purelymail.com";
         dotfilesRepo = "git@github.com:nmasur/dotfiles";
       };
 

hosts/swan/default.nix

@@ -12,6 +12,7 @@ nixpkgs.lib.nixosSystem {
     ./hardware-configuration.nix
     ../../modules/common
     ../../modules/nixos
+    (removeAttrs globals [ "mail.server" ])
     wsl.nixosModules.wsl
     home-manager.nixosModules.home-manager
     disko.nixosModules.disko
@@ -41,7 +42,6 @@ nixpkgs.lib.nixosSystem {
       streamServer = "stream.masu.rs";
       nextcloudServer = "cloud.masu.rs";
       bookServer = "books.masu.rs";
-      arrServer = "download.masu.rs";
       samba.enable = true;
 
       backup.s3 = {

modules/common/applications/1password.nix

@@ -11,7 +11,7 @@
 
   config = lib.mkIf
     (config.gui.enable && config._1password.enable && pkgs.stdenv.isLinux) {
-      unfreePackages = [ "1password" "_1password-gui" ];
+      unfreePackages = with pkgs; [ _1password _1password-gui ];
       home-manager.users.${config.user} = {
         home.packages = with pkgs; [ _1password-gui ];
       };

modules/common/applications/discord.nix

@@ -10,7 +10,7 @@
   };
 
   config = lib.mkIf (config.gui.enable && config.discord.enable) {
-    unfreePackages = [ "discord" ];
+    unfreePackages = [ pkgs.discord ];
     home-manager.users.${config.user} = {
       home.packages = with pkgs; [ discord ];
       xdg.configFile."discord/settings.json".text = ''

modules/common/applications/firefox.nix

@@ -13,9 +13,9 @@
 
   config = lib.mkIf (config.gui.enable && config.firefox.enable) {
 
-    unfreePackages = [
-      (lib.mkIf config._1password.enable "onepassword-password-manager")
-      "okta-browser-plugin"
+    unfreePackages = with pkgs.nur.repos.rycee.firefox-addons; [
+      (lib.mkIf config._1password.enable onepassword-password-manager)
+      okta-browser-plugin
     ];
 
     home-manager.users.${config.user} = {

modules/common/applications/media.nix

@@ -12,19 +12,12 @@
   config = lib.mkIf (config.gui.enable && config.media.enable) {
     home-manager.users.${config.user} = {
       home.packages = with pkgs; [
+        mpv # Video viewer
         sxiv # Image viewer
         mupdf # PDF viewer
         zathura # PDF viewer
       ];
 
-      # Video player
-      programs.mpv = {
-        enable = true;
-        bindings = { };
-        config = { image-display-duration = 2; };
-        scripts = [ pkgs.mpvScripts.autoload ];
-      };
-
       # Set default for opening PDFs
       xdg.mimeApps = {
         associations.added = {

modules/common/applications/obsidian.nix

@@ -10,7 +10,7 @@
   };
 
   config = lib.mkIf (config.gui.enable && config.obsidian.enable) {
-    unfreePackages = [ "obsidian" ];
+    unfreePackages = [ pkgs.obsidian ];
     home-manager.users.${config.user} = {
       home.packages = with pkgs; [ obsidian ];
     };

modules/common/applications/slack.nix

@@ -10,7 +10,7 @@
   };
 
   config = lib.mkIf (config.gui.enable && config.slack.enable) {
-    unfreePackages = [ "slack" ];
+    unfreePackages = [ pkgs.slack ];
     home-manager.users.${config.user} = {
       home.packages = with pkgs; [ slack ];
     };

modules/common/default.nix

@@ -68,7 +68,7 @@
       description = "Link to dotfiles repository.";
     };
     unfreePackages = lib.mkOption {
-      type = lib.types.listOf lib.types.str;
+      type = lib.types.listOf lib.types.package;
       description = "List of unfree packages to allow.";
       default = [ ];
     };
@@ -113,8 +113,10 @@
 
     # Allow specified unfree packages (identified elsewhere)
     # Retrieves package object based on string name
+    # Idea: https://discourse.nixos.org/t/how-to-use-packages-directly-in-allowunfreepredicate/22455/6
     nixpkgs.config.allowUnfreePredicate = pkg:
-      builtins.elem (lib.getName pkg) config.unfreePackages;
+      builtins.elem (pkg.name or (builtins.parseDrvName pkg.pname).name)
+      (map lib.getName config.unfreePackages);
 
     # Pin a state version to prevent warnings
     home-manager.users.${config.user}.home.stateVersion = stateVersion;

modules/common/mail/aerc.nix

@@ -181,11 +181,6 @@
         };
       };
 
-      xdg.desktopEntries.aerc = lib.mkIf pkgs.stdenv.isLinux {
-        name = "aerc";
-        exec = "kitty aerc %u";
-      };
-
       programs.fish.shellAbbrs = { ae = "aerc"; };
 
     };

modules/common/mail/default.nix

@@ -10,17 +10,9 @@
       default = config.user;
     };
     mail.server = lib.mkOption {
-      type = lib.types.nullOr lib.types.str;
+      type = lib.types.str;
       description = "Server name for the email address.";
     };
-    mail.imapHost = lib.mkOption {
-      type = lib.types.nullOr lib.types.str;
-      description = "Server host for IMAP (reading mail).";
-    };
-    mail.smtpHost = lib.mkOption {
-      type = lib.types.nullOr lib.types.str;
-      description = "Server host for SMTP (sending mail).";
-    };
   };
 
   config = lib.mkIf config.mail.enable {
@@ -50,7 +42,7 @@
             folders = { };
             getmail = { };
             imap = {
-              host = config.mail.imapHost;
+              host = "imap.purelymail.com";
               port = 993;
               tls.enable = true;
             };
@@ -63,9 +55,9 @@
             maildir = { path = "main"; };
             mbsync = {
               enable = true;
-              create = "both";
-              expunge = "both";
-              remove = "both";
+              create = "maildir";
+              expunge = "none";
+              remove = "none";
               patterns = [ "*" ];
               extraConfig.channel = {
                 CopyArrivalDate = "yes"; # Sync time of original message
@@ -78,7 +70,7 @@
                 builtins.toString ../../../private/mailpass.age
               }";
             smtp = {
-              host = config.mail.smtpHost;
+              host = "smtp.purelymail.com";
               port = 465;
               tls.enable = true;
             };

modules/common/shell/bash/default.nix

@@ -1,20 +0,0 @@
-{ config, pkgs, lib, ... }: {
-
-  config = {
-    home-manager.users.${config.user} = {
-
-      programs.bash = {
-        enable = true;
-        shellAliases =
-          config.home-manager.users.${config.user}.programs.fish.shellAliases;
-        initExtra = "";
-        profileExtra = "";
-      };
-
-      programs.starship.enableBashIntegration = false;
-      programs.zoxide.enableBashIntegration = true;
-      programs.fzf.enableBashIntegration = true;
-
-    };
-  };
-}

modules/common/shell/default.nix

@@ -1,6 +1,5 @@
 { ... }: {
   imports = [
-    ./bash
     ./charm.nix
     ./direnv.nix
     ./fish

modules/common/shell/fish/default.nix

@@ -76,6 +76,7 @@
         set -g fish_cursor_replace_one underscore
       '';
       loginShellInit = "";
+      shellAliases = { };
       shellAbbrs = {
 
         # Directory aliases

modules/nixos/gaming/legendary.nix

@@ -10,8 +10,8 @@ in {
   config = lib.mkIf config.gaming.legendary.enable {
     environment.systemPackages = with pkgs; [
       legendary-gl
+      rare # GUI for Legendary (not working)
       wineWowPackages.stable # 32-bit and 64-bit wineWowPackages, see https://nixos.wiki/wiki/Wine
-      heroic # GUI launcher
     ];
 
     home-manager.users.${config.user} = {

modules/nixos/gaming/minecraft-server.nix

@@ -14,7 +14,7 @@ in {
 
   config = lib.mkIf config.gaming.minecraft-server.enable {
 
-    unfreePackages = [ "minecraft-server" ];
+    unfreePackages = [ pkgs.minecraft-server ];
 
     services.minecraft-server = {
       enable = true;

modules/nixos/gaming/steam.nix

@@ -4,7 +4,7 @@
 
   config = lib.mkIf (config.gaming.steam.enable && pkgs.stdenv.isLinux) {
     hardware.steam-hardware.enable = true;
-    unfreePackages = [ "steam" "steam-original" "steamcmd" "steam-run" ];
+    unfreePackages = with pkgs; [ steam steamcmd steam-run ];
 
     programs.steam = {
       enable = true;

modules/nixos/services/arr.nix

@@ -1,69 +0,0 @@
-{ config, lib, ... }: {
-
-  options = {
-    arrServer = lib.mkOption {
-      type = lib.types.nullOr lib.types.str;
-      description = "Hostname for arr services";
-      default = null;
-    };
-  };
-
-  config = lib.mkIf (config.arrServer != null) {
-
-    services.sonarr.enable = true;
-    services.radarr.enable = true;
-    services.bazarr.enable = true;
-    services.prowlarr.enable = true;
-
-    # Requires updating the base_url config value in each service
-    # If you try to rewrite the URL, the service won't redirect properly
-    caddy.routes = [
-      {
-        group = "download";
-        match = [{
-          host = [ config.arrServer ];
-          path = [ "/sonarr*" ];
-        }];
-        handle = [{
-          handler = "reverse_proxy";
-          upstreams = [{ dial = "localhost:8989"; }];
-        }];
-      }
-      {
-        group = "download";
-        match = [{
-          host = [ config.arrServer ];
-          path = [ "/radarr*" ];
-        }];
-        handle = [{
-          handler = "reverse_proxy";
-          upstreams = [{ dial = "localhost:7878"; }];
-        }];
-      }
-      {
-        group = "download";
-        match = [{
-          host = [ config.arrServer ];
-          path = [ "/prowlarr*" ];
-        }];
-        handle = [{
-          handler = "reverse_proxy";
-          upstreams = [{ dial = "localhost:9696"; }];
-        }];
-      }
-      {
-        group = "download";
-        match = [{
-          host = [ config.arrServer ];
-          path = [ "/bazarr*" ];
-        }];
-        handle = [{
-          handler = "reverse_proxy";
-          upstreams = [{ dial = "localhost:6767"; }];
-        }];
-      }
-    ];
-
-  };
-
-}

modules/nixos/services/caddy.nix

@@ -24,16 +24,6 @@
           listen = [ ":443" ];
           routes = config.caddy.routes;
           errors.routes = config.caddy.blocks;
-          # logs = { }; # Uncomment to collect access logs
-        };
-        logging.logs.main = {
-          encoder = { format = "console"; };
-          writer = {
-            output = "file";
-            filename = "${config.services.caddy.logDir}/caddy.log";
-            roll = true;
-          };
-          level = "INFO";
         };
       });
 

modules/nixos/services/default.nix

@@ -1,7 +1,6 @@
 { ... }: {
 
   imports = [
-    ./arr.nix
     ./backups.nix
     ./caddy.nix
     ./calibre.nix

modules/nixos/services/transmission.nix

@@ -41,9 +41,7 @@
     };
 
     # Create reverse proxy for web UI
-    caddy.routes = lib.mkAfter [{
-      group =
-        lib.mkIf (config.arrServer == config.transmissionServer) "download";
+    caddy.routes = [{
       match = [{ host = [ config.transmissionServer ]; }];
       handle = [{
         handler = "reverse_proxy";