diff --git a/hosts/juri/hardware.nix b/hosts/juri/hardware.nix
new file mode 100644
index 0000000..768a86f
--- /dev/null
+++ b/hosts/juri/hardware.nix
@@ -0,0 +1,38 @@
+# Do not modify this file!  It was generated by ‘nixos-generate-config’
+# and may be overwritten by future invocations.  Please make changes
+# to /etc/nixos/configuration.nix instead.
+{ config, lib, pkgs, modulesPath, ... }:
+
+{
+  imports = [ ];
+
+  boot.initrd.availableKernelModules = [ "ahci" "xhci_pci" "virtio_pci" "sr_mod" "virtio_blk" ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ ];
+  boot.extraModulePackages = [ ];
+
+  fileSystems."/" =
+    { device = "/dev/disk/by-uuid/9a4fe059-6451-49b3-adec-be4a2c9c6bd9";
+      fsType = "ext4";
+    };
+
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/5483-A6C8";
+      fsType = "vfat";
+      options = [ "fmask=0077" "dmask=0077" ];
+    };
+
+  swapDevices =
+    [ { device = "/dev/disk/by-uuid/96deb154-1888-43e2-9b64-9f7b30b82626"; }
+    ];
+
+  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
+  # (the default) this is the recommended approach. When using systemd-networkd it's
+  # still possible to use this option, but it's recommended to use it in conjunction
+  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
+  networking.useDHCP = lib.mkDefault true;
+  # networking.interfaces.enp1s0.useDHCP = lib.mkDefault true;
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  virtualisation.hypervGuest.enable = true;
+}
diff --git a/hosts/juri/host.nix b/hosts/juri/host.nix
new file mode 100644
index 0000000..4dd1643
--- /dev/null
+++ b/hosts/juri/host.nix
@@ -0,0 +1,16 @@
+{ config, ... }:
+
+{
+  imports = [ 
+    ./hardware.nix
+  ];
+  system.stateVersion = "24.11";
+  system.timezone = "America/Los_Angeles";
+  system.users.bigWheels = [ "pan" ];
+
+  shell.enabledShells = [ "fish" ];
+  shell.defaultShell = "fish";
+
+  sshd.enable = true;
+}
+
diff --git a/hosts/juri/users/pan/user.nix b/hosts/juri/users/pan/user.nix
new file mode 100644
index 0000000..67f147d
--- /dev/null
+++ b/hosts/juri/users/pan/user.nix
@@ -0,0 +1,16 @@
+{ config, pkgs, ... }:
+
+{
+  fish.enable = true;
+  git = {
+    enable = true;
+    username = "Julia Lange";
+    email = "public@julialange.org";
+  };
+  neovim = {
+    enable = true;
+    themes.catppuccin.enable = true;
+  };
+  lf.enable = true;
+  zoxide.enable = true;
+}
diff --git a/nixosModules/automatic/default.nix b/nixosModules/automatic/default.nix
index a48158b..3afd663 100644
--- a/nixosModules/automatic/default.nix
+++ b/nixosModules/automatic/default.nix
@@ -22,7 +22,7 @@
     })
     {
       networking.hostName = hostname;
-      system.stateVersion = "23.05";
+      system.stateVersion = lib.mkDefault "23.05";
 
       time.timeZone = config.system.timezone;
       i18n.defaultLocale = "en_US.UTF-8";