diff --git a/eggs/kde_config/kde.org/UserFeedback.org.kde.discover.conf b/eggs/kde_config/kde.org/UserFeedback.org.kde.discover.conf
deleted file mode 100644
index f0b0ef03..00000000
--- a/eggs/kde_config/kde.org/UserFeedback.org.kde.discover.conf
+++ /dev/null
@@ -1,31 +0,0 @@
-[Source-applicationSourceName]
-dataSourceCommonSettings\activeState=true
-
-[Source-applicationVersion]
-dataSourceCommonSettings\activeState=true
-
-[Source-locale]
-dataSourceCommonSettings\activeState=true
-
-[Source-opengl]
-dataSourceCommonSettings\activeState=true
-
-[Source-platform]
-dataSourceCommonSettings\activeState=true
-
-[Source-qtVersion]
-dataSourceCommonSettings\activeState=true
-
-[Source-screens]
-dataSourceCommonSettings\activeState=true
-
-[Source-startCount]
-dataSourceCommonSettings\activeState=true
-
-[Source-usageTime]
-dataSourceCommonSettings\activeState=true
-
-[UserFeedback]
-ApplicationStartCount=63
-ApplicationTime=53391
-LastEncouragement=@DateTime(\0\0\0\x10\0\0\0\0\0\0%\x8c\x93\x4\xe2\b\xba\0)
diff --git a/eggs/kde_config/kde.org/UserFeedback.org.kde.systemsettings.conf b/eggs/kde_config/kde.org/UserFeedback.org.kde.systemsettings.conf
deleted file mode 100644
index e536f93f..00000000
--- a/eggs/kde_config/kde.org/UserFeedback.org.kde.systemsettings.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-[UserFeedback]
-ApplicationStartCount=2
diff --git a/eggs/kde_config/kdeglobals b/eggs/kde_config/kdeglobals
index 5c8e42ad..6ea967db 100644
--- a/eggs/kde_config/kdeglobals
+++ b/eggs/kde_config/kdeglobals
@@ -130,9 +130,6 @@ Allow Expansion=false
 Automatically select filename extension=true
 Breadcrumb Navigation=false
 Decoration position=2
-LocationCombo Completionmode=5
-PathCombo Completionmode=5
-Show Bookmarks=false
 Show Full Path=false
 Show Inline Previews=true
 Show Preview=false
diff --git a/eggs/kde_config/xsettingsd/xsettingsd.conf b/eggs/kde_config/xsettingsd/xsettingsd.conf
index 1b84324d..63e22f36 100644
--- a/eggs/kde_config/xsettingsd/xsettingsd.conf
+++ b/eggs/kde_config/xsettingsd/xsettingsd.conf
@@ -8,8 +8,8 @@ Gtk/PrimaryButtonWarpsSlider 1
 Gtk/ToolbarStyle 3
 Gtk/MenuImages 1
 Gtk/ButtonImages 1
-Gtk/CursorThemeSize 30
-Gtk/CursorThemeName "catppuccin-frappe-mauve-cursors"
+Gtk/CursorThemeSize 22
+Gtk/CursorThemeName "catppuccin-frappe-blue-cursors"
 Net/SoundThemeName "ocean"
 Net/IconThemeName "breeze-dark"
 Gtk/FontName "Noto Sans,  10"
diff --git a/eggs/kde_locals/kwalletd/kdewallet.kwl b/eggs/kde_locals/kwalletd/kdewallet.kwl
index 63d0c8e7..07a0f91f 100644
Binary files a/eggs/kde_locals/kwalletd/kdewallet.kwl and b/eggs/kde_locals/kwalletd/kdewallet.kwl differ
diff --git a/eggs/kde_locals/kwalletd/kdewallet_attributes.json b/eggs/kde_locals/kwalletd/kdewallet_attributes.json
index e4917a39..3909a89e 100644
--- a/eggs/kde_locals/kwalletd/kdewallet_attributes.json
+++ b/eggs/kde_locals/kwalletd/kdewallet_attributes.json
@@ -1,6 +1,6 @@
 {
     "$fdo_created": "1748649994",
-    "$fdo_modified": "1779069606",
+    "$fdo_modified": "1779184521",
     "Chromium Keys/Chromium Safe Storage": {
         "$fdo_created": "1748704742",
         "$fdo_mime_type": "text/plain",
@@ -233,9 +233,9 @@
         }
     },
     "Nextcloud/someone:https://nextcloud.urmel.de/:0": {
-        "$fdo_created": "1769591673",
+        "$fdo_created": "1779184467",
         "$fdo_mime_type": "text/plain",
-        "$fdo_modified": "1769591673",
+        "$fdo_modified": "1779184467",
         "attributes": {
             "server": "Nextcloud",
             "type": "plaintext",
@@ -255,9 +255,9 @@
         }
     },
     "Nextcloud/someone_app-password:https://nextcloud.urmel.de/:0": {
-        "$fdo_created": "1779069179",
+        "$fdo_created": "1779184521",
         "$fdo_mime_type": "text/plain",
-        "$fdo_modified": "1779069179",
+        "$fdo_modified": "1779184521",
         "attributes": {
             "server": "Nextcloud",
             "type": "base64",
diff --git a/eggs/theme/gtk3/settings.ini b/eggs/theme/gtk3/settings.ini
index dd326e54..da55b581 100755
--- a/eggs/theme/gtk3/settings.ini
+++ b/eggs/theme/gtk3/settings.ini
@@ -3,8 +3,8 @@ gtk-application-prefer-dark-theme=true
 gtk-button-images=true
 gtk-cursor-blink=true
 gtk-cursor-blink-time=1000
-gtk-cursor-theme-name=catppuccin-frappe-mauve-cursors
-gtk-cursor-theme-size=24
+gtk-cursor-theme-name=catppuccin-frappe-blue-cursors
+gtk-cursor-theme-size=18
 gtk-decoration-layout=icon:minimize,maximize,close
 gtk-enable-animations=true
 gtk-enable-event-sounds=1
diff --git a/eggs/theme/gtk4/settings.ini b/eggs/theme/gtk4/settings.ini
index 9274a4d8..c9106706 100644
--- a/eggs/theme/gtk4/settings.ini
+++ b/eggs/theme/gtk4/settings.ini
@@ -2,8 +2,8 @@
 gtk-application-prefer-dark-theme=true
 gtk-cursor-blink=true
 gtk-cursor-blink-time=1000
-gtk-cursor-theme-name=catppuccin-frappe-mauve-cursors
-gtk-cursor-theme-size=24
+gtk-cursor-theme-name=catppuccin-frappe-blue-cursors
+gtk-cursor-theme-size=18
 gtk-decoration-layout=icon:minimize,maximize,close
 gtk-enable-animations=true
 gtk-font-name=Noto Sans,  10
diff --git a/root-conf/nixos/nixLap/configuration.nix b/root-conf/nixos/nixLap/configuration.nix
index 61131b85..c5f0ad22 100644
--- a/root-conf/nixos/nixLap/configuration.nix
+++ b/root-conf/nixos/nixLap/configuration.nix
@@ -4,12 +4,12 @@
 
 { config, pkgs, pkgs-unstable, ... }:
 
-let 
+let
   optionalPkgs = import ../optional-packages.nix { inherit pkgs; };
 in
 {
   imports =
-    [ 
+    [
       ./hardware-configuration.nix
       ../shared-conf.nix
     ];
@@ -17,20 +17,13 @@ in
   # Bootloader.
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
+  boot.initrd.availableKernelModules = [
+      "aesni_intel"
+      "cryptd"
+    ];
 
-  services.flatpak.enable = true;
+  networking.hostName = "nixLap";
 
-  networking.hostName = "nixLap"; # Define your hostname.
-  
-
-  # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
-
-  # Configure network proxy if necessary
-  # networking.proxy.default = "http://user:password@proxy:port/";
-  # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
-
-
-  boot.resumeDevice = "/dev/disk/by-uuid/3cdc496b-6116-4f3a-a73e-3afd3cf742ff";
   powerManagement.enable = true;
   services.power-profiles-daemon.enable = true;
   # Suspend first then hibernate when closing the lid
@@ -39,8 +32,11 @@ in
   services.logind.settings.Login.powerKey = "hibernate";
   services.logind.settings.Login.powerKeyLongPress = "poweroff";
 
-  # Suspend first
-  boot.kernelParams = ["mem_sleep_default=freeze" "resume_offset=0"];
+  # Hibernation
+  boot.resumeDevice = "/dev/disk/by-label/swap";
+  # resume offset from: filefrag -v /swapfile # under 0. physical offset
+  boot.kernelParams = ["mem_sleep_default=freeze" "resume_offset=0" ];
+
 
   # Define time delay for hibernation
   systemd.sleep.extraConfig = ''
@@ -48,8 +44,6 @@ in
     SuspendState=mem
   '';
 
-
-
   # Start the driver at boot
   systemd.services.fprintd = {
     wantedBy = [ "multi-user.target" ];
@@ -66,8 +60,9 @@ in
   };
   # for 32 Bit
   programs.steam.enable = true;
-  
+
   virtualisation.containers.enable = true;
+  services.flatpak.enable = true;
   virtualisation = {
     podman = {
       enable = true;
@@ -85,30 +80,23 @@ in
   services.xserver.enable = true;
 
   # Enable the KDE Plasma Desktop Environment.
-  services.displayManager.sddm = {
-    enable = true;
-    theme = "catppuccin-frappe-mauve";
-    wayland = {
-      enable = true;
-      compositor = "kwin";
-    };
+  # https://wiki.nixos.org/wiki/KDE#Unlock_KDE_Wallet_with_LUKS_password
 
-  };
-  security = {
-    # If enabled, pam_wallet will attempt to automatically unlock the user’s default KDE wallet upon login.
-    # If the user has no wallet named “kdewallet”, or the login password does not match their wallet password,
-    # KDE will prompt separately after login.
-    pam = {
-      services = {
-        someone = {
-          kwallet = {
-            enable = true;
-            package = pkgs.kdePackages.kwallet-pam;
-          };
+  services.displayManager = {
+    autoLogin = {
+        enable = true;
+        user = "someone";
+      };
+      sddm = {
+        enable = true;
+        theme = "catppuccin-frappe-mauve";
+        wayland = {
+          enable = true;
+          compositor = "kwin";
         };
       };
-    };
   };
+
   services.desktopManager.plasma6.enable = true;
 
   # Configure keymap in X11
@@ -171,25 +159,6 @@ in
     imagemagick
     docker-compose
   ] ++ optionalPkgs;
-  # Some programs need SUID wrappers, can be configured further or are
-  # started in user sessions.
-  # programs.mtr.enable = true;
-  # programs.gnupg.agent = {
-  #   enable = true;
-  #   enableSSHSupport = true;
-  # };
-
-  # List services that you want to enable:
-
-  # Enable the OpenSSH daemon.
-  # services.openssh.enable = true;
-
-  # Open ports in the firewall.
-  # networking.firewall.allowedTCPPorts = [ ... ];
-  # networking.firewall.allowedUDPPorts = [ ... ];
-  # Or disable the firewall altogether.
-  # networking.firewall.enable = false;
-
   # This value determines the NixOS release from which the default
   # settings for stateful data, like file locations and database versions
   # on your system were taken. It‘s perfectly fine and recommended to leave
diff --git a/root-conf/nixos/nixLap/hardware-configuration.nix b/root-conf/nixos/nixLap/hardware-configuration.nix
index d42950df..de3695c5 100644
--- a/root-conf/nixos/nixLap/hardware-configuration.nix
+++ b/root-conf/nixos/nixLap/hardware-configuration.nix
@@ -8,7 +8,7 @@
     [ (modulesPath + "/installer/scan/not-detected.nix")
     ];
 
-  boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "vmd" "nvme" "usb_storage" "sd_mod" ];
+  boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "vmd" "nvme" ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
@@ -26,7 +26,16 @@
       options = [ "fmask=0022" "dmask=0022" ];
     };
 
-  swapDevices = [ ];
+
+    swapDevices = [{
+      device = "/dev/disk/by-label/swap";
+      encrypted = {
+        enable = true;
+        label = "swap";
+        blkDev = "/dev/disk/by-label/cryptoswap";
+      };
+    }];
+
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   #hardware.cpu.intel.npu.enable = true;