diff --git a/modules/nixos/system/tmp/default.nix b/modules/nixos/system/tmp/default.nix
new file mode 100644
index 0000000..6162fe3
--- /dev/null
+++ b/modules/nixos/system/tmp/default.nix
@@ -0,0 +1,25 @@
+{
+  config,
+  lib,
+  namespace,
+  ...
+}:
+with lib;
+with lib.${namespace};
+let
+  cfg = config.${namespace}.system.tmpfs;
+in
+{
+  options.${namespace}.system.tmpfs = with types; {
+    enable = mkBoolOpt false "Whether or not to use tmpfs for /tmp.";
+  };
+
+  config = mkIf cfg.enable {
+    boot.tmp = {
+      cleanOnBoot = true;
+      tmpfsSize = "50%";
+      useTmpfs = true;
+    };
+  };
+
+}
diff --git a/systems/x86_64-linux/blarm/default.nix b/systems/x86_64-linux/blarm/default.nix
index 37b87fb..62c6e56 100644
--- a/systems/x86_64-linux/blarm/default.nix
+++ b/systems/x86_64-linux/blarm/default.nix
@@ -56,16 +56,17 @@ with lib.${namespace};
       cinny = enabled;
       ente-auth = enabled;
       restic = enabled;
-      linkwarden = {
-        enable = true;
-        secretsFile = "/run/secrets/linkwarden";
-      };
+      linkwarden = enabled;
       forgejo = enabled;
     };
 
     #container.invidious = enabled;
 
-    system.sops = enabled;
+    system = {
+      sops = enabled;
+      tmpfs = enabled;
+    };
+
     cli.neovim = enabled;
   };
 
diff --git a/systems/x86_64-linux/bodenheizung/default.nix b/systems/x86_64-linux/bodenheizung/default.nix
index 5957625..f20d01f 100644
--- a/systems/x86_64-linux/bodenheizung/default.nix
+++ b/systems/x86_64-linux/bodenheizung/default.nix
@@ -71,6 +71,7 @@ with lib.${namespace};
     };
 
     system = {
+      tmpfs = enabled;
       fonts = {
         enable = true;
         emoji = true;
diff --git a/systems/x86_64-linux/dns/default.nix b/systems/x86_64-linux/dns/default.nix
index ef20ab2..cc31b8e 100644
--- a/systems/x86_64-linux/dns/default.nix
+++ b/systems/x86_64-linux/dns/default.nix
@@ -39,8 +39,14 @@ with lib.${namespace};
       eza = enabled;
       nh = enabled;
     };
+
+    system.tmpfs = true;
   };
 
+  environment.systemPackages = with pkgs; [
+    git
+  ];
+
   # Set your time zone
   time.timeZone = "Europe/Berlin";