diff --git a/configuration.nix b/configuration.nix
index 80c28c1..22eda7e 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -47,7 +47,12 @@ in
   programs.zsh.enable = true;
 
   services = {
-    openssh.enable = true;
+    openssh = {
+      enable = true;
+      settings = {
+        X11Forwarding = true;
+      };
+    };
     tailscale.enable = true;
     zfs.autoSnapshot.enable = true;
     hardware.bolt.enable = true;
@@ -73,11 +78,18 @@ in
       displayManager.startx.enable = true;
       desktopManager.plasma5.enable = true;
       desktopManager.mate.enable = true;
-      displayManager.defaultSession = "plasmawayland";
-      displayManager.autoLogin.enable = true;
-      displayManager.autoLogin.user = "hodgson";
-      layout = "us";
-      xkbVariant = "";
+      xkb = {
+        layout = "us";
+        variant = "";
+      };
+    };
+
+    displayManager = {
+      defaultSession = "plasmawayland";
+      autoLogin = {
+        enable = true;
+        user = "hodgson";
+      };
     };
 
     # emacs = {
@@ -88,7 +100,7 @@ in
 
     avahi = {
       enable = true;
-      nssmdns = true;
+      nssmdns4 = true;
       openFirewall = true;
       publish = {
         enable = true;
@@ -122,6 +134,11 @@ in
     };
   };
 
+  security.pam.services.kwallet = {
+    name = "kwallet";
+    enableKwallet = true;
+  };
+
   security = {
     rtkit.enable = true;
     sudo.wheelNeedsPassword = false;
@@ -172,6 +189,7 @@ in
     tmux
     unstablePkgs.signal-desktop
     gcc
+    tree
 
     # emacs dependencies
     ispell
@@ -184,6 +202,7 @@ in
     google-chrome
     firefox
     lynx
+    chromium
 
     # networking
     curl
diff --git a/home.nix b/home.nix
index c021d41..a8de1a7 100644
--- a/home.nix
+++ b/home.nix
@@ -41,9 +41,7 @@
   fonts.fontconfig.enable = true;
 
   home.packages = with pkgs; [
-    cilium-cli
     go
-    packer
     podman
     podman-compose
     ansible
@@ -54,29 +52,16 @@
     htop
     jq
     k9s
-    krew
-    kubectl
-    kubernetes-helm
-    ovftool
     nixfmt
     ranger
     ripgrep
     shellcheck
     shfmt
-    sops
     sysz
     tealdeer
     tmux
-    # @Nikolai This apparently is affected by some vulnerability?
-    # CVE-2024-2660
-    # vault
     whois
-    zoom-us
-    slack
-    unstablePkgs.awscli2
-    unstablePkgs.clusterctl
-    unstablePkgs.fira-code-nerdfont
-  ];
+    ];
 
   programs = {
     home-manager.enable = true;