diff --git a/system/global/home.nix b/system/global/home.nix
index 48b9b14..1339673 100644
--- a/system/global/home.nix
+++ b/system/global/home.nix
@@ -236,14 +236,8 @@
     ];
   };
   
-  services.fnott = {
+  services.mako = {
     enable = true;
-    # https://codeberg.org/dnkl/fnott/src/branch/master/fnott.ini
-    settings = {
-      main = {
-        selection-helper = "wofi --show dmenu";
-      };
-    };
   };
 
   programs.ncmpcpp = {
@@ -361,6 +355,5 @@
   home.file.".icons/default".source = "${pkgs.vanilla-dmz}/share/icons/Vanilla-DMZ";
 
   programs.librewolf.enable = true;
-  programs.firefox.enable = true;
 
 }
diff --git a/system/global/system.nix b/system/global/system.nix
index 414e948..41a33ae 100644
--- a/system/global/system.nix
+++ b/system/global/system.nix
@@ -80,6 +80,7 @@
     code = "codium";
   };
 
+  services.gvfs.enable = true;
   environment.systemPackages = with pkgs; [
     foot
     tealdeer
diff --git a/system/work/hardware.nix b/system/work/hardware.nix
index bf6c1f4..08c7c6c 100644
--- a/system/work/hardware.nix
+++ b/system/work/hardware.nix
@@ -19,7 +19,11 @@
       options = [ "subvol=@" "compress=zstd" "autodefrag" ];
     };
 
-  boot.initrd.luks.devices."cryptroot".device = "/dev/disk/by-uuid/570cc51f-bd5c-4bee-a18f-f6aabaf60881";
+  boot.initrd.luks.devices."cryptroot" = {
+    device = "/dev/disk/by-uuid/570cc51f-bd5c-4bee-a18f-f6aabaf60881";
+    keyFileSize = 4096;
+    keyFile = "/dev/sda";
+  };
 
   fileSystems."/home" =
     { device = "/dev/disk/by-uuid/48a07e82-1090-448c-a751-3a410afba0f7";
diff --git a/system/work/home.nix b/system/work/home.nix
index 846afc1..f660243 100644
--- a/system/work/home.nix
+++ b/system/work/home.nix
@@ -8,10 +8,12 @@
     sbctl
     onedrive
     kubectl
+    awscli2
     docker-compose
     gimp
     libreoffice
     ansible
+    thunderbird
   ];
 
   programs.git = {
@@ -23,13 +25,6 @@
       amend = "commit --amend --no-edit";
     };
   };
-  
-  accounts.email.accounts."tristan.beedell@cryoserver.com" = {
-    userName = "tristan.beedell@cryoserver.com";
-    realName = "Tristan Beedell";
-    address = "tristan.beedell@cryoserver.com";
-    primary = true;
-  };
 
   wayland.windowManager.hyprland = {
     extraConfig = ''
@@ -48,4 +43,6 @@
     ];
   };
 
+  programs.firefox.enable = true;
+
 }