diff --git a/nixos/logical/smithers.nix b/nixos/logical/smithers.nix
index 39d41ce..4e6c756 100644
--- a/nixos/logical/smithers.nix
+++ b/nixos/logical/smithers.nix
@@ -23,7 +23,13 @@ in {
   networking.wireless.iwd.enable = true;
   networking.hostId = "54a8968e";
 
+  hardware.bluetooth.enable = true;
+  services.fprintd.enable = true;
   system.stateVersion = "21.05";
   boot.kernelPackages = pkgs.linuxPackages_latest; # new hardware
 
+  boot.initrd.availableKernelModules = [ "i915" ];
+  boot.loader.timeout = 0;
+  boot.kernelParams = ["i915.fastboot=1" "quiet"];
+  #boot.plymouth.enable = true;
 }
diff --git a/nixos/roles/workstation.nix b/nixos/roles/workstation.nix
index 9decbbc..4ee7ca4 100644
--- a/nixos/roles/workstation.nix
+++ b/nixos/roles/workstation.nix
@@ -53,12 +53,12 @@ in {
     binaryCachePublicKeys = [
       "serokell:ic/49yTkeFIk4EBX1CZ/Wlt5fQfV7yCifaJyoM+S3Ss="
       "serokell-1:aIojg2Vxgv7MkzPJoftOO/I8HKX622sT+c0fjnZBLj0="
-      "cache.lumi.guide-1:z813xH+DDlh+wvloqEiihGvZqLXFmN7zmyF8wR47BHE="
+      (lib.mkIf config.yorick.lumi-vpn.enable "cache.lumi.guide-1:z813xH+DDlh+wvloqEiihGvZqLXFmN7zmyF8wR47BHE=")
       "serokell.cachix.org-1:5DscEJD6c1dD1Mc/phTIbs13+iW22AVbx0HqiSb+Lq8="
       #"nixpkgs-wayland.cachix.org-1:3lwxaILxMRkVhehr5StQprHdEo4IrE8sRho9R9HOLYA="
       "yorick:Pmd0gyrTvVdzpQyb/raHJKdoOag8RLaj434qBgMm4I0="
     ];
-    extraOptions = ''
+    extraOptions = lib.mkIf config.yorick.lumi-vpn.enable ''
       netrc-file = ${nixNetrcFile}
     '';
   };