diff --git a/flake.lock b/flake.lock
index ddc4264..9ca92d4 100644
--- a/flake.lock
+++ b/flake.lock
@@ -236,11 +236,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1693089798,
-        "narHash": "sha256-aNRPXtI7TXCu6rXAQMPdx9nmpWCyCQ7gaKIxOFX8W5I=",
+        "lastModified": 1693293723,
+        "narHash": "sha256-pUw9KoWq9S0Cv9EIm601s0xh1zqcxs57JJtPzGrhFAU=",
         "owner": "helix-editor",
         "repo": "helix",
-        "rev": "aeaeb09f486c2bc7f8c563bceece03a0954576b9",
+        "rev": "40d7e6c9c85d4f1ce2345f6e9d59fc091243124d",
         "type": "github"
       },
       "original": {
@@ -255,11 +255,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1693108765,
-        "narHash": "sha256-U1btmyF7SMX+y80EXYva5Xj6lpn20xPbHbuoe/2bSIw=",
+        "lastModified": 1693187908,
+        "narHash": "sha256-cTcNpsqi1llmUFl9bmCdD0mTyfjhBrNFPhu2W12WXzA=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "9706fb8e441a7c56c68bb079480938ed505e8102",
+        "rev": "8bde7a651b94ba30bd0baaa9c4a08aae88cc2e92",
         "type": "github"
       },
       "original": {
@@ -448,11 +448,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1693003285,
-        "narHash": "sha256-5nm4yrEHKupjn62MibENtfqlP6pWcRTuSKrMiH9bLkc=",
+        "lastModified": 1693250523,
+        "narHash": "sha256-y3up5gXMTbnCsXrNEB5j+7TVantDLUYyQLu/ueiXuyg=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "5690c4271f2998c304a45c91a0aeb8fb69feaea7",
+        "rev": "3efb0f6f404ec8dae31bdb1a9b17705ce0d6986e",
         "type": "github"
       },
       "original": {
@@ -586,11 +586,11 @@
         "nixpkgs-stable": "nixpkgs-stable_2"
       },
       "locked": {
-        "lastModified": 1693105804,
-        "narHash": "sha256-nlqNjW7dfucUJQqRGuG08MKPOSME8fLOCx/bd9hiEPs=",
+        "lastModified": 1693263624,
+        "narHash": "sha256-GzmVIUKStC1HCzUb0YdGDPAewv4+KxCHKQZEZZDpApY=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "0618c8f0ed5255ad74ee08d1618841ff5af85c86",
+        "rev": "c89ee06488706b587a22085b1844bf9ca6ba5687",
         "type": "github"
       },
       "original": {
diff --git a/hosts/falkenstein-1/default.nix b/hosts/falkenstein-1/default.nix
index c1fe103..213749c 100644
--- a/hosts/falkenstein-1/default.nix
+++ b/hosts/falkenstein-1/default.nix
@@ -25,7 +25,6 @@
       };
       efi.efiSysMountPoint = "/boot/efi";
     };
-    kernelPackages = pkgs.linuxPackages_latest;
     initrd.systemd.enable = true;
   };
   zramSwap.enable = true;
diff --git a/hosts/nuc/default.nix b/hosts/nuc/default.nix
index 0c50949..8836cff 100644
--- a/hosts/nuc/default.nix
+++ b/hosts/nuc/default.nix
@@ -18,7 +18,6 @@
   boot = {
     loader.systemd-boot.enable = true;
     loader.efi.canTouchEfiVariables = true;
-    kernelPackages = pkgs.linuxPackages_latest;
     tmp.useTmpfs = true;
   };
   services.btrfs.autoScrub.enable = true;
diff --git a/hosts/thinkpad/default.nix b/hosts/thinkpad/default.nix
index a8b3c45..9d7fd40 100755
--- a/hosts/thinkpad/default.nix
+++ b/hosts/thinkpad/default.nix
@@ -185,12 +185,12 @@
     };
   };
 
-  security.tpm2 = {
-    enable = true;
-    pkcs11.enable = true;
-    abrmd.enable = true;
-    tctiEnvironment.enable = true;
-  };
+  # security.tpm2 = {
+  #   enable = true;
+  #   pkcs11.enable = true;
+  #   abrmd.enable = true;
+  #   tctiEnvironment.enable = true;
+  # };
 
   hardware.opengl.extraPackages = with pkgs; [
     intel-compute-runtime
diff --git a/users/rouven/modules/ssh/default.nix b/users/rouven/modules/ssh/default.nix
index 9781ee2..18d7245 100644
--- a/users/rouven/modules/ssh/default.nix
+++ b/users/rouven/modules/ssh/default.nix
@@ -58,6 +58,10 @@ in
         match = "Host ifsr.de User git";
         identityFile = git;
       };
+      "git@staging.ifsr.de" = {
+        match = "Host staging.ifsr.de User git";
+        identityFile = git;
+      };
     };
     extraConfig = ''
       IdentityFile ~/.ssh/id_ed25519
diff --git a/users/rouven/options/shikane.nix b/users/rouven/options/shikane.nix
index 44be663..7b41407 100644
--- a/users/rouven/options/shikane.nix
+++ b/users/rouven/options/shikane.nix
@@ -61,8 +61,6 @@ in
   };
 
   config = mkIf cfg.enable {
-    xdg.configFile."shikane/config.toml".source =
-      tomlFormat.generate "shikane-config" cfg.settings;
     systemd.user.services.shikane = {
       Unit = {
         Description = "Dynamic output configuration tool";
@@ -71,7 +69,7 @@ in
         PartOf = [ "graphical-session.target" ];
       };
 
-      Service = { ExecStart = "${cfg.package}/bin/shikane"; };
+      Service = { ExecStart = "${cfg.package}/bin/shikane -c ${tomlFormat.generate "shikane-config.toml" cfg.settings}"; };
 
       Install = { WantedBy = [ "graphical-session.target" ]; };
     };