diff --git a/configs/gui.nix b/configs/gui.nix
index 3f18162..ccd3811 100755
--- a/configs/gui.nix
+++ b/configs/gui.nix
@@ -21,7 +21,6 @@ in
     gparted
     libsecret
     gnome.simple-scan
-    telegram-desktop
   ];
 
   programs = {
diff --git a/configs/plasma.nix b/configs/plasma.nix
index 039f5b0..0848595 100755
--- a/configs/plasma.nix
+++ b/configs/plasma.nix
@@ -1,9 +1,24 @@
 { config, pkgs, lib, ... }:
 
 {
-  programs.dconf.enable = true;
+  programs = {
+    dconf.enable = true;
+    kdeconnect.enable = true;
+  };
 
-  services.xserver.enable = true;
-  services.xserver.displayManager.sddm.enable = true;
-  services.xserver.desktopManager.plasma5.enable = true;
+  services = {
+    xserver = {
+      enable = true;
+      excludePackages = [ pkgs.xterm ];
+
+      displayManager.sddm.enable = true;
+      desktopManager.plasma5.enable = true;
+
+      layout = "us";
+
+      # Enable touchpad support.
+      libinput.enable = true;
+      updateDbusEnvironment = true;
+    };
+  };
 }
diff --git a/configs/user.nix b/configs/user.nix
index c1e715b..c9d35c7 100755
--- a/configs/user.nix
+++ b/configs/user.nix
@@ -2,8 +2,7 @@
 let
   unstable = import <nixos-unstable> { config.allowUnfree = true; };
   secrets = import ./secrets.nix;
-in
-{
+in {
   imports = [ <home-manager/nixos> ];
 
   # Define a user account. Don't forget to set a password with ‘passwd’.
@@ -35,7 +34,10 @@ in
     };
   };
 
-  programs.zsh.enable = true;
+  programs = {
+    zsh.enable = true;
+    nix-ld.enable = true;
+  };
 
   home-manager.useUserPackages = true;
   home-manager.useGlobalPkgs = true;
@@ -43,13 +45,6 @@ in
   environment.pathsToLink = [ "/share/zsh" ];
 
   home-manager.users.alex = { pkgs, ... }: {
-    imports = [
-      "${
-        fetchTarball
-        "https://github.com/msteen/nixos-vscode-server/tarball/master"
-      }/modules/vscode-server/home.nix"
-    ];
-
     home = {
       stateVersion = "23.11";
       packages = with unstable.pkgs; [
@@ -179,7 +174,5 @@ in
 
       tmux = { enable = true; };
     };
-
-    services.vscode-server.enable = true;
   };
 }
diff --git a/machine/framework.nix b/machine/framework.nix
index 1399b59..a026318 100755
--- a/machine/framework.nix
+++ b/machine/framework.nix
@@ -1,15 +1,10 @@
 { config, pkgs, lib, ... }:
 let
-  unstable = import <nixos-unstable> {
-    config = {
-      allowUnfree = true;
-    };
-  };
+  unstable = import <nixos-unstable> { config = { allowUnfree = true; }; };
   be = import ../configs/borg-exclude.nix;
   secrets = import ../configs/secrets.nix;
   wireguard = import ../configs/wireguard.nix;
-in
-{
+in {
   imports = [
     <nixos-hardware/framework/13-inch/12th-gen-intel>
     <home-manager/nixos>
@@ -36,9 +31,7 @@ in
         useOSProber = true;
         efiSupport = true;
       };
-      efi = {
-        canTouchEfiVariables = true;
-      };
+      efi = { canTouchEfiVariables = true; };
     };
     plymouth.enable = true;
   };
@@ -53,8 +46,8 @@ in
   #   system = "x86_64-linux";
   # };
 
-  nix.settings.system-features = [ "nixos-test" "benchmark" "big-parallel" "kvm" "gccarch-alderlake" ];
-  #  programs.nix-ld.enable = true;
+  nix.settings.system-features =
+    [ "nixos-test" "benchmark" "big-parallel" "kvm" "gccarch-alderlake" ];
 
   networking = {
     hostName = "framework";
@@ -84,9 +77,7 @@ in
     opengl = {
       enable = true;
       driSupport32Bit = true;
-      extraPackages = with pkgs; [
-        intel-media-driver # LIBVA_DRIVER_NAME=iHD
-      ];
+      extraPackages = with pkgs; [ intel-media-driver ];
     };
     pulseaudio.enable = false;
   };
@@ -135,23 +126,21 @@ in
     DefaultTimeoutStopSec=10s
   '';
 
-  programs.kdeconnect.enable = true;
-  environment.systemPackages =
-    with unstable.pkgs; [
-      rustdesk
-      cinnamon.warpinator
-      psensor
-      veracrypt
-      gnumake
-      pkg-config
-      libftdi
-      libusb1
-      gcc
-      # coreboot-toolchain.arm
-      intel-gpu-tools
-      msr-tools
-      (import ("/home/alex/Workspace/fw-ectool/default.nix"))
-    ];
+  environment.systemPackages = with unstable.pkgs; [
+    rustdesk
+    cinnamon.warpinator
+    psensor
+    veracrypt
+    gnumake
+    pkg-config
+    libftdi
+    libusb1
+    gcc
+    # coreboot-toolchain.arm
+    intel-gpu-tools
+    msr-tools
+    (import ("/home/alex/Workspace/fw-ectool/default.nix"))
+  ];
 
   # Set up deep sleep + hibernation
   swapDevices = [{
@@ -160,11 +149,11 @@ in
   }];
 
   # Partition swapfile is on (after LUKS decryption)
-  boot.resumeDevice = "/dev/disk/by-uuid/642b9f1c-f8ed-4bdf-baa4-465409942c2e";
+  boot.resumeDevice = "/dev/disk/by-uuid/e5472308-de8b-4e60-91f4-4e7f194dad76";
 
   # Resume Offset is offset of swapfile
   # https://wiki.archlinux.org/title/Power_management/Suspend_and_hibernate#Hibernation_into_swap_file
-  boot.kernelParams = [ "mem_sleep_default=deep" "resume_offset=7604224" ];
+  boot.kernelParams = [ "mem_sleep_default=deep" "resume_offset=40241152" ];
 
   # Suspend-then-hibernate everywhere
   services.logind = {