diff --git a/custom-pkgs/crystal/default.nix b/custom-pkgs/crystal/default.nix
index d77f401..7954b3b 100644
--- a/custom-pkgs/crystal/default.nix
+++ b/custom-pkgs/crystal/default.nix
@@ -1 +1 @@
-{ util, ... }: util.package
+{ util, ... }: util.package { }
diff --git a/custom-pkgs/fb-client/default.nix b/custom-pkgs/fb-client/default.nix
index d77f401..7954b3b 100644
--- a/custom-pkgs/fb-client/default.nix
+++ b/custom-pkgs/fb-client/default.nix
@@ -1 +1 @@
-{ util, ... }: util.package
+{ util, ... }: util.package { }
diff --git a/custom-pkgs/flameshot/default.nix b/custom-pkgs/flameshot/default.nix
index d77f401..7954b3b 100644
--- a/custom-pkgs/flameshot/default.nix
+++ b/custom-pkgs/flameshot/default.nix
@@ -1 +1 @@
-{ util, ... }: util.package
+{ util, ... }: util.package { }
diff --git a/custom-pkgs/otp/default.nix b/custom-pkgs/otp/default.nix
index d77f401..5ecdefc 100644
--- a/custom-pkgs/otp/default.nix
+++ b/custom-pkgs/otp/default.nix
@@ -1 +1 @@
-{ util, ... }: util.package
+{ util, inputs, ... }: util.package { inherit inputs; }
diff --git a/custom-pkgs/otp/package.nix b/custom-pkgs/otp/package.nix
index 0c32a18..f0bcda3 100644
--- a/custom-pkgs/otp/package.nix
+++ b/custom-pkgs/otp/package.nix
@@ -1,6 +1,7 @@
-{ pkgs }:
+{ pkgs, inputs }:
 let
-  ykman = "${pkgs.yubikey-manager}/bin/ykman";
+  yubikey-manager = inputs.nixpkgs-unstable.legacyPackages.${pkgs.system}.yubikey-manager;
+  ykman = "${yubikey-manager}/bin/ykman";
   sk = "${pkgs.skim}/bin/sk";
   wl-copy = "${pkgs.wl-clipboard}/bin/wl-copy";
 in
diff --git a/custom-pkgs/util.nix b/custom-pkgs/util.nix
index b432436..24f3963 100644
--- a/custom-pkgs/util.nix
+++ b/custom-pkgs/util.nix
@@ -12,5 +12,5 @@ dir:
       };
     };
 
-  package = final: prev: { "${dir}" = final.callPackage ./${dir}/package.nix { pkgs = prev; }; };
+  package = attrs: final: prev: { "${dir}" = final.callPackage ./${dir}/package.nix (attrs // { pkgs = prev; }); };
 }
diff --git a/custom-pkgs/wl-copy-both/default.nix b/custom-pkgs/wl-copy-both/default.nix
index d77f401..7954b3b 100644
--- a/custom-pkgs/wl-copy-both/default.nix
+++ b/custom-pkgs/wl-copy-both/default.nix
@@ -1 +1 @@
-{ util, ... }: util.package
+{ util, ... }: util.package { }
diff --git a/home/common/default.nix b/home/common/default.nix
index b23fbc9..b7c55a8 100644
--- a/home/common/default.nix
+++ b/home/common/default.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, pkgs, inputs, ... }:
 {
   nixpkgs.config.allowUnfree = true;
   imports = [ ../gnome ../custom-programs ./neovim ];
@@ -15,8 +15,8 @@
   home.packages = with pkgs; [
     htop
     gnupg
-    yubioath-flutter
-    yubikey-manager
+    inputs.nixpkgs-unstable.legacyPackages.${pkgs.system}.yubioath-flutter
+    inputs.nixpkgs-unstable.legacyPackages.${pkgs.system}.yubikey-manager
     gcc
     sqlite
     nerdfonts
@@ -412,10 +412,6 @@
     pinentryPackage = pinentry-gnome3;
   };
 
-  programs.gpg.scdaemonSettings = {
-    disable-ccid = true;
-  };
-
   xdg.configFile."autostart/gnome-keyring-ssh.desktop".text = lib.strings.concatLines [
     (builtins.readFile "${pkgs.gnome-keyring}/etc/xdg/autostart/gnome-keyring-ssh.desktop")
     "X-GNOME-Autostart-enabled=false"
diff --git a/hosts/freun.dev/default.nix b/hosts/freun.dev/default.nix
index 1311e22..b8b0088 100644
--- a/hosts/freun.dev/default.nix
+++ b/hosts/freun.dev/default.nix
@@ -1,12 +1,8 @@
-{ inputs, ... }:
-let
-  inherit (inputs) gtrackmap;
-in
+{ ... }:
 {
   imports = [
     ./hardware-configuration.nix
     ./configuration.nix
     ./services.nix
-    gtrackmap.nixosModules.default
   ];
 }
diff --git a/hosts/radish/hardware.nix b/hosts/radish/hardware.nix
index 9156c18..7e82fe4 100644
--- a/hosts/radish/hardware.nix
+++ b/hosts/radish/hardware.nix
@@ -1,17 +1,14 @@
 { pkgs, inputs, lib, config, ... }:
+let
+  pkgsUnstable = inputs.nixpkgs-unstable.legacyPackages.${pkgs.system};
+in
 {
   hardware.bluetooth.enable = true;
   hardware.bluetooth.powerOnBoot = true;
 
-  services.pcscd = {
-    enable = true;
-    plugins = [
-      pkgs.ccid
-    ];
-  };
   services.udev.packages = [
     pkgs.zsa-udev-rules
-    pkgs.yubikey-personalization
+    pkgsUnstable.yubikey-personalization
     inputs.ksoloti-pr.legacyPackages.${pkgs.system}.ksoloti
   ];
   services.usbmuxd = {
diff --git a/modules/services/gtrackmap.nix b/modules/services/gtrackmap.nix
index a3ecebf..2666e84 100644
--- a/modules/services/gtrackmap.nix
+++ b/modules/services/gtrackmap.nix
@@ -1,9 +1,13 @@
-{ lib, config, ... }:
+{ lib, config, inputs, ... }:
 let
   cfg = config.modules.services.gtrackmap;
   fqdn = "${cfg.subdomain}.${config.networking.domain}";
 in
 {
+  imports = [
+    inputs.gtrackmap.nixosModules.default
+  ];
+
   options.modules.services.gtrackmap = {
     enable = lib.mkEnableOption "Enable GTrackmap";
     subdomain = lib.mkOption {
@@ -15,7 +19,7 @@ in
     };
   };
 
-  config = {
+  config = lib.mkIf cfg.enable {
     services.gtrackmap = {
       enable = true;
       inherit (cfg) port;