diff --git a/flake.lock b/flake.lock
index 444b2d9..106a261 100644
--- a/flake.lock
+++ b/flake.lock
@@ -3,9 +3,7 @@
     "course-management": {
       "inputs": {
         "flake-utils": "flake-utils",
-        "nixpkgs": [
-          "nixpkgs"
-        ],
+        "nixpkgs": "nixpkgs",
         "poetry2nix": "poetry2nix"
       },
       "locked": {
@@ -179,11 +177,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1732519917,
-        "narHash": "sha256-AGXhwHdJV0q/WNgqwrR2zriubLr785b02FphaBtyt1Q=",
+        "lastModified": 1733629314,
+        "narHash": "sha256-U0vivjQFAwjNDYt49Krevs1murX9hKBFe2Ye0cHpgbU=",
         "owner": "nix-community",
         "repo": "nix-index-database",
-        "rev": "f4a5ca5771ba9ca31ad24a62c8d511a405303436",
+        "rev": "f1e477a7dd11e27e7f98b646349cd66bbabf2fb8",
         "type": "github"
       },
       "original": {
@@ -201,11 +199,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1732688645,
-        "narHash": "sha256-SQBVnfTAhVmNs5mKjoe942GykhAh9RQbcqScK9XlsWM=",
+        "lastModified": 1733968549,
+        "narHash": "sha256-r18fyuignDxOTgmgSRAvR2XRvdwoZOtPxqgRBuafqFQ=",
         "owner": "Infinidoge",
         "repo": "nix-minecraft",
-        "rev": "6adec7f87f6c1d455f89f57bd697740bd6dc88fa",
+        "rev": "8f4795cc29b2a1e62e0d1856d9f7dcf219829748",
         "type": "github"
       },
       "original": {
@@ -216,21 +214,37 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1732632634,
-        "narHash": "sha256-+G7n/ZD635aN0sEXQLynU7pWMd3PKDM7yBIXvYmjABQ=",
+        "lastModified": 1730531603,
+        "narHash": "sha256-Dqg6si5CqIzm87sp57j5nTaeBbWhHFaVyG7V6L8k3lY=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "6f6076c37180ea3a916f84928cf3a714c5207a30",
+        "rev": "7ffd9ae656aec493492b44d0ddfb28e79a1ea25d",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-24.05",
+        "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1733808091,
+        "narHash": "sha256-KWwINTQelKOoQgrXftxoqxmKFZb9pLVfnRvK270nkVk=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "a0f3e10d94359665dba45b71b4227b0aeb851f8e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-24.11",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_3": {
       "locked": {
         "lastModified": 1682134069,
         "narHash": "sha256-TnI/ZXSmRxQDt2sjRYK/8j8iha4B4zP2cnQCZZ3vp7k=",
@@ -296,7 +310,7 @@
         "kpp": "kpp",
         "nix-index-database": "nix-index-database",
         "nix-minecraft": "nix-minecraft",
-        "nixpkgs": "nixpkgs",
+        "nixpkgs": "nixpkgs_2",
         "print-interface": "print-interface",
         "sops-nix": "sops-nix",
         "vscode-server": "vscode-server"
@@ -309,11 +323,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1732575825,
-        "narHash": "sha256-xtt95+c7OUMoqZf4OvA/7AemiH3aVuWHQbErYQoPwFk=",
+        "lastModified": 1733965552,
+        "narHash": "sha256-GZ4YtqkfyTjJFVCub5yAFWsHknG1nS/zfk7MuHht4Fs=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "3433ea14fbd9e6671d0ff0dd45ed15ee4c156ffa",
+        "rev": "2d73fc6ac4eba4b9a83d3cb8275096fbb7ab4004",
         "type": "github"
       },
       "original": {
@@ -421,7 +435,7 @@
     "vscode-server": {
       "inputs": {
         "flake-utils": "flake-utils_4",
-        "nixpkgs": "nixpkgs_2"
+        "nixpkgs": "nixpkgs_3"
       },
       "locked": {
         "lastModified": 1729422940,
diff --git a/flake.nix b/flake.nix
index 857971a..b03d207 100755
--- a/flake.nix
+++ b/flake.nix
@@ -1,6 +1,6 @@
 {
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
     sops-nix.url = "github:Mic92/sops-nix";
     sops-nix.inputs.nixpkgs.follows = "nixpkgs";
     nix-index-database.url = "github:nix-community/nix-index-database";
@@ -17,7 +17,7 @@
 
     course-management = {
       url = "github:fsr/course-management";
-      inputs.nixpkgs.follows = "nixpkgs";
+      # inputs.nixpkgs.follows = "nixpkgs";
     };
     nix-minecraft.url = "github:Infinidoge/nix-minecraft";
     nix-minecraft.inputs.nixpkgs.follows = "nixpkgs";
diff --git a/hosts/quitte/network.nix b/hosts/quitte/network.nix
index 84d2cc9..5559b2f 100644
--- a/hosts/quitte/network.nix
+++ b/hosts/quitte/network.nix
@@ -38,10 +38,10 @@
       ];
       routes = [
         {
-          routeConfig.Gateway = "141.30.30.193";
+          Gateway = "141.30.30.193";
         }
         {
-          routeConfig.Gateway = "fe80::7a24:59ff:fe5e:6e2f";
+          Gateway = "fe80::7a24:59ff:fe5e:6e2f";
         }
       ];
       networkConfig = {
diff --git a/hosts/tomate/configuration.nix b/hosts/tomate/configuration.nix
index 8058b04..dffdcea 100644
--- a/hosts/tomate/configuration.nix
+++ b/hosts/tomate/configuration.nix
@@ -106,7 +106,6 @@
   };
 
   # Enable sound with pipewire.
-  sound.enable = true;
   hardware.pulseaudio.enable = false;
   security.rtkit.enable = true;
   services.pipewire = {
diff --git a/hosts/tomate/network.nix b/hosts/tomate/network.nix
index 32e98ca..dd04916 100644
--- a/hosts/tomate/network.nix
+++ b/hosts/tomate/network.nix
@@ -27,7 +27,7 @@
       address = [ "141.30.86.196/26" ];
       routes = [
         {
-          routeConfig.Gateway = "141.30.86.193";
+          Gateway = "141.30.86.193";
         }
       ];
       networkConfig = {
diff --git a/modules/core/base.nix b/modules/core/base.nix
index 996bae4..b86ccf4 100755
--- a/modules/core/base.nix
+++ b/modules/core/base.nix
@@ -73,6 +73,7 @@
   time.timeZone = "Europe/Berlin";
 
   # basic shell & editor
+  programs.vim.enable = true;
   programs.vim.defaultEditor = true;
 
   # List packages installed in system profile. To search, run:
diff --git a/modules/keycloak/default.nix b/modules/keycloak/default.nix
index 398c851..6aa1afb 100644
--- a/modules/keycloak/default.nix
+++ b/modules/keycloak/default.nix
@@ -12,7 +12,9 @@ in
       http-port = 8086;
       https-port = 19000;
       hostname = domain;
-      proxy = "edge";
+      proxy-headers = "xforwarded";
+      http-enabled = true;
+      hostname-strict-https = false;
     };
     # The module requires a password for the DB and works best with its own DB config
     # Does an automatic Postgresql configuration
diff --git a/modules/minecraft/default.nix b/modules/minecraft/default.nix
index 4f7e261..aed370b 100644
--- a/modules/minecraft/default.nix
+++ b/modules/minecraft/default.nix
@@ -12,13 +12,6 @@
       jvmOpts = "-Xmx8192M -Xms8192M";
     };
   };
-  services.bluemap = {
-    enable = true;
-    host = "map.mc.ifsr.de";
-    eula = true;
-    onCalendar = "hourly";
-    defaultWorld = "/srv/minecraft/ifsr/world";
-  };
   services.nginx.virtualHosts."map.mc.ifsr.de".extraConfig = ''
     allow 141.30.0.0/16;
     allow 141.76.0.0/16;
diff --git a/modules/nextcloud.nix b/modules/nextcloud.nix
index 5688d47..b2557cc 100644
--- a/modules/nextcloud.nix
+++ b/modules/nextcloud.nix
@@ -15,7 +15,7 @@ in
     nextcloud = {
       enable = true;
       configureRedis = true;
-      package = pkgs.nextcloud29;
+      package = pkgs.nextcloud30;
       hostName = domain;
       https = true; # Use https for all urls
       phpExtraExtensions = all: [