diff --git a/dot_config/home-manager/flake.lock b/dot_config/flake/flake.lock
similarity index 100%
rename from dot_config/home-manager/flake.lock
rename to dot_config/flake/flake.lock
diff --git a/dot_config/home-manager/flake.nix b/dot_config/flake/flake.nix
similarity index 100%
rename from dot_config/home-manager/flake.nix
rename to dot_config/flake/flake.nix
diff --git a/dot_config/home-manager/home/common.nix b/dot_config/flake/home/common.nix
similarity index 100%
rename from dot_config/home-manager/home/common.nix
rename to dot_config/flake/home/common.nix
diff --git a/dot_config/home-manager/home/fish.nix b/dot_config/flake/home/fish.nix
similarity index 93%
rename from dot_config/home-manager/home/fish.nix
rename to dot_config/flake/home/fish.nix
index c925251..2026c56 100644
--- a/dot_config/home-manager/home/fish.nix
+++ b/dot_config/flake/home/fish.nix
@@ -67,8 +67,8 @@
       flake = "nix flake";
 
       # home-manager
-      hm-upgrade = "nix flake update --flake ~/.config/home-manager#";
-      hm-update = "home-manager switch";
+      hm-upgrade = "nix flake update --flake ~/.config/flake#";
+      hm-update = "home-manager switch --flake ~/.config/flake";
     };
   };
 }
diff --git a/dot_config/home-manager/home/gnome.nix b/dot_config/flake/home/gnome.nix
similarity index 100%
rename from dot_config/home-manager/home/gnome.nix
rename to dot_config/flake/home/gnome.nix
diff --git a/dot_config/home-manager/home/gui.nix b/dot_config/flake/home/gui.nix
similarity index 100%
rename from dot_config/home-manager/home/gui.nix
rename to dot_config/flake/home/gui.nix
diff --git a/dot_config/home-manager/home/guidebolt/guidebolt.nix b/dot_config/flake/home/guidebolt/guidebolt.nix
similarity index 100%
rename from dot_config/home-manager/home/guidebolt/guidebolt.nix
rename to dot_config/flake/home/guidebolt/guidebolt.nix
diff --git a/dot_config/home-manager/home/home-backup.nix b/dot_config/flake/home/home-backup.nix
similarity index 100%
rename from dot_config/home-manager/home/home-backup.nix
rename to dot_config/flake/home/home-backup.nix
diff --git a/dot_config/home-manager/home/mal/mal.nix b/dot_config/flake/home/mal/mal.nix
similarity index 100%
rename from dot_config/home-manager/home/mal/mal.nix
rename to dot_config/flake/home/mal/mal.nix
diff --git a/dot_config/home-manager/home/nom.nix b/dot_config/flake/home/nom.nix
similarity index 100%
rename from dot_config/home-manager/home/nom.nix
rename to dot_config/flake/home/nom.nix
diff --git a/dot_config/home-manager/home/nushell.nix b/dot_config/flake/home/nushell.nix
similarity index 100%
rename from dot_config/home-manager/home/nushell.nix
rename to dot_config/flake/home/nushell.nix
diff --git a/dot_config/home-manager/home/wash/wash.nix b/dot_config/flake/home/wash/wash.nix
similarity index 100%
rename from dot_config/home-manager/home/wash/wash.nix
rename to dot_config/flake/home/wash/wash.nix
diff --git a/dot_config/home-manager/neovim.nix b/dot_config/flake/neovim.nix
similarity index 100%
rename from dot_config/home-manager/neovim.nix
rename to dot_config/flake/neovim.nix
diff --git a/dot_config/home-manager/nixos/mal/configuration.nix b/dot_config/flake/nixos/mal/configuration.nix
similarity index 100%
rename from dot_config/home-manager/nixos/mal/configuration.nix
rename to dot_config/flake/nixos/mal/configuration.nix
diff --git a/dot_config/home-manager/nixos/mal/encrypted_private_secrets.sh.age b/dot_config/flake/nixos/mal/encrypted_private_secrets.sh.age
similarity index 100%
rename from dot_config/home-manager/nixos/mal/encrypted_private_secrets.sh.age
rename to dot_config/flake/nixos/mal/encrypted_private_secrets.sh.age
diff --git a/dot_config/home-manager/nixos/mal/hardware-configuration.nix b/dot_config/flake/nixos/mal/hardware-configuration.nix
similarity index 100%
rename from dot_config/home-manager/nixos/mal/hardware-configuration.nix
rename to dot_config/flake/nixos/mal/hardware-configuration.nix
diff --git a/dot_config/home-manager/nushell.nix b/dot_config/flake/nushell.nix
similarity index 100%
rename from dot_config/home-manager/nushell.nix
rename to dot_config/flake/nushell.nix
diff --git a/dot_config/home-manager/overlays/default.nix b/dot_config/flake/overlays/default.nix
similarity index 100%
rename from dot_config/home-manager/overlays/default.nix
rename to dot_config/flake/overlays/default.nix
diff --git a/dot_config/home-manager/package.nix b/dot_config/flake/package.nix
similarity index 100%
rename from dot_config/home-manager/package.nix
rename to dot_config/flake/package.nix
diff --git a/dot_config/home-manager/pkgs/default.nix b/dot_config/flake/pkgs/default.nix
similarity index 100%
rename from dot_config/home-manager/pkgs/default.nix
rename to dot_config/flake/pkgs/default.nix
diff --git a/dot_config/home-manager/symlink_result b/dot_config/flake/symlink_result
similarity index 100%
rename from dot_config/home-manager/symlink_result
rename to dot_config/flake/symlink_result