diff --git a/flake.lock b/flake.lock
index 334ef17..0b290ad 100644
--- a/flake.lock
+++ b/flake.lock
@@ -121,11 +121,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1709904018,
-        "narHash": "sha256-fVp/89wNjWg7OQ/Gj3eSK2IXKDk9mXSj5ltOz98Ce2w=",
+        "lastModified": 1710532761,
+        "narHash": "sha256-SUXGZNrXX05YA9G6EmgupxhOr3swI1gcxLUeDMUhrEY=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "8b07ca541939211d3cc437ddfd74ebdef3d72471",
+        "rev": "206f457fffdb9a73596a4cb2211a471bd305243d",
         "type": "github"
       },
       "original": {
@@ -177,11 +177,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1709410583,
-        "narHash": "sha256-esOSUoQ7mblwcsSea0K17McZuwAIjoS6dq/4b83+lvw=",
+        "lastModified": 1710622004,
+        "narHash": "sha256-6zR642tXcZzzk3C8BHxlCrR0yh8z8zMXLiuXpWDIpX0=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "59e37017b9ed31dee303dbbd4531c594df95cfbc",
+        "rev": "968952f950a59dee9ed1e8799dda38c6dfa1bad3",
         "type": "github"
       },
       "original": {
@@ -200,11 +200,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1709892121,
-        "narHash": "sha256-JV1F/ZGwgutBCvTDeQuG/UxreU9/B1J4EoTmZm1XLpI=",
+        "lastModified": 1710519878,
+        "narHash": "sha256-0dbc10OBFUVYyXC+C+N6vRUd8xyBSRxkcZ4Egipbx0M=",
         "owner": "nix-community",
         "repo": "NixOS-WSL",
-        "rev": "b8db5fddf63be77204290074930560f4a1fff5a6",
+        "rev": "aef95bdb6800a3a2af7aa7083d6df03067da6592",
         "type": "github"
       },
       "original": {
@@ -246,11 +246,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1709703039,
-        "narHash": "sha256-6hqgQ8OK6gsMu1VtcGKBxKQInRLHtzulDo9Z5jxHEFY=",
+        "lastModified": 1710451336,
+        "narHash": "sha256-pP86Pcfu3BrAvRO7R64x7hs+GaQrjFes+mEPowCfkxY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "9df3e30ce24fd28c7b3e2de0d986769db5d6225d",
+        "rev": "d691274a972b3165335d261cc4671335f5c67de9",
         "type": "github"
       },
       "original": {
@@ -261,11 +261,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1709677081,
-        "narHash": "sha256-tix36Y7u0rkn6mTm0lA45b45oab2cFLqAzDbJxeXS+c=",
+        "lastModified": 1710565619,
+        "narHash": "sha256-xu/EnZCNdIj7m/QjCNIG5vrCA4TYg5uwFReb9XDxET0=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "880992dcc006a5e00dd0591446fdf723e6a51a64",
+        "rev": "8ac30a39abc5ea67037dfbf090d6e89f187c6e50",
         "type": "github"
       },
       "original": {
diff --git a/home-manager/nvim.nix b/home-manager/nvim.nix
index 4468743..9c03d72 100644
--- a/home-manager/nvim.nix
+++ b/home-manager/nvim.nix
@@ -10,7 +10,6 @@
       enable = true;
       defaultEditor = true;
       extraPackages = with pkgs; [
-        rnix-lsp
         gcc
         ripgrep
         fd
diff --git a/home-manager/themes/yorha/colors.nix b/home-manager/themes/yorha/colors.nix
index 7c5e344..445a70a 100644
--- a/home-manager/themes/yorha/colors.nix
+++ b/home-manager/themes/yorha/colors.nix
@@ -2,7 +2,7 @@
     slug = "yorha";
     name = "yorha";
     author = "flick0 (https://github.com/flick0)";
-    colors = {
+    palette = {
       base00 = "#1e1d1c";
       base01 = "#A39D8F";
       base02 = "#AFA899";
diff --git a/home-manager/zsh.nix b/home-manager/zsh.nix
index 079d2d0..1ad342a 100644
--- a/home-manager/zsh.nix
+++ b/home-manager/zsh.nix
@@ -3,7 +3,7 @@
     programs.zsh = {
       enable = true;
       enableCompletion = true;
-      enableAutosuggestions = true;
+      autosuggestion.enable = true;
       shellAliases = {
           ll = "ls -l";
           update = "sudo nixos-rebuild switch";
diff --git a/modules/gpg.nix b/modules/gpg.nix
index ebd5617..0643c4d 100644
--- a/modules/gpg.nix
+++ b/modules/gpg.nix
@@ -5,7 +5,7 @@
   programs.gnupg.agent = {
     enable = true;
     enableSSHSupport = true;
-    pinentryFlavor = "qt";
+    #pinentryFlavor = "qt";
   };
   #environment.systemPackages = with pkgs; [
   #  pinentry-curses
diff --git a/modules/graphical/plasma.nix b/modules/graphical/plasma.nix
index 16d3033..6dfd7df 100644
--- a/modules/graphical/plasma.nix
+++ b/modules/graphical/plasma.nix
@@ -2,10 +2,10 @@
 
 {
   services.xserver = {
-    layout = "at";
-    xkbVariant = "";
+    xkb.layout = "at";
+    xkb.variant = "";
     enable = true;
     displayManager.sddm.enable = true;
-    desktopManager.plasma6.enable = true;
   };
+  services.desktopManager.plasma6.enable = true;
 }
diff --git a/systems/pc/configuration.nix b/systems/pc/configuration.nix
index c47ef10..1a0a61c 100644
--- a/systems/pc/configuration.nix
+++ b/systems/pc/configuration.nix
@@ -56,8 +56,8 @@
 
   # Configure keymap in X11
   services.xserver = {
-    layout = lib.mkForce "de";
-    xkbVariant = lib.mkForce "us";
+    xkb.layout = lib.mkForce "de";
+    xkb.variant = lib.mkForce "us";
   };
 
   # Configure console keymap