diff --git a/homes/x86_64-linux/c4patino@tobira/default.nix b/homes/x86_64-linux/c4patino@tobira/default.nix
new file mode 100644
index 0000000..33d7647
--- /dev/null
+++ b/homes/x86_64-linux/c4patino@tobira/default.nix
@@ -0,0 +1,16 @@
+{
+  lib,
+  namespace,
+  ...
+}: let
+  inherit (lib.${namespace}) enabled;
+in {
+  ${namespace} = {
+    bundles = {
+      common = enabled;
+      shell = enabled;
+    };
+  };
+
+  home.stateVersion = "25.05";
+}
diff --git a/systems/x86_64-linux/tobira/default.nix b/systems/x86_64-linux/tobira/default.nix
new file mode 100755
index 0000000..a87282d
--- /dev/null
+++ b/systems/x86_64-linux/tobira/default.nix
@@ -0,0 +1,31 @@
+{
+  inputs,
+  lib,
+  namespace,
+  ...
+}: let
+  inherit (lib.${namespace}) enabled;
+in {
+  imports = [
+    ./hardware-configuration.nix
+
+    inputs.disko.nixosModules.default
+    (import ../../disko.nix {main = "/dev/sda";})
+  ];
+
+  ${namespace} = {
+    bundles = {
+      common = enabled;
+    };
+    services = {
+      networking.httpd = enabled;
+    };
+  };
+
+  networking = {
+    hostName = "shiori";
+    hostId = "asdfas";
+  };
+
+  system.stateVersion = "25.05";
+}