diff --git a/flake.lock b/flake.lock
index 9b1e02c..fbf2f91 100644
--- a/flake.lock
+++ b/flake.lock
@@ -326,24 +326,6 @@
         "type": "github"
       }
     },
-    "flake-utils_3": {
-      "inputs": {
-        "systems": "systems_4"
-      },
-      "locked": {
-        "lastModified": 1731533236,
-        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
     "git-hooks": {
       "inputs": {
         "flake-compat": [
@@ -718,7 +700,6 @@
         "simple-nixos-mailserver": "simple-nixos-mailserver",
         "snowfall-lib": "snowfall-lib",
         "sops-nix": "sops-nix",
-        "ssh-tresor": "ssh-tresor",
         "unstable": "unstable",
         "xremap-flake": "xremap-flake"
       }
@@ -761,27 +742,6 @@
         "type": "github"
       }
     },
-    "rust-overlay_3": {
-      "inputs": {
-        "nixpkgs": [
-          "ssh-tresor",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1768704795,
-        "narHash": "sha256-Y33TAp2BHEcuspYvcmBXXD0qdvjftv73PwyKTDOjoSY=",
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "rev": "4b7472a78857ac789fb26616040f55cfcbd36c6e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "type": "github"
-      }
-    },
     "simple-nixos-mailserver": {
       "inputs": {
         "blobs": "blobs",
@@ -848,28 +808,6 @@
         "type": "github"
       }
     },
-    "ssh-tresor": {
-      "inputs": {
-        "flake-utils": "flake-utils_3",
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "rust-overlay": "rust-overlay_3"
-      },
-      "locked": {
-        "lastModified": 1768997903,
-        "narHash": "sha256-UpBfh3I4PhykVHqV74rrxufF3X1Z8z8sx/lFgMFfIP8=",
-        "owner": "haraldh",
-        "repo": "ssh-tresor",
-        "rev": "dd45aed45f8d9b8729b7698ef43e7cc32fab97b6",
-        "type": "github"
-      },
-      "original": {
-        "owner": "haraldh",
-        "repo": "ssh-tresor",
-        "type": "github"
-      }
-    },
     "systems": {
       "locked": {
         "lastModified": 1681028828,
@@ -915,21 +853,6 @@
         "type": "github"
       }
     },
-    "systems_4": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
     "unstable": {
       "locked": {
         "lastModified": 1768564909,
diff --git a/flake.nix b/flake.nix
index 3456e24..e9eedb8 100644
--- a/flake.nix
+++ b/flake.nix
@@ -69,9 +69,6 @@
     nixos-hardware.url = "github:NixOS/nixos-hardware/master";
 
     xremap-flake.url = "github:xremap/nix-flake";
-
-    ssh-tresor.url = "github:haraldh/ssh-tresor";
-    ssh-tresor.inputs.nixpkgs.follows = "nixpkgs";
   };
 
   outputs =
@@ -116,7 +113,6 @@
         (final: prev: {
           inherit (cratedocs.packages.${prev.stdenv.hostPlatform.system}) cratedocs-mcp;
         })
-        ssh-tresor.overlays.default
       ];
 
       outputs-builder = channels: {
diff --git a/modules/darwin/services/base/default.nix b/modules/darwin/services/base/default.nix
index 84c8f08..d4ed116 100644
--- a/modules/darwin/services/base/default.nix
+++ b/modules/darwin/services/base/default.nix
@@ -37,7 +37,6 @@ in
         tmux
         vim
         wget
-        ssh-tresor
         starship
       ];
       shells = [
diff --git a/modules/home/cli-apps/home-manager/default.nix b/modules/home/cli-apps/home-manager/default.nix
index 3cbb5c1..f8bd9a9 100644
--- a/modules/home/cli-apps/home-manager/default.nix
+++ b/modules/home/cli-apps/home-manager/default.nix
@@ -27,22 +27,6 @@ in
       man = "${pkgs.bat-extras.batman}/bin/batman";
     };
 
-    programs.vim = {
-      enable = true;
-      extraConfig = ''
-        filetype indent off
-        set ts=4 sw=4 et sts=4
-        let spec_chglog_format = "%a %b %d %Y Harald Hoyer <harald@hoyer.xyz>"
-        set exrc
-        set secure
-        syntax on
-
-        " Restore cursor to last edit position
-        autocmd BufReadPost *
-          \ if line("'\"") >= 1 && line("'\"") <= line("$") |
-          \   exe "normal! g`\"" |
-          \ endif
-      '';
-    };
+    home.packages = with pkgs; [ vim ];
   };
 }
diff --git a/modules/nixos/services/base/default.nix b/modules/nixos/services/base/default.nix
index 7a63d93..154b9c0 100644
--- a/modules/nixos/services/base/default.nix
+++ b/modules/nixos/services/base/default.nix
@@ -62,7 +62,6 @@ in
           rrsync
           s-tui
           sbctl
-          ssh-tresor
           sops
           strace
           tmux