diff --git a/modules/hosts/john-kde/default.nix b/modules/hosts/john-kde/default.nix
index e6d9755..b0f488b 100644
--- a/modules/hosts/john-kde/default.nix
+++ b/modules/hosts/john-kde/default.nix
@@ -1,7 +1,7 @@
 { withSystem, self, inputs, ... }:
 let
   username = "john";
-  hostname = "omen";
+  hostname = "john-kde";
 in
 {
   flake.modules.homeManager."${hostname}" = { config, pkgs, lib, ... }:
@@ -62,7 +62,7 @@ in
     };
   };
 
-  flake.homeConfigurations."john@omen" = withSystem "x86_64-linux" (ctx@{ system, inputs', ... }:
+  flake.homeConfigurations."john@john-kde" = withSystem "x86_64-linux" (ctx@{ system, inputs', ... }:
     inputs.home-manager.lib.homeManagerConfiguration {
       pkgs = inputs'.nixpkgs.legacyPackages;
       modules = [ inputs.self.modules.homeManager."${hostname}" ]; # Uses the module defined above
diff --git a/modules/hosts/john-pc/default.nix b/modules/hosts/john-pc/default.nix
index 94efb17..3130835 100644
--- a/modules/hosts/john-pc/default.nix
+++ b/modules/hosts/john-pc/default.nix
@@ -26,6 +26,7 @@ in
       desktop
       step-client
       mysops
+      # zed-editor
       # myPackage
       # myStepClient
     ];
@@ -38,6 +39,7 @@ in
     home.username = "${username}";
     home.homeDirectory = "/home/${username}";
     home.packages = with pkgs; [
+      nil # Nix language server
       selfPkgs.jsl-zsh
       # selfPkgs.my-neovim
       selfPkgs.ssh-certs
diff --git a/modules/hosts/omen-nixos/configuration.nix b/modules/hosts/omen-nixos/configuration.nix
index 34fcfdc..c372157 100644
--- a/modules/hosts/omen-nixos/configuration.nix
+++ b/modules/hosts/omen-nixos/configuration.nix
@@ -1,9 +1,9 @@
 { self, inputs, ... }: {
 
-  flake.modules.nixos.omen = { pkgs, lib, ... }: {
+  flake.modules.nixos.omen-nixos = { pkgs, lib, ... }: {
     # import any other modules from here
     imports = [
-      self.modules.nixos.omenHardware
+      self.modules.nixos.omen-nixos-hardware
       self.modules.nixos.base
       self.modules.nixos.greetd
       self.modules.nixos.niri
@@ -18,7 +18,7 @@
     # Use latest kernel.
     boot.kernelPackages = pkgs.linuxPackages_latest;
 
-    networking.hostName = "nixos-omen"; # Define your hostname.
+    networking.hostName = "omen-nixos"; # Define your hostname.
 
     # Configure network proxy if necessary
     # networking.proxy.default = "http://user:password@proxy:port/";
diff --git a/modules/hosts/omen-nixos/default.nix b/modules/hosts/omen-nixos/default.nix
index 7da7f4c..91dd045 100644
--- a/modules/hosts/omen-nixos/default.nix
+++ b/modules/hosts/omen-nixos/default.nix
@@ -1,7 +1,7 @@
 { self, inputs, ... }: {
-  flake.nixosConfigurations.omen = inputs.nixpkgs.lib.nixosSystem {
+  flake.nixosConfigurations.omen-nixos = inputs.nixpkgs.lib.nixosSystem {
     modules = [
-      self.modules.nixos.omen
+      self.modules.nixos.omen-nixos
       self.modules.nixos.john
     ];
   };
diff --git a/modules/hosts/omen-nixos/hardware.nix b/modules/hosts/omen-nixos/hardware.nix
index 5a6870c..f5a8386 100644
--- a/modules/hosts/omen-nixos/hardware.nix
+++ b/modules/hosts/omen-nixos/hardware.nix
@@ -1,5 +1,5 @@
 { self, inputs, ... }: {
-  flake.modules.nixos.omenHardware = { config, lib, pkgs, modulesPath, ... }: {
+  flake.modules.nixos.omen-nixos-hardware = { config, lib, pkgs, modulesPath, ... }: {
     imports = [
       (modulesPath + "/installer/scan/not-detected.nix")
     ];