diff --git a/nixos/hosts/nixos-framework/default.nix b/nixos/hosts/nixos-framework/default.nix
index 3c49cdee..d542d7a0 100644
--- a/nixos/hosts/nixos-framework/default.nix
+++ b/nixos/hosts/nixos-framework/default.nix
@@ -1,16 +1,12 @@
 { inputs, config, lib, pkgs, modulesPath, desktop, username, ... }: {
   imports = [ 
+    inputs.nixos-hardware.nixosModules.framework.13th-gen-intel
     (modulesPath + "/installer/scan/not-detected.nix")
     ./disks.nix
     ../../common/services/powertop.nix 
     ../../common/modules/secureboot.nix
   ];
 
-  modules = [
-    # nix/nixos/hosts/nixos-laptop
-    inputs.nixos-hardware.nixosModules.framework.13th-gen-intel
-  ];
-
   # steam , etc
   nixpkgs.config.allowUnfree = true;
 
@@ -19,37 +15,6 @@
   boot.kernelModules = [ "kvm-intel" "acpi_call" ];
   boot.extraModulePackages = with config.boot.kernelPackages; [ acpi_call ];
 
-  # This expects the following:
-  # /boot is "VFAT"  fstype with label "BOOT"
-  # /     is "btrfs" fstype with label "ROOT"
-  # swap  is "swap"  fstype with label "SWAP"
-
-  fileSystems."/" = {
-    device = "/dev/disk/by-label/ROOT";
-    fsType = "btrfs";
-    options = [ "subvol=@" ];
-  };
-
-  boot.initrd.luks.devices."DISK".device = "/dev/nvme0n1p1";
-
-  fileSystems."/boot" = {
-    device = "/dev/disk/by-label/BOOT";
-    fsType = "vfat";
-  };
-
-  # Enable Swap on LUKS
-  boot.initrd.luks.devices."SWAP" = {
-    device = "/dev/nvme0n1p2";
-    keyFile = "/crypto_keyfile.bin";
-  };
-
-  # Set up the keyfile
-  boot.initrd.secrets."/crypto_keyfile.bin" = null;
-  # Hibernation resume device
-  boot.resumeDevice = "/dev/disk/by-label/SWAP";
-  # Confirm the swap devices
-  swapDevices = [ { device = "/dev/disk/by-label/SWAP"; } ];
-
   networking.useDHCP = lib.mkDefault true;
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand";
@@ -61,13 +26,6 @@
   # Set the networking hostname:
   networking.hostName = "nixos-framework";
 
-  # Configure the fingerprint reader
-  services.fprintd = { 
-    enable = true;
-    tod.enable = true;
-    tod.driver = pkgs.libfprint-2-tod1-vfs0090;
-  };
-
   hardware = {
     opengl = {
       enable = true;
@@ -77,9 +35,6 @@
   };
 
   environment.systemPackages = with pkgs; [ 
-    # Fingerprint software
-    fprintd
-
     # Game related things
     gamemode
 
diff --git a/nixos/users/albert/desktop.nix b/nixos/users/albert/desktop.nix
index 4a9b32a2..4ccb98e5 100644
--- a/nixos/users/albert/desktop.nix
+++ b/nixos/users/albert/desktop.nix
@@ -4,6 +4,7 @@
     steam
     lutris
     vlc
+    vintage-story
   ];
 
   imports = [