diff --git a/hosts/laptop/default.nix b/hosts/laptop/default.nix
index cfc16da..7310bb0 100644
--- a/hosts/laptop/default.nix
+++ b/hosts/laptop/default.nix
@@ -44,6 +44,9 @@
 #    enable = false;
 #    extraBackends = [ pkgs.sane-airscan ];
 #  };
+  hardware = {
+    nitrokey.enable = true;
+  };
 
   environment = {
     systemPackages = with pkgs; [
@@ -67,7 +70,7 @@
   services = {
     tlp.enable = true;                      # TLP and auto-cpufreq for power management
     #logind.lidSwitch = "ignore";            # Laptop does not go to sleep when lid is closed
-    auto-cpufreq.enable = true;
+    #auto-cpufreq.enable = true;
     blueman.enable = true;
     printing = {                            # Printing and drivers for TS5300
       enable = true;
@@ -83,23 +86,6 @@
       };
     };
 
-    #xserver = {
-    #  libinput = {                          # Trackpad support & gestures
-    #    touchpad = {
-    #      tapping = true;
-    #      scrollMethod = "twofinger";
-    #      naturalScrolling = true;            # The correct way of scrolling
-    #      accelProfile = "adaptive";          # Speed settings
-    #      #accelSpeed = "-0.5";
-    #      disableWhileTyping = true;
-    #    };
-    #  };
-    #  resolutions = [
-    #    { x = 1600; y = 920; }
-    #    { x = 1280; y = 720; }
-    #    { x = 1920; y = 1080; }
-    #  ];
-    #};
   };
 
   #temporary bluetooth fix
diff --git a/hosts/laptop/hardware-configuration.nix b/hosts/laptop/hardware-configuration.nix
index 9a0521e..f04e3e6 100644
--- a/hosts/laptop/hardware-configuration.nix
+++ b/hosts/laptop/hardware-configuration.nix
@@ -21,6 +21,7 @@
   boot.initrd.kernelModules = [ "i915" ];
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
+  boot.kernelParams = [ "mitigations=off" "luks.options=fido2-device=auto" ];
 
   boot.initrd.luks = {
     fido2Support = true;
@@ -42,10 +43,10 @@
       options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@home,discard=async" ];
     };
 
-  fileSystems."/opt" =
+  fileSystems."/home/.snapshots" =
     { device = "/dev/mapper/root";
       fsType = "btrfs";
-      options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@opt,discard=async" ];
+      options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@snapshots,discard=async" ];
     };
 
   fileSystems."/srv" =
@@ -54,6 +55,18 @@
       options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@srv,discard=async" ];
     };
 
+  fileSystems."/opt" =
+    { device = "/dev/mapper/root";
+      fsType = "btrfs";
+      options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@opt,discard=async" ];
+    };
+
+  fileSystems."/nix" =
+    { device = "/dev/mapper/root";
+      fsType = "btrfs";
+      options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@nix,discard=async" ];
+    };
+
   fileSystems."/boot" =
     { device = "/dev/disk/by-label/BOOT";
       fsType = "vfat";
@@ -86,7 +99,6 @@
       };
     };
     interfaces = {
-      #wlp1s0 = {
       wlan0 = {
         useDHCP = true;                     # For versatility sake, manually edit IP on nm-applet.
         #ipv4.addresses = [ {
@@ -94,13 +106,6 @@
         #    prefixLength = 24;
         #} ];
       };
-#      wlo1 = {
-#        useDHCP = true;
-#        #ipv4.addresses = [ {
-#        #  address = "192.168.0.51";
-#        #  prefixLength = 24;
-#        #} ];  
-#      };
     };
     #defaultGateway = "192.168.0.1";
     #nameservers = [ "192.168.0.4" ];
diff --git a/hosts/laptop/home.nix b/hosts/laptop/home.nix
index e40669d..5df2e28 100644
--- a/hosts/laptop/home.nix
+++ b/hosts/laptop/home.nix
@@ -34,7 +34,7 @@
       intel-gpu-tools
       pulsemixer
       yubioath-desktop
-      yubikey-manager
+      nitrokey-app
 
       # Display
       light                              # xorg.xbacklight not supported. Other option is just use xrandr.