diff --git a/flake.nix b/flake.nix
index 1fd0457..7f9563a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -30,10 +30,10 @@
 
   {
     nixosConfigurations = {
-      nixos = nixpkgs.lib.nixosSystem {
+      desktop1 = nixpkgs.lib.nixosSystem {
         specialArgs = { inherit inputs system; };
         modules = [
-          ./configuration.nix
+          ./hosts/desktop1/configuration.nix
 	  nix-flatpak.nixosModules.nix-flatpak
 	  inputs.stylix.nixosModules.stylix
 	  nvf.nixosModules.default
diff --git a/configuration.nix b/hosts/desktop1/configuration.nix
similarity index 95%
rename from configuration.nix
rename to hosts/desktop1/configuration.nix
index bb2fdd6..eaf0da3 100644
--- a/configuration.nix
+++ b/hosts/desktop1/configuration.nix
@@ -6,9 +6,9 @@
       ./hardware-configuration.nix
       inputs.home-manager.nixosModules.home-manager
 
-      ./modules/nix/pipewire.nix
-      ./modules/nix/locales.nix
-      ./modules/nix/nvidia.nix
+      ../../modules/nix/pipewire.nix
+      ../../modules/nix/locales.nix
+      ../../modules/nix/nvidia.nix
     ];
 
   home-manager = {
@@ -37,7 +37,7 @@
     }
   '';
 
-  networking.hostName = "nixos";
+  networking.hostName = "desktop1";
   networking.networkmanager.enable = true;
 
   users.users.smayzy = {
@@ -165,7 +165,7 @@
     enable = true;
     clean.enable = true;
     clean.extraArgs = "--keep-since 30d --keep 10";
-    flake = "/home/smayzy/nix-config#nixos";
+    flake = "/home/smayzy/nix-config";
   };
 
   programs.nvf = {
diff --git a/hardware-configuration.nix b/hosts/desktop1/hardware-configuration.nix
similarity index 100%
rename from hardware-configuration.nix
rename to hosts/desktop1/hardware-configuration.nix
diff --git a/home.nix b/hosts/desktop1/home.nix
similarity index 75%
rename from home.nix
rename to hosts/desktop1/home.nix
index b3f98ad..b65712e 100644
--- a/home.nix
+++ b/hosts/desktop1/home.nix
@@ -3,8 +3,8 @@
 {
   imports =
   [
-  ./modules/home-manager/webapps.nix
-  ./modules/home-manager/lf/lf.nix
+  ../../modules/home-manager/webapps.nix
+  ../../modules/home-manager/lf/lf.nix
   ];
 
   home.username = "smayzy";
@@ -16,40 +16,40 @@
 
   home.file = {
     ".config/fastfetch" = {
-      source = builtins.toPath ./dotfiles/fastfetch;
+      source = builtins.toPath ../../dotfiles/fastfetch;
       recursive = true;
       force = true;
     };
     ".config/kitty/kitty.conf" = {
-      source = builtins.toPath ./dotfiles/kitty.conf;
+      source = builtins.toPath ../../dotfiles/kitty.conf;
       force = true;
     };
     ".config/hypr" = {
-      source = builtins.toPath ./dotfiles/hypr-desk;
+      source = builtins.toPath ../../dotfiles/hypr-desk;
       recursive = true;
       force = true;
     };
     ".config/mako/config" = {
-      source = builtins.toPath ./dotfiles/mako/config;
+      source = builtins.toPath ../../dotfiles/mako/config;
       force = true;
     };
     ".config/waybar" = {
-      source = builtins.toPath ./dotfiles/waybar-desk;
+      source = builtins.toPath ../../dotfiles/waybar-desk;
       recursive = true;
       force = true;
     };
     ".config/wofi" = {
-      source = builtins.toPath ./dotfiles/wofi;
+      source = builtins.toPath ../../dotfiles/wofi;
       recursive = true;
       force = true;
     };
     ".config/wlogout" = {
-      source = builtins.toPath ./dotfiles/wlogout-desk;
+      source = builtins.toPath ../../dotfiles/wlogout-desk;
       recursive = true;
       force = true;
     };
     "wallpaper" = {
-      source = builtins.toPath ./wallpapers;
+      source = builtins.toPath ../../wallpapers;
       recursive = true;
       force = true;
     };