diff --git a/flake.nix b/flake.nix
index a7f43af..2613eb7 100644
--- a/flake.nix
+++ b/flake.nix
@@ -55,12 +55,8 @@
                 extraSpecialArgs = {
                   nur = nur.nixosModules.nur;
                   sops = sops.homeManagerModules.sops;
-                  machine = {
-                    username = "winston";
-                    homeDirectory = "/Users/winston";
-                    personal = true;
-                    flakePath = "/Users/winston/.config/nixpkgs";
-                  };
+                  flakePath = "/Users/winston/.config/nixpkgs";
+                  machine.personal = true;
                 };
               };
             };
diff --git a/home.nix b/home.nix
index 76ca378..8904cdc 100644
--- a/home.nix
+++ b/home.nix
@@ -92,8 +92,8 @@ in
   xdg = {
     enable = true;
     userDirs.enable = isLinux;
-    cacheHome = "${machine.homeDirectory}/.cache";
-    configHome = "${machine.homeDirectory}/.config";
-    dataHome = "${machine.homeDirectory}/.local/share";
+    cacheHome = "${config.home.homeDirectory}/.cache";
+    configHome = "${config.home.homeDirectory}/.config";
+    dataHome = "${config.home.homeDirectory}/.local/share";
   };
 }
diff --git a/modules/i3.nix b/modules/i3.nix
index f78c0e3..db5104c 100644
--- a/modules/i3.nix
+++ b/modules/i3.nix
@@ -1,4 +1,4 @@
-{ config, lib, machine, pkgs, ... }:
+{ config, lib, flakePath, pkgs, ... }:
 
 let
   inherit (pkgs.stdenv.hostPlatform) isLinux;
@@ -168,7 +168,7 @@ in
   xdg = lib.mkIf isLinux {
     configFile = {
       "i3" = {
-        source = config.lib.file.mkOutOfStoreSymlink "${machine.flakePath}/modules/i3";
+        source = config.lib.file.mkOutOfStoreSymlink "${flakePath}/modules/i3";
         recursive = true;
       };
     };
diff --git a/modules/neovim.nix b/modules/neovim.nix
index c811c53..ae419dd 100644
--- a/modules/neovim.nix
+++ b/modules/neovim.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, machine, ... }:
+{ config, pkgs, flakePath, ... }:
 
 {
   programs.neovim = {
@@ -72,7 +72,7 @@
   };
 
   xdg.configFile."nvim" = {
-    source = config.lib.file.mkOutOfStoreSymlink "${machine.flakePath}/modules/nvim";
+    source = config.lib.file.mkOutOfStoreSymlink "${flakePath}/modules/nvim";
     recursive = true;
   };
 }
diff --git a/modules/vscode.nix b/modules/vscode.nix
index 09098c3..2520a4a 100644
--- a/modules/vscode.nix
+++ b/modules/vscode.nix
@@ -1,4 +1,4 @@
-{ config, lib, machine, pkgs, ... }:
+{ config, flakePath, lib, pkgs, ... }:
 
 let
   inherit (pkgs.stdenv.hostPlatform) isLinux;
@@ -20,11 +20,11 @@ in
   home.file = {
     "${config.xdg.configHome}/Code/User/settings.json" = {
       enable = isLinux;
-      source = config.lib.file.mkOutOfStoreSymlink "${machine.flakePath}/modules/vscode/settings.json";
+      source = config.lib.file.mkOutOfStoreSymlink "${flakePath}/modules/vscode/settings.json";
     };
     "Library/Application Support/Code/User/settings.json" = {
       enable = isDarwin;
-      source = config.lib.file.mkOutOfStoreSymlink "${machine.flakePath}/modules/vscode/settings.json";
+      source = config.lib.file.mkOutOfStoreSymlink "${flakePath}/modules/vscode/settings.json";
     };
   };
 }
diff --git a/modules/wezterm.nix b/modules/wezterm.nix
index fc07e4b..06eea16 100644
--- a/modules/wezterm.nix
+++ b/modules/wezterm.nix
@@ -1,9 +1,9 @@
-{ config, machine, ... }:
+{ config, flakePath, ... }:
 
 {
   xdg.configFile = {
     "wezterm" = {
-      source = config.lib.file.mkOutOfStoreSymlink "${machine.flakePath}/modules/wezterm";
+      source = config.lib.file.mkOutOfStoreSymlink "${flakePath}/modules/wezterm";
       recursive = true;
     };
   };
diff --git a/modules/zsh.nix b/modules/zsh.nix
index d60295b..299b7b5 100644
--- a/modules/zsh.nix
+++ b/modules/zsh.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, machine, ... }:
+{ config, flakePath, lib, pkgs, ... }:
 
 {
   programs = {
@@ -33,7 +33,7 @@
       enableSyntaxHighlighting = true;
 
       initExtra = let
-        functionsDir = "${machine.homeDirectory}/${config.programs.zsh.dotDir}/functions";
+        functionsDir = "${config.home.homeDirectory}/${config.programs.zsh.dotDir}/functions";
       in
       ''
         for conf in "${functionsDir}"/**/*.zsh; do
@@ -87,11 +87,11 @@
 
   xdg.configFile = {
     "lsd" = {
-      source = config.lib.file.mkOutOfStoreSymlink "${machine.flakePath}/modules/lsd/themes";
+      source = config.lib.file.mkOutOfStoreSymlink "${flakePath}/modules/lsd/themes";
       recursive = true;
     };
     "zsh/functions" = {
-      source = config.lib.file.mkOutOfStoreSymlink "${machine.flakePath}/modules/zsh/functions";
+      source = config.lib.file.mkOutOfStoreSymlink "${flakePath}/modules/zsh/functions";
       recursive = true;
     };
   };