diff --git a/sets/packages.nix b/sets/packages.nix
index 8622ba3..c599321 100644
--- a/sets/packages.nix
+++ b/sets/packages.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, pkgs, lib, ... }:
 let
   llvm = pkgs.llvmPackages_12;
   ffmpeg-nonfree = pkgs.ffmpeg-full.override { nonfreeLicensing = true; fdkaacExtlib = true; };
@@ -17,15 +17,8 @@ in
     pavucontrol
     youtubeDL
 
-    # Wine and tools
-    cabextract
-    samba
-    wineWowPackages.staging
-
     # Linux tools
     dmidecode
-    efibootmgr
-    efitools
     gparted
     hdparm
     iptables
@@ -40,7 +33,6 @@ in
     psmisc
     qrencode
     rsync
-    sbsigntool
     xorg.xeyes
     xorg.xkill
     zbar
@@ -109,7 +101,7 @@ in
     clang-tools
     cmake
     conda
-    gcc9
+    gcc11
     gdb
     gnumake
     llvm.bintools
@@ -132,17 +124,12 @@ in
     evince
     gnome3.eog
     gnome3.gnome-system-monitor
-    libreoffice-fresh
     zathura
+    libreoffice-fresh
 
     # Web
-    chromium
     firefox-wayland
 
-    # Communication
-    signal-desktop
-    tdesktop
-
     # Gnome configuration
     gnome3.adwaita-icon-theme
     gnome3.gnome-tweak-tool
@@ -157,5 +144,14 @@ in
   ]) ++ (with pkgs.hunspellDicts; [
     en-us-large
     de_DE
-  ]);
+  ]) ++ (lib.optionals (builtins.currentSystem == "x86_64-linux") (with pkgs; [
+    efibootmgr
+    efitools
+    sbsigntool
+    
+    # Wine and tools
+    cabextract
+    samba
+    wineWowPackages.staging
+  ]));
 }
diff --git a/sets/workstation.nix b/sets/workstation.nix
index 84fe159..48d999f 100644
--- a/sets/workstation.nix
+++ b/sets/workstation.nix
@@ -26,7 +26,7 @@
 
   hardware = {
     bluetooth.enable = true;
-    opengl.driSupport32Bit = true;
+    opengl.driSupport32Bit = (builtins.currentSystem == "x86_64-linux");
     steam-hardware.enable = true;
   };
 
diff --git a/system/mistmane/boot-config.nix b/system/mistmane/boot-config.nix
index 1fe82e0..87da162 100644
--- a/system/mistmane/boot-config.nix
+++ b/system/mistmane/boot-config.nix
@@ -3,22 +3,13 @@
 {
   boot = {
     kernel.sysctl."vm.swappiness" = 5;
+    kernelPackages = pkgs.linuxPackages_pinebookpro_lts;
     cleanTmpDir = true;
     loader.grub.enable = false;
     loader.generic-extlinux-compatible.enable = true;
-
-    initrd = {
-      luks.devices."${config.networking.hostName}" = {
-        name = config.networking.hostName;
-        device = "/dev/disk/by-uuid/aa3cac7f-695a-40d4-ad2b-f781ddd3c8e1";
-        preLVM = true;
-        allowDiscards = true;
-      };
-    };
   };
 
   fileSystems = {
-    "/home".options = [ "noatime" ];
     "/boot".options = [ "noatime" ];
     "/".options = [ "noatime" ];
   };
diff --git a/system/mistmane/default.nix b/system/mistmane/default.nix
index 240c252..878c5d9 100644
--- a/system/mistmane/default.nix
+++ b/system/mistmane/default.nix
@@ -12,8 +12,10 @@
   networking.hostName = "mistmane";
   programs.light.enable = true;
   system.stateVersion = "20.09";
-
+  
+  security.pam.enableEcryptfs = true;
   environment.systemPackages = with pkgs; [
+    ecryptfs ecryptfs-helper
     foot
   ];
 }
diff --git a/system/mistmane/hardware-configuration.nix b/system/mistmane/hardware-configuration.nix
index e56ed6c..54fbebc 100644
--- a/system/mistmane/hardware-configuration.nix
+++ b/system/mistmane/hardware-configuration.nix
@@ -5,37 +5,25 @@
 
 {
   imports =
-    [
-      (modulesPath + "/installer/scan/not-detected.nix")
+    [ (modulesPath + "/installer/scan/not-detected.nix")
     ];
 
   boot.initrd.availableKernelModules = [ "nvme" "usbhid" "usb_storage" ];
-  boot.initrd.kernelModules = [ "dm-snapshot" ];
+  boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ ];
   boot.extraModulePackages = [ ];
 
   fileSystems."/" =
-    {
-      device = "/dev/disk/by-uuid/de73bbb6-e56a-4aa0-8a48-c18c9d87a2b9";
-      fsType = "btrfs";
-      options = [ "subvol=root" ];
-    };
-
-  fileSystems."/home" =
-    {
-      device = "/dev/disk/by-uuid/de73bbb6-e56a-4aa0-8a48-c18c9d87a2b9";
-      fsType = "btrfs";
-      options = [ "subvol=home" ];
+    { device = "/dev/disk/by-uuid/ee6d20e7-03ec-462b-a28a-3e970acc5f0a";
+      fsType = "ext4";
     };
 
   fileSystems."/boot" =
-    {
-      device = "/dev/disk/by-uuid/DB30-D60A";
-      fsType = "vfat";
+    { device = "/dev/disk/by-uuid/ef0ee32a-8ee0-4c4a-af21-d033ac2bb774";
+      fsType = "ext4";
     };
 
-  swapDevices =
-    [{ device = "/dev/disk/by-uuid/33353309-c592-40ba-8a72-f629c0776a82"; }];
+  swapDevices = [ ];
 
   powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand";
 }