diff --git a/flake.lock b/flake.lock
index d593b61..19100d9 100644
--- a/flake.lock
+++ b/flake.lock
@@ -121,11 +121,11 @@
     "flake-compat_3": {
       "flake": false,
       "locked": {
-        "lastModified": 1668681692,
-        "narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=",
+        "lastModified": 1696426674,
+        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
         "owner": "edolstra",
         "repo": "flake-compat",
-        "rev": "009399224d5e398d03b22badca40a37ac85412a1",
+        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
         "type": "github"
       },
       "original": {
@@ -218,16 +218,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1717476296,
-        "narHash": "sha256-ScHe38Tr+TxGURC17kby4mIIxOG3aJvZWXzPM79UnEk=",
+        "lastModified": 1717527182,
+        "narHash": "sha256-vWSkg6AMok1UUQiSYVdGMOXKD2cDFnajITiSi0Zjd1A=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "095ef64aa3b2ab4a4f1bf07f29997e21e3a5576a",
+        "rev": "845a5c4c073f74105022533907703441e0464bc3",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-23.11",
+        "ref": "release-24.05",
         "repo": "home-manager",
         "type": "github"
       }
@@ -321,33 +321,18 @@
         "type": "github"
       }
     },
-    "nixpkgs-22_11": {
+    "nixpkgs-24_05": {
       "locked": {
-        "lastModified": 1669558522,
-        "narHash": "sha256-yqxn+wOiPqe6cxzOo4leeJOp1bXE/fjPEi/3F/bBHv8=",
+        "lastModified": 1717144377,
+        "narHash": "sha256-F/TKWETwB5RaR8owkPPi+SPJh83AQsm6KrQAlJ8v/uA=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "ce5fe99df1f15a09a91a86be9738d68fadfbad82",
+        "rev": "805a384895c696f802a9bf5bf4720f37385df547",
         "type": "github"
       },
       "original": {
         "id": "nixpkgs",
-        "ref": "nixos-22.11",
-        "type": "indirect"
-      }
-    },
-    "nixpkgs-23_05": {
-      "locked": {
-        "lastModified": 1684782344,
-        "narHash": "sha256-SHN8hPYYSX0thDrMLMWPWYulK3YFgASOrCsIL3AJ78g=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "8966c43feba2c701ed624302b6a935f97bcbdf88",
-        "type": "github"
-      },
-      "original": {
-        "id": "nixpkgs",
-        "ref": "nixos-23.05",
+        "ref": "nixos-24.05",
         "type": "indirect"
       }
     },
@@ -453,21 +438,20 @@
         "nixpkgs": [
           "nixpkgs"
         ],
-        "nixpkgs-22_11": "nixpkgs-22_11",
-        "nixpkgs-23_05": "nixpkgs-23_05",
+        "nixpkgs-24_05": "nixpkgs-24_05",
         "utils": "utils"
       },
       "locked": {
-        "lastModified": 1687462267,
-        "narHash": "sha256-rNSputjn/0HEHHnsKfQ8mQVEPVchcBw7DsbND7Wg8dk=",
+        "lastModified": 1717834029,
+        "narHash": "sha256-woG0M/WIrYDQeYd+aXRvGGMyojLmXND04Pi9XqE7ZxU=",
         "owner": "simple-nixos-mailserver",
         "repo": "nixos-mailserver",
-        "rev": "24128c3052090311688b09a400aa408ba61c6ee5",
+        "rev": "62afb98ef6385bcb745d7b189ef4efdce2044030",
         "type": "gitlab"
       },
       "original": {
         "owner": "simple-nixos-mailserver",
-        "ref": "nixos-23.05",
+        "ref": "nixos-24.05",
         "repo": "nixos-mailserver",
         "type": "gitlab"
       }
@@ -524,13 +508,31 @@
         "type": "github"
       }
     },
-    "utils": {
+    "systems_3": {
       "locked": {
-        "lastModified": 1605370193,
-        "narHash": "sha256-YyMTf3URDL/otKdKgtoMChu4vfVL3vCMkRqpGifhUn0=",
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "utils": {
+      "inputs": {
+        "systems": "systems_3"
+      },
+      "locked": {
+        "lastModified": 1709126324,
+        "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "5021eac20303a61fafe17224c087f5519baed54d",
+        "rev": "d465f4819400de7c8d874d50b982301f28a84605",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 5a9410b..341922c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,7 +2,7 @@
   description = "Flake to define configurations of 'elss' - ellmauthaler stefan's systems";
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
     nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
 
     #nix = {
@@ -14,7 +14,7 @@
     nixos-hardware = {url = "github:NixOS/nixos-hardware/master";};
 
     home-manager = {
-      url = "github:nix-community/home-manager/release-23.11";
+      url = "github:nix-community/home-manager/release-24.05";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
@@ -26,7 +26,7 @@
     };
 
     simple-nixos-mailserver = {
-      url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-23.05";
+      url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-24.05";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
diff --git a/modules/base.nix b/modules/base.nix
index 4781ba9..9ccd595 100644
--- a/modules/base.nix
+++ b/modules/base.nix
@@ -55,7 +55,7 @@ with lib; {
       htop
       neofetch
       nix-prefetch-github
-      nixfmt
+      nixfmt-rfc-style
       nixpkgs-fmt
       procs
       ripgrep
diff --git a/modules/graphical.nix b/modules/graphical.nix
index 1a97715..542618a 100644
--- a/modules/graphical.nix
+++ b/modules/graphical.nix
@@ -73,8 +73,10 @@ with lib; {
               ${pkgs.autorandr}/bin/autorandr -c
             '';
           };
-          layout = "us";
-          xkbOptions = "eurosign:e";
+          xkb = {
+            options = "eurosign:e";
+            layout = "us";
+          };
         };
         gnome.gnome-keyring.enable = true;
         udisks2.enable = true;
diff --git a/modules/plasma.nix b/modules/plasma.nix
index beafa8f..521a36f 100644
--- a/modules/plasma.nix
+++ b/modules/plasma.nix
@@ -16,13 +16,15 @@ with lib; {
         pulse.enable = true;
       };
 
-      services.xserver = {
-        enable = true;
+      services = {
+        xserver = {
+          enable = true;
+          desktopManager.plasma5.enable = true;
+        };
         displayManager = {
           sddm.wayland.enable = true;
           defaultSession = "plasmawayland";
         };
-        desktopManager.plasma5.enable = true;
       };
 
       services.gnome.gnome-keyring.enable = true;
diff --git a/modules/server/nextcloud.nix b/modules/server/nextcloud.nix
index da60984..3d83ade 100644
--- a/modules/server/nextcloud.nix
+++ b/modules/server/nextcloud.nix
@@ -22,7 +22,9 @@ with lib; {
           adminuser = "storemin";
           adminpassFile = config.sops.secrets.storemin.path;
           dbhost = "/run/postgresql";
-          defaultPhoneRegion = "DE";
+        };
+        settings = {
+          default_phone_region = "DE";
         };
       };
 
diff --git a/modules/xmonad.nix b/modules/xmonad.nix
index 00230b7..27b7b25 100644
--- a/modules/xmonad.nix
+++ b/modules/xmonad.nix
@@ -21,11 +21,11 @@ with lib; {
             enable = true;
             enableContribAndExtras = true;
           };
-          displayManager.defaultSession = "none+xmonad";
-          libinput = {
-            enable = true;
-            touchpad = {disableWhileTyping = true;};
-          };
+        };
+        displayManager.defaultSession = "none+xmonad";
+        libinput = {
+          enable = true;
+          touchpad = {disableWhileTyping = true;};
         };
         upower.enable = true;
 
diff --git a/users/ellmau/zsh.nix b/users/ellmau/zsh.nix
index ffcd8e9..c50c0fe 100644
--- a/users/ellmau/zsh.nix
+++ b/users/ellmau/zsh.nix
@@ -53,7 +53,6 @@
 
     eza = {
       enable = true;
-      enableAliases = false;
     };
 
     tmux = {