diff --git a/configs/common.nix b/configs/common.nix
index 7a63318..a019557 100755
--- a/configs/common.nix
+++ b/configs/common.nix
@@ -3,6 +3,16 @@ let secrets = import ./secrets.nix;
 in {
   environment.shells = with pkgs; [ bashInteractive zsh ];
 
+  programs = {
+    nh = {
+      enable = true;
+      # clean = {
+      #   enable = true;
+      #   extraArgs = "--keep-since 14d --keep 5";
+      # };
+    };
+  };
+
   services = {
     vnstat.enable = true;
     tuptime.enable = true;
@@ -104,7 +114,10 @@ in {
     wget
   ];
 
-  nix.settings = { auto-optimise-store = true; };
+  nix.settings = {
+    auto-optimise-store = true;
+    experimental-features = [ "nix-command" ];
+  };
 
   boot = {
     tmp.useTmpfs = true;
diff --git a/configs/pantheon.nix b/configs/pantheon.nix
index ccf126f..f3eb769 100755
--- a/configs/pantheon.nix
+++ b/configs/pantheon.nix
@@ -23,12 +23,13 @@
         ];
       };
 
-      layout = "us";
+      xkb.layout = "us";
 
-      # Enable touchpad support.
-      libinput.enable = true;
       updateDbusEnvironment = true;
     };
+
+    # Enable touchpad support.
+    libinput.enable = true;
   };
 
   systemd.user.services = {
diff --git a/machine/framework.nix b/machine/framework.nix
index 6517d3c..191cb01 100755
--- a/machine/framework.nix
+++ b/machine/framework.nix
@@ -15,8 +15,7 @@ in
     ../configs/docker.nix
     ../configs/games.nix
     ../configs/libvirt.nix
-    ../configs/plasma.nix
-    # ../configs/pantheon.nix
+    ../configs/pantheon.nix
     ../configs/user-gui.nix
     ../configs/user.nix
     /home/alex/Workspace/fw-fanctrl-nix/service.nix
@@ -25,22 +24,18 @@ in
   boot = {
     initrd.systemd.enable = true;
     loader = {
-#      grub = {
-#        enable = true;
-#        device = "nodev";
-#        useOSProber = true;
-#        efiSupport = true;
-#      };
       systemd-boot.enable = true;
       efi = { canTouchEfiVariables = true; };
     };
     plymouth.enable = true;
   };
 
-  nixpkgs.config.allowUnfree = true;
-  nixpkgs.config.packageOverrides = pkgs: {
-    intel-vaapi-driver =
-      pkgs.intel-vaapi-driver.override { enableHybridCodec = true; };
+  nixpkgs.config = {
+    allowUnfree = true;
+    packageOverrides = pkgs: {
+      intel-vaapi-driver =
+        pkgs.intel-vaapi-driver.override { enableHybridCodec = true; };
+    };
   };
 
   # nixpkgs.localSystem = {
@@ -49,10 +44,7 @@ in
   #   system = "x86_64-linux";
   # };
 
-  # nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-
-  nix.settings.system-features =
-    [ "nixos-test" "benchmark" "big-parallel" "kvm" "gccarch-alderlake" ];
+  nix.settings.system-features = [ "nixos-test" "benchmark" "big-parallel" "kvm" "gccarch-alderlake" ];
 
   networking = {
     hostName = "framework";
@@ -99,10 +91,10 @@ in
       configJsonPath = "/home/alex/nixos-config/config.json";
     };
 
-    displayManager.autoLogin = {
-      enable = true;
-      user = "alex";
-    };
+#    displayManager.autoLogin = {
+#      enable = true;
+#      user = "alex";
+#    };
 
     pipewire = {
       enable = true;