diff --git a/flake.nix b/flake.nix
index 389c073..ef8b9b0 100755
--- a/flake.nix
+++ b/flake.nix
@@ -78,14 +78,13 @@
           specialArgs = { inherit inputs; };
           system = "x86_64-linux";
           modules = [
-            ./modules/nixos/nixos-configuration.nix
+            ./hosts/callisto
             ./modules/nixos/secureboot.nix
             ./modules/nixos/gaming.nix
             ./modules/nixos/audio.nix
             ./modules/nixos/nvidia.nix
             ./modules/nixos/networking.nix
             ./modules/common/fonts.nix
-            ./machines/nixos/hardware-configuration.nix
 
             catppuccin.nixosModules.catppuccin
 
diff --git a/hosts/callisto/default.nix b/hosts/callisto/default.nix
new file mode 100755
index 0000000..24ff9ab
--- /dev/null
+++ b/hosts/callisto/default.nix
@@ -0,0 +1,186 @@
+# Edit this configuration file to define what should be installed on
+# your system.  Help is available in the configuration.nix(5) man page
+# and in the NixOS manual (accessible by running ‘nixos-help’).
+
+{ config, inputs, pkgs, ... }:
+
+{
+  imports = [ # Include the results of the hardware scan.
+    ./hardware-configuration.nix
+  ];
+
+  # Bootloader.
+  boot.loader = {
+    efi.canTouchEfiVariables = true;
+    timeout = 15;
+    systemd-boot = {
+      enable = true;
+      consoleMode = "auto";
+    };
+  };
+
+  networking.hostName = "nixos"; # Define your hostname.
+  # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
+
+  # select kernel
+  boot.kernelPackages = pkgs.linuxPackages_zen;
+
+  # Configure network proxy if necessary
+  # networking.proxy.default = "http://user:password@proxy:port/";
+  # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
+
+  # Enable networking
+  networking.networkmanager.enable = true;
+
+  # Set your time zone.
+  time.timeZone = "America/Los_Angeles";
+
+  # Select internationalisation properties.
+  i18n.defaultLocale = "en_US.UTF-8";
+
+  i18n.extraLocaleSettings = {
+    LC_ADDRESS = "en_US.UTF-8";
+    LC_IDENTIFICATION = "en_US.UTF-8";
+    LC_MEASUREMENT = "en_US.UTF-8";
+    LC_MONETARY = "en_US.UTF-8";
+    LC_NAME = "en_US.UTF-8";
+    LC_NUMERIC = "en_US.UTF-8";
+    LC_PAPER = "en_US.UTF-8";
+    LC_TELEPHONE = "en_US.UTF-8";
+    LC_TIME = "en_US.UTF-8";
+  };
+
+  systemd.services = { NetworkManager-wait-online.enable = false; };
+
+  # Enable the X11 windowing system.
+  # You can disable this if you're only using the Wayland session.
+  services.xserver.enable = false;
+
+  programs.nix-ld = {
+    enable = true;
+    libraries = with pkgs; [ icu xorg.libXtst xorg.libXi ];
+  };
+
+  # Enable the KDE Plasma Desktop Environment.
+  services.displayManager.sddm = {
+    enable = true;
+    wayland.enable = true;
+    theme = "catppuccin-mocha";
+    package = pkgs.kdePackages.sddm;
+  };
+
+  # services.desktopManager.plasma6.enable = true;
+
+  # Configure keymap in X11
+  services.xserver = {
+    xkb.layout = "us";
+    xkb.variant = "";
+  };
+
+  # Enable CUPS to print documents.
+  services.printing.enable = true;
+
+  # Enable touchpad support (enabled default in most desktopManager).
+  # services.xserver.libinput.enable = true;
+
+  # Define a user account. Don't forget to set a password with ‘passwd’.
+  users.users.youwen = {
+    isNormalUser = true;
+    description = "Youwen Wu";
+    extraGroups = [ "networkmanager" "wheel" "nixos" "realtime" ];
+  };
+
+  users.groups.realtime = { };
+
+  nix.settings = {
+    trusted-users = [ "root" "youwen" ];
+    experimental-features = [ "nix-command" "flakes" ];
+  };
+
+  services.udev.extraRules = ''
+    KERNEL=="cpu_dma_latency", GROUP="realtime"
+  '';
+
+  security.pam.loginLimits = [
+    {
+      domain = "@realtime";
+      type = "-";
+      item = "rtprio";
+      value = 98;
+    }
+    {
+      domain = "@realtime";
+      type = "-";
+      item = "memlock";
+      value = "unlimited";
+    }
+    {
+      domain = "@realtime";
+      type = "-";
+      item = "nice";
+      value = -11;
+    }
+  ];
+
+  # Allow unfree packages
+  nixpkgs.config.allowUnfree = true;
+
+  # List packages installed in system profile. To search, run:
+  # $ nix search wget
+  environment.systemPackages = with pkgs; [
+    neovim
+    wget
+    git
+    curl
+    librewolf
+    gnumake
+    clang
+    gcc
+    cachix
+    nodejs_22
+    cargo
+    rustc
+    gnupg
+    openssh
+    python3
+    (pkgs.catppuccin-sddm.override { flavor = "mocha"; })
+    steam-run
+
+    # deps for neovim compilation
+    lua51Packages.lua
+    lua51Packages.luarocks
+    tree-sitter
+  ];
+
+  environment.variables = {
+    EDITOR = "nvim";
+    NIX_AUTO_RUN = 1;
+  };
+
+  # tells electron apps to use Wayland
+  environment.sessionVariables.NIXOS_OZONE_WL = "1";
+
+  # Some programs need SUID wrappers, can be configured further or are
+  # started in user sessions.
+  # programs.mtr.enable = true;
+  programs.gnupg.agent = {
+    enable = true;
+    enableSSHSupport = true;
+  };
+
+  programs.dconf.enable = true;
+
+  programs.hyprland.enable = true;
+
+  # This value determines the NixOS release from which the default
+  # settings for stateful data, like file locations and database versions
+  # on your system were taken. It‘s perfectly fine and recommended to leave
+  # this value at the release version of the first install of this system.
+  # Before changing this value read the documentation for this option
+  # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
+  system.stateVersion = "24.05"; # Did you read the comment?
+
+  programs.zsh.enable = false;
+  programs.fish.enable = true;
+  users.users.youwen.shell = pkgs.fish;
+}