diff --git a/flake.lock b/flake.lock
index 3d9bf282..387990f5 100644
--- a/flake.lock
+++ b/flake.lock
@@ -319,6 +319,23 @@
         "type": "github"
       }
     },
+    "base16-fish_2": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1754405784,
+        "narHash": "sha256-l9xHIy+85FN+bEo6yquq2IjD1rSg9fjfjpyGP1W8YXo=",
+        "owner": "tomyun",
+        "repo": "base16-fish",
+        "rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561",
+        "type": "github"
+      },
+      "original": {
+        "owner": "tomyun",
+        "repo": "base16-fish",
+        "rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561",
+        "type": "github"
+      }
+    },
     "base16-helix": {
       "flake": false,
       "locked": {
@@ -335,6 +352,22 @@
         "type": "github"
       }
     },
+    "base16-helix_2": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1748408240,
+        "narHash": "sha256-9M2b1rMyMzJK0eusea0x3lyh3mu5nMeEDSc4RZkGm+g=",
+        "owner": "tinted-theming",
+        "repo": "base16-helix",
+        "rev": "6c711ab1a9db6f51e2f6887cc3345530b33e152e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "tinted-theming",
+        "repo": "base16-helix",
+        "type": "github"
+      }
+    },
     "base16-vim": {
       "flake": false,
       "locked": {
@@ -352,6 +385,41 @@
         "type": "github"
       }
     },
+    "base16-vim_2": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1732806396,
+        "narHash": "sha256-e0bpPySdJf0F68Ndanwm+KWHgQiZ0s7liLhvJSWDNsA=",
+        "owner": "tinted-theming",
+        "repo": "base16-vim",
+        "rev": "577fe8125d74ff456cf942c733a85d769afe58b7",
+        "type": "github"
+      },
+      "original": {
+        "owner": "tinted-theming",
+        "repo": "base16-vim",
+        "rev": "577fe8125d74ff456cf942c733a85d769afe58b7",
+        "type": "github"
+      }
+    },
+    "base16_2": {
+      "inputs": {
+        "fromYaml": "fromYaml_2"
+      },
+      "locked": {
+        "lastModified": 1746562888,
+        "narHash": "sha256-YgNJQyB5dQiwavdDFBMNKk1wyS77AtdgDk/VtU6wEaI=",
+        "owner": "SenchoPens",
+        "repo": "base16.nix",
+        "rev": "806a1777a5db2a1ef9d5d6f493ef2381047f2b89",
+        "type": "github"
+      },
+      "original": {
+        "owner": "SenchoPens",
+        "repo": "base16.nix",
+        "type": "github"
+      }
+    },
     "command-runner": {
       "inputs": {
         "advisory-db": "advisory-db_2",
@@ -708,6 +776,22 @@
         "type": "github"
       }
     },
+    "firefox-gnome-theme_2": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1748383148,
+        "narHash": "sha256-pGvD/RGuuPf/4oogsfeRaeMm6ipUIznI2QSILKjKzeA=",
+        "owner": "rafaelmardojai",
+        "repo": "firefox-gnome-theme",
+        "rev": "4eb2714fbed2b80e234312611a947d6cb7d70caf",
+        "type": "github"
+      },
+      "original": {
+        "owner": "rafaelmardojai",
+        "repo": "firefox-gnome-theme",
+        "type": "github"
+      }
+    },
     "flake-compat": {
       "flake": false,
       "locked": {
@@ -872,6 +956,27 @@
         "type": "github"
       }
     },
+    "flake-parts_10": {
+      "inputs": {
+        "nixpkgs-lib": [
+          "stylix-stable",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1749398372,
+        "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "type": "github"
+      }
+    },
     "flake-parts_2": {
       "inputs": {
         "nixpkgs-lib": "nixpkgs-lib"
@@ -1189,7 +1294,7 @@
     },
     "flake-utils_18": {
       "inputs": {
-        "systems": "systems_22"
+        "systems": "systems_23"
       },
       "locked": {
         "lastModified": 1731533236,
@@ -1207,7 +1312,7 @@
     },
     "flake-utils_19": {
       "inputs": {
-        "systems": "systems_23"
+        "systems": "systems_24"
       },
       "locked": {
         "lastModified": 1726560853,
@@ -1243,7 +1348,7 @@
     },
     "flake-utils_20": {
       "inputs": {
-        "systems": "systems_24"
+        "systems": "systems_25"
       },
       "locked": {
         "lastModified": 1731533236,
@@ -1401,6 +1506,22 @@
         "type": "github"
       }
     },
+    "fromYaml_2": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1731966426,
+        "narHash": "sha256-lq95WydhbUTWig/JpqiB7oViTcHFP8Lv41IGtayokA8=",
+        "owner": "SenchoPens",
+        "repo": "fromYaml",
+        "rev": "106af9e2f715e2d828df706c386a685698f3223b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "SenchoPens",
+        "repo": "fromYaml",
+        "type": "github"
+      }
+    },
     "ghostty": {
       "inputs": {
         "flake-compat": "flake-compat_2",
@@ -1484,6 +1605,23 @@
         "type": "github"
       }
     },
+    "gnome-shell_2": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1744584021,
+        "narHash": "sha256-0RJ4mJzf+klKF4Fuoc8VN8dpQQtZnKksFmR2jhWE1Ew=",
+        "owner": "GNOME",
+        "repo": "gnome-shell",
+        "rev": "52c517c8f6c199a1d6f5118fae500ef69ea845ae",
+        "type": "github"
+      },
+      "original": {
+        "owner": "GNOME",
+        "ref": "48.1",
+        "repo": "gnome-shell",
+        "type": "github"
+      }
+    },
     "guihua": {
       "flake": false,
       "locked": {
@@ -1539,7 +1677,7 @@
     "home-manager-stable": {
       "inputs": {
         "nixpkgs": [
-          "nixpkgs"
+          "nixpkgs-stable"
         ]
       },
       "locked": {
@@ -2599,16 +2737,16 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1751274312,
-        "narHash": "sha256-/bVBlRpECLVzjV19t5KMdMFWSwKLtb5RyXdjz3LJT+g=",
+        "lastModified": 1761999846,
+        "narHash": "sha256-IYlYnp4O4dzEpL77BD/lj5NnJy2J8qbHkNSFiPBCbqo=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "50ab793786d9de88ee30ec4e4c24fb4236fc2674",
+        "rev": "3de8f8d73e35724bf9abef41f1bdbedda1e14a31",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-24.11",
+        "ref": "nixos-25.05",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -2916,6 +3054,32 @@
         "type": "github"
       }
     },
+    "nur_3": {
+      "inputs": {
+        "flake-parts": [
+          "stylix-stable",
+          "flake-parts"
+        ],
+        "nixpkgs": [
+          "stylix-stable",
+          "nixpkgs"
+        ],
+        "treefmt-nix": "treefmt-nix"
+      },
+      "locked": {
+        "lastModified": 1751320053,
+        "narHash": "sha256-3m6RMw0FbbaUUa01PNaMLoO7D99aBClmY5ed9V3vz+0=",
+        "owner": "nix-community",
+        "repo": "NUR",
+        "rev": "cbde1735782f9c2bb2c63d5e05fba171a14a4670",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "NUR",
+        "type": "github"
+      }
+    },
     "nuschtosSearch": {
       "inputs": {
         "flake-utils": "flake-utils_13",
@@ -3106,6 +3270,7 @@
         "rust-overlay": "rust-overlay_8",
         "sops-nix": "sops-nix",
         "stylix": "stylix",
+        "stylix-stable": "stylix-stable",
         "tmux-float": "tmux-float",
         "tree-sitter-d2": "tree-sitter-d2",
         "tree-sitter-just": "tree-sitter-just",
@@ -3422,6 +3587,41 @@
         "type": "github"
       }
     },
+    "stylix-stable": {
+      "inputs": {
+        "base16": "base16_2",
+        "base16-fish": "base16-fish_2",
+        "base16-helix": "base16-helix_2",
+        "base16-vim": "base16-vim_2",
+        "firefox-gnome-theme": "firefox-gnome-theme_2",
+        "flake-parts": "flake-parts_10",
+        "gnome-shell": "gnome-shell_2",
+        "nixpkgs": [
+          "nixpkgs-stable"
+        ],
+        "nur": "nur_3",
+        "systems": "systems_22",
+        "tinted-foot": "tinted-foot_2",
+        "tinted-kitty": "tinted-kitty_2",
+        "tinted-schemes": "tinted-schemes_2",
+        "tinted-tmux": "tinted-tmux_2",
+        "tinted-zed": "tinted-zed_2"
+      },
+      "locked": {
+        "lastModified": 1761668239,
+        "narHash": "sha256-b0+7/5hBUsLjd/gMY9/LSEsvuWFFolHdpUAOlG73zmw=",
+        "owner": "nix-community",
+        "repo": "stylix",
+        "rev": "a149a557dc306e76d53e7dd488826e61ef9c6289",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "ref": "release-25.05",
+        "repo": "stylix",
+        "type": "github"
+      }
+    },
     "systems": {
       "locked": {
         "lastModified": 1689347949,
@@ -3677,6 +3877,21 @@
         "type": "github"
       }
     },
+    "systems_25": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
     "systems_3": {
       "locked": {
         "lastModified": 1681028828,
@@ -3799,6 +4014,23 @@
         "type": "github"
       }
     },
+    "tinted-foot_2": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1726913040,
+        "narHash": "sha256-+eDZPkw7efMNUf3/Pv0EmsidqdwNJ1TaOum6k7lngDQ=",
+        "owner": "tinted-theming",
+        "repo": "tinted-foot",
+        "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4",
+        "type": "github"
+      },
+      "original": {
+        "owner": "tinted-theming",
+        "repo": "tinted-foot",
+        "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4",
+        "type": "github"
+      }
+    },
     "tinted-kitty": {
       "flake": false,
       "locked": {
@@ -3815,6 +4047,22 @@
         "type": "github"
       }
     },
+    "tinted-kitty_2": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1735730497,
+        "narHash": "sha256-4KtB+FiUzIeK/4aHCKce3V9HwRvYaxX+F1edUrfgzb8=",
+        "owner": "tinted-theming",
+        "repo": "tinted-kitty",
+        "rev": "de6f888497f2c6b2279361bfc790f164bfd0f3fa",
+        "type": "github"
+      },
+      "original": {
+        "owner": "tinted-theming",
+        "repo": "tinted-kitty",
+        "type": "github"
+      }
+    },
     "tinted-schemes": {
       "flake": false,
       "locked": {
@@ -3831,6 +4079,22 @@
         "type": "github"
       }
     },
+    "tinted-schemes_2": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1750770351,
+        "narHash": "sha256-LI+BnRoFNRa2ffbe3dcuIRYAUcGklBx0+EcFxlHj0SY=",
+        "owner": "tinted-theming",
+        "repo": "schemes",
+        "rev": "5a775c6ffd6e6125947b393872cde95867d85a2a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "tinted-theming",
+        "repo": "schemes",
+        "type": "github"
+      }
+    },
     "tinted-tmux": {
       "flake": false,
       "locked": {
@@ -3847,6 +4111,22 @@
         "type": "github"
       }
     },
+    "tinted-tmux_2": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1751159871,
+        "narHash": "sha256-UOHBN1fgHIEzvPmdNMHaDvdRMgLmEJh2hNmDrp3d3LE=",
+        "owner": "tinted-theming",
+        "repo": "tinted-tmux",
+        "rev": "bded5e24407cec9d01bd47a317d15b9223a1546c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "tinted-theming",
+        "repo": "tinted-tmux",
+        "type": "github"
+      }
+    },
     "tinted-zed": {
       "flake": false,
       "locked": {
@@ -3863,6 +4143,22 @@
         "type": "github"
       }
     },
+    "tinted-zed_2": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1751158968,
+        "narHash": "sha256-ksOyv7D3SRRtebpXxgpG4TK8gZSKFc4TIZpR+C98jX8=",
+        "owner": "tinted-theming",
+        "repo": "base16-zed",
+        "rev": "86a470d94204f7652b906ab0d378e4231a5b3384",
+        "type": "github"
+      },
+      "original": {
+        "owner": "tinted-theming",
+        "repo": "base16-zed",
+        "type": "github"
+      }
+    },
     "tmux-float": {
       "inputs": {
         "advisory-db": "advisory-db_5",
@@ -3968,6 +4264,28 @@
         "type": "github"
       }
     },
+    "treefmt-nix": {
+      "inputs": {
+        "nixpkgs": [
+          "stylix-stable",
+          "nur",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1733222881,
+        "narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=",
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "rev": "49717b5af6f80172275d47a418c9719a31a78b53",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "type": "github"
+      }
+    },
     "typr": {
       "flake": false,
       "locked": {
diff --git a/flake.nix b/flake.nix
index 7392188c..0fd1ee5c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,7 +3,7 @@
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
     nixpkgs-master.url = "github:nixos/nixpkgs/master";
-    nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.11";
+    nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-25.05";
     flake-utils.url = "github:numtide/flake-utils";
     disko = {
       url = "github:nix-community/disko/latest";
@@ -17,9 +17,13 @@
       url = "github:nix-community/stylix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    stylix-stable = {
+      url = "github:nix-community/stylix/release-25.05";
+      inputs.nixpkgs.follows = "nixpkgs-stable";
+    };
     home-manager-stable = {
       url = "github:nix-community/home-manager/release-25.05";
-      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.nixpkgs.follows = "nixpkgs-stable";
     };
     nix-darwin = {
       url = "github:LnL7/nix-darwin";
diff --git a/home/programs/git.nix b/home/programs/git.nix
index 9cfca79b..47598bf9 100644
--- a/home/programs/git.nix
+++ b/home/programs/git.nix
@@ -1,8 +1,11 @@
 {
   pkgs,
   config,
+  lib,
+  device,
   ...
-}: {
+}:
+lib.optionalAttrs (!(device.is "tsuba")) {
   programs.git = {
     enable = true;
     lfs.enable = true;
diff --git a/home/services/gtk.nix b/home/services/gtk.nix
index d2a715ea..4f010584 100644
--- a/home/services/gtk.nix
+++ b/home/services/gtk.nix
@@ -3,8 +3,8 @@
   lib,
   device,
   ...
-}: {
-  stylix.targets.gtk.enable = false;
+}:
+lib.optionalAttrs (device.is "ryu") {
   gtk = {
     enable = device.is "ryu";
     theme = {
@@ -38,4 +38,5 @@
     # pkgs.catppuccinThemes.gtk
     pkgs.catppuccinThemes.papirus-folders
   ];
+  stylix.targets.gtk.enable = false;
 }
diff --git a/home/services/syncthing.nix b/home/services/syncthing.nix
index 074765c4..c9d235c2 100644
--- a/home/services/syncthing.nix
+++ b/home/services/syncthing.nix
@@ -5,7 +5,7 @@
   ...
 }: {
   services.syncthing = {
-    enable = true;
+    enable = device.is "ryu";
     openDefaultPorts = true;
     # user = "${device.user}";
     # group = "${device.user}";
diff --git a/home/services/xdg.nix b/home/services/xdg.nix
index e95545ea..542c4f64 100644
--- a/home/services/xdg.nix
+++ b/home/services/xdg.nix
@@ -1,4 +1,10 @@
-{pkgs, ...}: {
+{
+  pkgs,
+  lib,
+  device,
+  ...
+}:
+lib.optionalAttrs (device.is "ryu") {
   xdg.portal = {
     enable = pkgs.stdenv.isLinux;
     # config = {
diff --git a/neovim/default.nix b/neovim/default.nix
index 4def838d..ad55646e 100644
--- a/neovim/default.nix
+++ b/neovim/default.nix
@@ -13,16 +13,16 @@
       mode = mode;
     })
     mappings;
-  # border = [
-  #   "╭"
-  #   "─"
-  #   "╮"
-  #   "│"
-  #   "╯"
-  #   "─"
-  #   "╰"
-  #   "│"
-  # ];
+  border = [
+    "╭"
+    "─"
+    "╮"
+    "│"
+    "╯"
+    "─"
+    "╰"
+    "│"
+  ];
   rawLua = lua: {
     "__raw" = ''
       ${lua}
@@ -124,6 +124,14 @@ in {
       pattern = "*.norg";
       command = "set conceallevel=3";
     }
+    {
+      event = [
+        "BufEnter"
+        "BufWinEnter"
+      ];
+      pattern = "*.pest";
+      command = "setlocal commentstring=//%s";
+    }
     # {
     #   event = ["BufEnter" "BufWinEnter"];
     #   pattern = "*.sql";
diff --git a/nixos/tsuba/default.nix b/nixos/tsuba/default.nix
index 77c954f5..a5248e30 100644
--- a/nixos/tsuba/default.nix
+++ b/nixos/tsuba/default.nix
@@ -21,7 +21,7 @@
           inputs.arion.nixosModules.arion
           inputs.disko.nixosModules.disko
           inputs.sops-nix.nixosModules.sops
-          inputs.stylix.nixosModules.stylix
+          inputs.stylix-stable.nixosModules.stylix
           inputs.nix-minecraft.nixosModules.minecraft-servers
           nur.modules.nixos.default
           home-manager-stable.nixosModules.home-manager
@@ -42,15 +42,18 @@
                 stablePkgs = inputs.nixpkgs-stable.legacyPackages.${device.system};
               };
               users.${device.user}.imports = [
+                inputs.nixvim.homeModules.nixvim
                 ../../home
               ];
             };
           }
           ./configuration.nix
           ./services
+          ./programs
           ./disk-config.nix
           ./${name}.nix
           ../../sops.nix
+          ../../stylix.nix
         ];
       }
   )
diff --git a/nixos/tsuba/programs/default.nix b/nixos/tsuba/programs/default.nix
new file mode 100644
index 00000000..1ce8dede
--- /dev/null
+++ b/nixos/tsuba/programs/default.nix
@@ -0,0 +1,5 @@
+{...}: {
+  imports = [
+    ./wol.nix
+  ];
+}
diff --git a/nixos/tsuba/programs/wol.nix b/nixos/tsuba/programs/wol.nix
new file mode 100644
index 00000000..8d6c3313
--- /dev/null
+++ b/nixos/tsuba/programs/wol.nix
@@ -0,0 +1,5 @@
+{pkgs, ...}: {
+  environment.systemPackages = with pkgs; [
+    wol
+  ];
+}