diff --git a/hosts/envy/default.nix b/hosts/envy/default.nix
new file mode 100644
index 0000000..96616df
--- /dev/null
+++ b/hosts/envy/default.nix
@@ -0,0 +1,97 @@
+# virt-nix
+# System configuration for a vm on my desktop
+
+{ inputs, globals, ... }:
+
+with inputs;
+
+inputs.nixpkgs.lib.nixosSystem {
+  system = "x86_64-linux";
+  modules = [
+    globals
+    lix-module.nixosModules.default
+    home-manager.nixosModules.home-manager
+    sops-nix.nixosModules.sops
+    ./hardware-configuration.nix
+    ../../modules/common
+    ../../modules/nixos
+    {
+      # something with overlays, I don't get those yet.
+
+      # Hardware
+      physical = true;
+      networking.hostName = "kim";
+
+      networking.useDHCP = nixpkgs.lib.mkDefault true;
+
+      # TODO: identityFile = "/home/${globals.user}/.ssh/id_ed2519";
+      # TODO: passwordHash = nixpkgs.lib.fileContents ../../password.sha512;
+
+      # Theming?
+
+      sops = {
+        defaultSopsFile = ../../secrets/secrets.yaml;
+        defaultSopsFormat = "yaml";
+        age.keyFile = "/home/annika/.config/sops/age/keys.txt";
+      };
+
+      # TODO: Temporary, remove eventually!
+      networking.networkmanager.enable = true;
+      time.timeZone = "America/New_York";
+      nix.settings.experimental-features = [ "nix-command" "flakes" ];
+      services.xserver.enable = true;
+      services.displayManager.sddm.enable = true;
+      services.xserver.desktopManager.plasma5.enable = true;
+      services.xserver.xkb = {
+        layout = "us";
+        variant = "";
+      };
+      users.users.annika = {
+        isNormalUser = true;
+        description = "Annika Merris";
+        extraGroups = [ "networkmanager" "wheel" ];
+      };
+      nixpkgs.config.allowUnfree = true;
+      system.stateVersion = "23.11";
+      home-manager.backupFileExtension = "backup";
+      services.openssh.enable = true;
+      services.flatpak.enable = true;
+      hardware.bluetooth.enable = true;
+      hardware.bluetooth.powerOnBoot = true;
+      # Enable sound with pipewire.
+      sound.enable = true;
+      hardware.pulseaudio.enable = false;
+      security.rtkit.enable = true;
+      services.pipewire = {
+        enable = true;
+        alsa.enable = true;
+        alsa.support32Bit = true;
+        pulse.enable = true;
+        # If you want to use JACK applications, uncomment this
+        #jack.enable = true;
+
+        # use the example session manager (no others are packaged yet so this is enabled by default,
+        # no need to redefine it in your config for now)
+        #media-session.enable = true;
+      };
+
+
+      gui.enable = true;
+      # Apps
+      discord.enable = true;
+      element.enable = true;
+      firefox.enable = true;
+      netbird.enable = true;
+      prusa-slicer.enable = true;
+      spotifyd.enable = true;
+      # Gaming
+      steam.enable = false;
+      # Programming Stuff
+      nixpkgs-fmt.enable = true;
+      python3.enable = true;
+      vscode.enable = true;
+      # Utilities
+      # git is not optional
+    }
+  ];
+}
diff --git a/hosts/kim/default.nix b/hosts/kim/default.nix
index 1f83e48..3669187 100644
--- a/hosts/kim/default.nix
+++ b/hosts/kim/default.nix
@@ -13,6 +13,7 @@ inputs.nixpkgs.lib.nixosSystem {
     home-manager.nixosModules.home-manager
     sops-nix.nixosModules.sops
     ./hardware-configuration.nix
+    ./gui.nix
     ../../modules/common
     ../../modules/nixos
     {
@@ -36,16 +37,16 @@ inputs.nixpkgs.lib.nixosSystem {
       };
 
       # TODO: Temporary, remove eventually!
-      networking.networkmanager.enable = true;
+      # networking.networkmanager.enable = true;
       time.timeZone = "America/New_York";
       nix.settings.experimental-features = [ "nix-command" "flakes" ];
-      services.xserver.enable = true;
-      services.displayManager.sddm.enable = true;
-      services.xserver.desktopManager.plasma5.enable = true;
-      services.xserver.xkb = {
-        layout = "us";
-        variant = "";
-      };
+      # services.xserver.enable = true;
+      # services.displayManager.sddm.enable = true;
+      # services.xserver.desktopManager.plasma5.enable = true;
+      # services.xserver.xkb = {
+      #   layout = "us";
+      #   variant = "";
+      # };
       users.users.annika = {
         isNormalUser = true;
         description = "Annika Merris";
@@ -76,7 +77,7 @@ inputs.nixpkgs.lib.nixosSystem {
       };
 
 
-      gui.enable = true;
+      # gui.enable = true;
       # Apps
       discord.enable = true;
       element.enable = true;
diff --git a/hosts/kim/gui.nix b/hosts/kim/gui.nix
new file mode 100644
index 0000000..d89d294
--- /dev/null
+++ b/hosts/kim/gui.nix
@@ -0,0 +1,15 @@
+{ config, lib, pkgs, ... }:
+{
+  gui.enable = true;
+
+  services.xserver.enable = true;
+  services.displayManager.sddm.enable = true;
+  services.xserver = {
+    desktopManager.plasma5.enable = true;
+    xkb = {
+      layout = "us";
+      variant = "";
+    };
+  };
+  networking.networkmanager.enable = true;
+}