diff --git a/flake.nix b/flake.nix
index bbb3ffc..feb8870 100644
--- a/flake.nix
+++ b/flake.nix
@@ -76,9 +76,7 @@
 
     homeConfigurations."work" = home-manager.lib.homeManagerConfiguration {
       inherit pkgs;
-      modules = [
-        ./src/system/machines/workstation
-      ];
+      modules = [ ./src/system/machines/workstation ];
     };
 
     devShells.${system}.default = callPackage ./shell.nix {};
diff --git a/src/system/machines/workstation/home.nix b/src/system/machines/workstation/home.nix
index 6987a4a..839d012 100644
--- a/src/system/machines/workstation/home.nix
+++ b/src/system/machines/workstation/home.nix
@@ -3,55 +3,56 @@
 {
   imports = [ ./user ];
 
+  programs.home-manager.enable = true;
+
   home = {
     stateVersion = "23.11";
     username = "${config.user.name}";
     homeDirectory = "/home/${config.user.name}";
-    programs.home-manager.enable = true;
-
-    programs.bash = {
-      initExtra =
-        import ./scripts/guiControl
-      ;
-    };
-
-    nix = {
-      package = pkgs.nixFlakes;
-      extraOptions = "experimental-features = nix-command flakes";
-      settings = {
-        auto-optimise-store = true;
-        trusted-users = [ "${config.user.name}" ];
-      };
-    };
-
-    modules = {
-      user = {
-        bash.enable = true;
-        git.enable = true;
-
-        security= {
-          gpg.enable = true;
-        };
-
-        gui = {
-          wm.sway.enable = true;
-          alacritty.enable = true;
-          browsers.enable = true;
-          neovim.enable = true;
-        };
-        utils = {
-          enable = true;
-          dev.enable = true;
-          email.enable = true;
-          irc.enable = true;
-          vim.enable = true;
-        };
-      };
-    };
 
     file.".config/home-manager" = {
       source = ../../../..;
       recursive = true;
     };
   };
+
+  nix = {
+    package = pkgs.nixFlakes;
+    extraOptions = "experimental-features = nix-command flakes";
+    settings = {
+      auto-optimise-store = true;
+      trusted-users = [ "${config.user.name}" ];
+    };
+  };
+
+  user = {
+    bash.enable = true;
+    git.enable = true;
+
+    security= {
+      gpg.enable = true;
+    };
+
+    gui = {
+      alacritty.enable = true;
+      browsers.enable = true;
+      neovim.enable = true;
+    };
+
+    utils = {
+      enable = true;
+      dev.enable = true;
+      email.enable = true;
+      irc.enable = true;
+      vim.enable = true;
+    };
+  };
+
+  programs.bash = {
+    initExtra =
+      import ./scripts/guiControl
+    ;
+  };
+
+
 }