diff --git a/configs/games.nix b/configs/games.nix
index 928a5a7..e40b346 100755
--- a/configs/games.nix
+++ b/configs/games.nix
@@ -32,5 +32,6 @@ in
     vulkan-tools
     wine
     winetricks
+    pcsx2
   ];
 }
diff --git a/configs/plasma-wayland.nix b/configs/plasma-wayland.nix
index bed36d0..5c97a57 100755
--- a/configs/plasma-wayland.nix
+++ b/configs/plasma-wayland.nix
@@ -4,12 +4,29 @@
     kdeconnect.enable = true;
   };
 
-  environment.plasma6.excludePackages = with pkgs.kdePackages; [
-    plasma-browser-integration
-    konsole
-    oxygen
-    kate
-  ];
+  environment = {
+    sessionVariables.NIXOS_OZONE_WL = "1";
+    plasma6.excludePackages = with pkgs.kdePackages; [
+      plasma-browser-integration
+      konsole
+      oxygen
+      kate
+    ];
+
+    systemPackages = with pkgs; [
+      kdePackages.ksshaskpass
+      kdePackages.kde-gtk-config
+      kdePackages.breeze-gtk
+      kdePackages.partitionmanager
+      kdePackages.filelight
+      kdePackages.plasma-disks
+      kdePackages.kalk
+      krusader
+      ktimetracker
+      kdiff3
+      kdiskmark
+    ];
+  };
 
   services = {
     desktopManager.plasma6.enable = true;
@@ -22,4 +39,11 @@
 
     libinput.enable = true;
   };
+
+  programs = {
+    ssh = {
+      startAgent = true;
+      askPassword = pkgs.lib.mkForce "${pkgs.kdePackages.ksshaskpass}/bin/ksshaskpass";
+    };
+  };
 }
diff --git a/configs/plasma.nix b/configs/plasma.nix
index 35b4c93..e10d448 100755
--- a/configs/plasma.nix
+++ b/configs/plasma.nix
@@ -4,12 +4,27 @@
     kdeconnect.enable = true;
   };
 
-  environment.plasma6.excludePackages = with pkgs.kdePackages; [
-    plasma-browser-integration
-    konsole
-    oxygen
-    kate
-  ];
+  environment = {
+    plasma6.excludePackages = with pkgs.kdePackages; [
+      plasma-browser-integration
+      konsole
+      oxygen
+      kate
+    ];
+
+    systemPackages = with pkgs; [
+      kdePackages.ksshaskpass
+      kdePackages.kde-gtk-config
+      kdePackages.breeze-gtk
+      kdePackages.partitionmanager
+      kdePackages.filelight
+      kdePackages.plasma-disks
+      kdePackages.kalk
+      krusader
+      ktimetracker
+      kdiff3
+    ];
+  };
 
   services = {
     desktopManager.plasma6.enable = true;
@@ -34,4 +49,11 @@
 
     libinput.enable = true;
   };
+
+  programs = {
+    ssh = {
+      startAgent = true;
+      askPassword = pkgs.lib.mkForce "${pkgs.kdePackages.ksshaskpass}/bin/ksshaskpass";
+    };
+  };
 }
diff --git a/configs/user-gui.nix b/configs/user-gui.nix
index 81e5e00..942f228 100755
--- a/configs/user-gui.nix
+++ b/configs/user-gui.nix
@@ -69,11 +69,11 @@ in {
 
   environment.systemPackages = with unstable.pkgs; [
     alacritty
-    baobab
+    # baobab
+    # gparted
     czkawka # fslint before
     # discord
     # espeak-ng
-    gparted
     grsync
     handbrake
     insomnia
diff --git a/configs/user.nix b/configs/user.nix
index b58273c..2190207 100755
--- a/configs/user.nix
+++ b/configs/user.nix
@@ -95,31 +95,31 @@ in {
         forwardAgent = true;
 
         matchBlocks."szczepan.ski" = { hostname = "szczepan.ski"; };
-        matchBlocks."mini" = { hostname = "10.100.0.3"; };
-        matchBlocks."thinkpad" = { hostname = "10.100.0.8"; };
-        matchBlocks."pi" = { hostname = "10.100.0.6"; };
-        matchBlocks."vps2" = { hostname = "10.100.0.50"; };
-        matchBlocks."vps3" = { hostname = "10.100.0.100"; };
-        matchBlocks."router" = {
-          hostname = "192.168.1.1";
-          user = "root";
-          localForwards = [{
-            bind.address = "127.0.0.1";
-            bind.port = 1337;
-            host.address = "127.0.0.1";
-            host.port = 80;
-          }];
-        };
+        matchBlocks."mini" = { hostname = "mini"; };
+        matchBlocks."thinkpad" = { hostname = "thinkpad"; };
+        # matchBlocks."pi" = { hostname = "10.100.0.6"; };
+        # matchBlocks."vps2" = { hostname = "10.100.0.50"; };
+        # matchBlocks."vps3" = { hostname = "10.100.0.100"; };
+        # matchBlocks."router" = {
+        #   hostname = "192.168.1.1";
+        #   user = "root";
+        #   localForwards = [{
+        #     bind.address = "127.0.0.1";
+        #     bind.port = 1337;
+        #     host.address = "127.0.0.1";
+        #     host.port = 80;
+        #   }];
+        # };
 
-        matchBlocks."homeserver" = {
-          hostname = "192.168.0.100";
-          localForwards = [{
-            bind.address = "127.0.0.1";
-            bind.port = 8385;
-            host.address = "127.0.0.1";
-            host.port = 8384;
-          }];
-        };
+        # matchBlocks."homeserver" = {
+        #   hostname = "192.168.0.100";
+        #   localForwards = [{
+        #     bind.address = "127.0.0.1";
+        #     bind.port = 8385;
+        #     host.address = "127.0.0.1";
+        #     host.port = 8384;
+        #   }];
+        # };
       };
 
       git = {
diff --git a/machine/framework.nix b/machine/framework.nix
index 5008e10..8fafeb4 100755
--- a/machine/framework.nix
+++ b/machine/framework.nix
@@ -27,7 +27,6 @@ in
       systemd-boot.enable = true;
       efi = { canTouchEfiVariables = true; };
     };
-    plymouth.enable = true;
   };
 
   nixpkgs.config = {
@@ -48,20 +47,20 @@ in
 
   networking = {
     hostName = "framework";
-    wireguard.interfaces = {
-      wg0 = {
-        ips = [ "10.100.0.7/24" ];
-        privateKey = secrets.wireguard-framework-private;
+    # wireguard.interfaces = {
+    #   wg0 = {
+    #     ips = [ "10.100.0.7/24" ];
+    #     privateKey = secrets.wireguard-framework-private;
 
-        peers = [{
-          publicKey = wireguard.wireguard-vps-public;
-          presharedKey = secrets.wireguard-preshared;
-          allowedIPs = [ "10.100.0.0/24" ];
-          endpoint = "old.szczepan.ski:51820";
-          persistentKeepalive = 25;
-        }];
-      };
-    };
+    #     peers = [{
+    #       publicKey = wireguard.wireguard-vps-public;
+    #       presharedKey = secrets.wireguard-preshared;
+    #       allowedIPs = [ "10.100.0.0/24" ];
+    #       endpoint = "old.szczepan.ski:51820";
+    #       persistentKeepalive = 25;
+    #     }];
+    #   };
+    # };
   };
 
   time.timeZone = "Europe/Berlin";
@@ -87,6 +86,7 @@ in
   security.rtkit.enable = true;
   # rtkit is optional but recommended
   services = {
+    # foldingathome.enable = true;
     power-profiles-daemon.enable = true;
     colord.enable = true;
 
@@ -170,8 +170,6 @@ in
   # systemd.services.nix-daemon.serviceConfig.LimitNOFILE = 40960;
 
   environment.systemPackages = with unstable.pkgs; [
-    # rustdesk
-    # cinnamon.warpinator
     psensor
     veracrypt
     gnumake
@@ -179,11 +177,15 @@ in
     libftdi
     libusb1
     gcc
-    # coreboot-toolchain.arm
     intel-gpu-tools
     msr-tools
     quota
+    mergerfs
+    snapraid
+    gparted
     homebank
+    # fahviewer
+    # fahcontrol
     (import ("/home/alex/Workspace/fw-ectool/default.nix"))
   ];