diff --git a/.sops.yaml b/.sops.yaml
index b7491c3..9af5348 100644
--- a/.sops.yaml
+++ b/.sops.yaml
@@ -1,29 +1,27 @@
 keys:
-  # Users
   - &guanranwang age129yyxyz686qj88ce5v77ahelqqwt6zz94mzzls0ny4hq76psrd9qhc79kq
 
-  # Hosts
-  # nix-shell -p ssh-to-age --run 'cat /etc/ssh/ssh_host_ed25519_key.pub | ssh-to-age'
-  - &blacksteel age174knn6hjtukp32ymcdvjwj6x0j54g7yw02dqfjmua3fkyltwcqrsxccjdk
+  # ssh-to-age < /etc/ssh/ssh_host_ed25519_key.pub
   - &dust age193x79xx8snu82w3t3hax6nruuw57g7pduwnkpvzkzmd7fs5jvfrquqa3sl
-  - &lightsail-tokyo age1vw4kf5v8cfnhfhvl0eyvqzpvy9hpfv9enffvzyt95tx5mu7s5dxqjqw0fa
+  - &pek0 age174knn6hjtukp32ymcdvjwj6x0j54g7yw02dqfjmua3fkyltwcqrsxccjdk
+  - &tyo0 age1vw4kf5v8cfnhfhvl0eyvqzpvy9hpfv9enffvzyt95tx5mu7s5dxqjqw0fa
 creation_rules:
-  - path_regex: hosts/blacksteel/secrets.yaml$
+  - path_regex: hosts/pek0/secrets.yaml$
     key_groups:
       - age:
           - *guanranwang
-          - *blacksteel
+          - *pek0
   - path_regex: hosts/tyo0/secrets.yaml$
     key_groups:
       - age:
           - *guanranwang
-          - *lightsail-tokyo
+          - *tyo0
   - path_regex: nixos/profiles/sing-box/secrets.yaml$
     key_groups:
       - age:
           - *guanranwang
-          - *blacksteel
           - *dust
+          - *pek0
   - path_regex: nixos/profiles/wireless/secrets.yaml$
     key_groups:
       - age:
@@ -33,6 +31,6 @@ creation_rules:
     key_groups:
       - age:
           - *guanranwang
-          - *blacksteel
           - *dust
-          - *lightsail-tokyo
+          - *pek0
+          - *tyo0
diff --git a/flake.lock b/flake.lock
index 44d84c7..7e9771b 100644
--- a/flake.lock
+++ b/flake.lock
@@ -51,11 +51,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1725377834,
-        "narHash": "sha256-tqoAO8oT6zEUDXte98cvA1saU9+1dLJQe3pMKLXv8ps=",
+        "lastModified": 1726396892,
+        "narHash": "sha256-KRGuT5nGRAOT3heigRWg41tbYpTpapGhsWc+XjnIx0w=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "e55f9a8678adc02024a4877c2a403e3f6daf24fe",
+        "rev": "51e3a7e51279fedfb6669a00d21dc5936c78a6ce",
         "type": "github"
       },
       "original": {
@@ -86,11 +86,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1725234343,
-        "narHash": "sha256-+ebgonl3NbiKD2UD0x4BszCZQ6sTfL4xioaM49o5B3Y=",
+        "lastModified": 1726153070,
+        "narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "567b938d64d4b4112ee253b9274472dc3a346eb6",
+        "rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a",
         "type": "github"
       },
       "original": {
@@ -146,11 +146,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1725180166,
-        "narHash": "sha256-fzssXuGR/mCeGbzM1ExaTqDz7QDGta3WA4jJsZyRruo=",
+        "lastModified": 1726357542,
+        "narHash": "sha256-p4OrJL2weh0TRtaeu1fmNYP6+TOp/W2qdaIJxxQay4c=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "471e3eb0a114265bcd62d11d58ba8d3421ee68eb",
+        "rev": "e524c57b1fa55d6ca9d8354c6ce1e538d2a1f47f",
         "type": "github"
       },
       "original": {
@@ -210,11 +210,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1725050929,
-        "narHash": "sha256-1z8i5qQwb28YM4cg1ji6b8f/5XDO30FIr/vObDRZbes=",
+        "lastModified": 1726316254,
+        "narHash": "sha256-82snaLYq0U2Wt5Vy+gFUmOTrjKEHOhm0uqaT6ycLKXc=",
         "ref": "refs/heads/master",
-        "rev": "d3b42cf643d03d675d19ec6259bb33538eaa706e",
-        "revCount": 73,
+        "rev": "2c3b306495070c8b20a1f28f9f7143917bbff9e6",
+        "revCount": 78,
         "type": "git",
         "url": "https://git.ny4.dev/nyancat/nvim"
       },
@@ -225,11 +225,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1725477728,
-        "narHash": "sha256-ahej1VRqKmWbG7gewty+GlrSBEeGY/J2Zy8Nt8+3fdg=",
+        "lastModified": 1725885300,
+        "narHash": "sha256-5RLEnou1/GJQl+Wd+Bxaj7QY7FFQ9wjnFq1VNEaxTmc=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "880be1ab837e1e9fe0449dae41ac4d034694d4ce",
+        "rev": "166dee4f88a7e3ba1b7a243edb1aca822f00680e",
         "type": "github"
       },
       "original": {
@@ -240,11 +240,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1725534445,
-        "narHash": "sha256-Yd0FK9SkWy+ZPuNqUgmVPXokxDgMJoGuNpMEtkfcf84=",
+        "lastModified": 1726365531,
+        "narHash": "sha256-luAKNxWZ+ZN0kaHchx1OdLQ71n81Y31ryNPWP1YRDZc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "9bb1e7571aadf31ddb4af77fc64b2d59580f9a39",
+        "rev": "9299cdf978e15f448cf82667b0ffdd480b44ee48",
         "type": "github"
       },
       "original": {
@@ -327,11 +327,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1725589472,
-        "narHash": "sha256-+OB00N6Yql/ZRQQkQ0PNnxfW2tH89DHnv29hBS7tXMM=",
+        "lastModified": 1726382494,
+        "narHash": "sha256-T7W+ohiXe1IY0yf/PpS4wQItZ0SyRO+/v8kqNpMXlI4=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "2b00881d2ff72174cffdc007238cb6bedd6e1d8e",
+        "rev": "ff13821613ffe5dbfeb4fe353b1f4bf291d831db",
         "type": "github"
       },
       "original": {
@@ -350,11 +350,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1725540166,
-        "narHash": "sha256-htc9rsTMSAY5ek+DB3tpntdD/es0eam2hJgO92bWSys=",
+        "lastModified": 1726218807,
+        "narHash": "sha256-z7CoWbSOtsOz8TmRKDnobURkKfv6nPZCo3ayolNuQGc=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "d9d781523a1463965cd1e1333a306e70d9feff07",
+        "rev": "f30b1bac192e2dc252107ac8a59a03ad25e1b96e",
         "type": "github"
       },
       "original": {
diff --git a/home/applications/neovim/default.nix b/home/applications/neovim/default.nix
index 278c20b..a9b2592 100644
--- a/home/applications/neovim/default.nix
+++ b/home/applications/neovim/default.nix
@@ -4,12 +4,7 @@
   ...
 }:
 {
-  home.packages = [
-    (inputs.neovim.packages.${pkgs.stdenv.hostPlatform.system}.default.override {
-      viAlias = true;
-      vimAlias = true;
-    })
-  ];
-
+  home.packages = [ pkgs.neovim ];
   home.sessionVariables."EDITOR" = "nvim";
+  xdg.configFile."nvim".source = inputs.neovim;
 }
diff --git a/home/applications/sway/default.nix b/home/applications/sway/default.nix
index ba2f9b8..e87ad00 100644
--- a/home/applications/sway/default.nix
+++ b/home/applications/sway/default.nix
@@ -6,19 +6,11 @@
   ...
 }:
 {
-  home.packages = with pkgs; [
-    wl-clipboard
-    pwvucontrol
-  ];
-
   # remove csd window buttons
   # https://github.com/localsend/localsend/blob/2457acd8a7412723b174672d174e4853dccd7d99/app/linux/my_application.cc#L45
   home.sessionVariables.GTK_CSD = 0;
   dconf.settings."org/gnome/desktop/wm/preferences"."button-layout" = "appmenu:";
 
-  services.cliphist.enable = true;
-  services.udiskie.enable = true;
-
   wayland.windowManager.sway = {
     enable = true;
     checkConfig = false; # wtf?
diff --git a/home/default.nix b/home/default.nix
index b4651c8..0d10b94 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -23,6 +23,11 @@
     zoxide.enable = true;
   };
 
+  services = {
+    cliphist.enable = true;
+    udiskie.enable = true;
+  };
+
   home.packages = with pkgs; [
     dconf-editor
     fastfetch
@@ -32,6 +37,8 @@
     gnome-calculator
     hyperfine
     loupe
+    pwvucontrol
     seahorse
+    wl-clipboard
   ];
 }
diff --git a/home/theme.nix b/home/theme.nix
index 95b2b8c..0c3008a 100644
--- a/home/theme.nix
+++ b/home/theme.nix
@@ -17,6 +17,7 @@
     gtk2.configLocation = "${config.xdg.configHome}/gtk-2.0/gtkrc";
 
     gtk3.bookmarks = [
+      "smb://blacksteel/external"
       "file://${config.home.homeDirectory}/Documents/Projects/flake"
     ];
 
diff --git a/home/xdg-mime.nix b/home/xdg-mime.nix
index e909bd5..df32739 100644
--- a/home/xdg-mime.nix
+++ b/home/xdg-mime.nix
@@ -22,7 +22,7 @@
         "audio/mpeg"
         "audio/ogg"
         "audio/wav"
-      ] (_n: [ "io.bassi.Amberol.desktop" ])
+      ] (_n: [ "mpv.desktop" ])
       ### Image viewer
       // lib.genAttrs [
         "image/gif"
diff --git a/hosts/pek0/anti-feature.nix b/hosts/pek0/anti-feature.nix
index 9722d37..e9ef550 100644
--- a/hosts/pek0/anti-feature.nix
+++ b/hosts/pek0/anti-feature.nix
@@ -5,7 +5,6 @@
     allowNonSourcePredicate =
       pkg:
       lib.elem (lib.getName pkg) [
-        "adoptopenjdk-hotspot-bin"
         "cargo-bootstrap"
         "go"
         "minecraft-server"
diff --git a/hosts/tyo0/anti-feature.nix b/hosts/tyo0/anti-feature.nix
index 2a7fe21..d1dc41f 100644
--- a/hosts/tyo0/anti-feature.nix
+++ b/hosts/tyo0/anti-feature.nix
@@ -5,7 +5,6 @@
     allowNonSourcePredicate =
       pkg:
       lib.elem (lib.getName pkg) [
-        "adoptopenjdk-hotspot-bin"
         "cargo-bootstrap"
         "go"
         "keycloak"