39 files changed, 45 insertions, 45 deletions
diff --git a/users/modules/onepassword.nix b/home/modules/onepassword.nix
index d98df25..d1851ea 100644
--- a/users/modules/onepassword.nix
+++ b/home/modules/onepassword.nix
@@ -16,11 +16,12 @@ let
       keyToToml =
         key:
         let
-          lines =
-            [ "[[ssh-keys]]" ]
-            ++ optional (key.item != null) ''item = "${key.item}"''
-            ++ optional (key.vault != null) ''vault = "${key.vault}"''
-            ++ [ ''account = "${key.account}"'' ];
+          lines = [
+            "[[ssh-keys]]"
+          ]
+          ++ optional (key.item != null) ''item = "${key.item}"''
+          ++ optional (key.vault != null) ''vault = "${key.vault}"''
+          ++ [ ''account = "${key.account}"'' ];
         in
         concatStringsSep "\n" lines;
     in
diff --git a/users/modules/userinfo.nix b/home/modules/userinfo.nix
index 46afc73..46afc73 100644
--- a/users/modules/userinfo.nix
+++ b/home/modules/userinfo.nix
diff --git a/users/profiles/k8s.nix b/home/profiles/k8s.nix
index 3ef4152..5eb4cf6 100644
--- a/users/profiles/k8s.nix
+++ b/home/profiles/k8s.nix
@@ -2,8 +2,8 @@
 {
 
   imports = [
-    "${self}/users/programs/k9s.nix"
-    "${self}/users/programs/kubie.nix"
+    "${self}/home/programs/k9s.nix"
+    "${self}/home/programs/kubie.nix"
   ];
 
   home.packages = with pkgs; [
diff --git a/users/profiles/llm.nix b/home/profiles/llm.nix
index 2793373..2793373 100644
--- a/users/profiles/llm.nix
+++ b/home/profiles/llm.nix
diff --git a/users/profiles/mac.nix b/home/profiles/mac.nix
index 16e3b59..66270c1 100644
--- a/users/profiles/mac.nix
+++ b/home/profiles/mac.nix
@@ -1,20 +1,20 @@
 { self, pkgs, ... }:
 {
   imports = [
-    "${self}/users/programs/alacritty"
-    "${self}/users/programs/bat.nix"
-    "${self}/users/programs/direnv.nix"
-    "${self}/users/programs/emacs"
-    "${self}/users/programs/eza.nix"
-    "${self}/users/programs/fd.nix"
-    "${self}/users/programs/fish.nix"
-    "${self}/users/programs/gh.nix"
-    "${self}/users/programs/git.nix"
-    "${self}/users/programs/go.nix"
-    "${self}/users/programs/onepassword.nix"
-    "${self}/users/programs/ssh.nix"
-    "${self}/users/programs/starship.nix"
-    "${self}/users/programs/tmux.nix"
+    "${self}/home/programs/alacritty"
+    "${self}/home/programs/bat.nix"
+    "${self}/home/programs/direnv.nix"
+    "${self}/home/programs/emacs"
+    "${self}/home/programs/eza.nix"
+    "${self}/home/programs/fd.nix"
+    "${self}/home/programs/fish.nix"
+    "${self}/home/programs/gh.nix"
+    "${self}/home/programs/git.nix"
+    "${self}/home/programs/go.nix"
+    "${self}/home/programs/onepassword.nix"
+    "${self}/home/programs/ssh.nix"
+    "${self}/home/programs/starship.nix"
+    "${self}/home/programs/tmux.nix"
     ./llm.nix
     ./secrets.nix
   ];
diff --git a/users/profiles/media.nix b/home/profiles/media.nix
index 265eb89..265eb89 100644
--- a/users/profiles/media.nix
+++ b/home/profiles/media.nix
diff --git a/users/profiles/minimal.nix b/home/profiles/minimal.nix
index b751e91..86c63a3 100644
--- a/users/profiles/minimal.nix
+++ b/home/profiles/minimal.nix
@@ -2,7 +2,7 @@
 {
 
   imports = [
-    "${self}/users/programs/bat.nix"
+    "${self}/home/programs/bat.nix"
   ];
 
   home.packages = with pkgs; [
diff --git a/users/profiles/secrets.nix b/home/profiles/secrets.nix
index 65131df..65131df 100644
--- a/users/profiles/secrets.nix
+++ b/home/profiles/secrets.nix
diff --git a/users/profiles/work.nix b/home/profiles/work.nix
index 538b547..3d3e974 100644
--- a/users/profiles/work.nix
+++ b/home/profiles/work.nix
@@ -29,7 +29,7 @@ let
 in
 {
   imports = [
-    "${self}/users/programs/gh.nix"
+    "${self}/home/programs/gh.nix"
     ./k8s.nix
   ];
 
diff --git a/users/programs/alacritty/catppuccin-latte.toml b/home/programs/alacritty/catppuccin-latte.toml
index e9414ad..e9414ad 100644
--- a/users/programs/alacritty/catppuccin-latte.toml
+++ b/home/programs/alacritty/catppuccin-latte.toml
diff --git a/users/programs/alacritty/default.nix b/home/programs/alacritty/default.nix
index 18c5182..18c5182 100644
--- a/users/programs/alacritty/default.nix
+++ b/home/programs/alacritty/default.nix
diff --git a/users/programs/bat.nix b/home/programs/bat.nix
index fb27397..fb27397 100644
--- a/users/programs/bat.nix
+++ b/home/programs/bat.nix
diff --git a/users/programs/direnv.nix b/home/programs/direnv.nix
index 54585ca..54585ca 100644
--- a/users/programs/direnv.nix
+++ b/home/programs/direnv.nix
diff --git a/users/programs/emacs/default.nix b/home/programs/emacs/default.nix
index d805971..c20f3da 100644
--- a/users/programs/emacs/default.nix
+++ b/home/programs/emacs/default.nix
@@ -60,7 +60,7 @@ let
   ];
   mkEmacsFile = file: {
     ".config/emacs/${file}" = {
-      source = "${self}/users/programs/emacs/${file}";
+      source = "${self}/home/programs/emacs/${file}";
     };
   };
 in
diff --git a/users/programs/emacs/early-init.el b/home/programs/emacs/early-init.el
index 3953c90..3953c90 100644
--- a/users/programs/emacs/early-init.el
+++ b/home/programs/emacs/early-init.el
diff --git a/users/programs/emacs/init.el b/home/programs/emacs/init.el
index 973e4ad..973e4ad 100644
--- a/users/programs/emacs/init.el
+++ b/home/programs/emacs/init.el
diff --git a/users/programs/emacs/site-lisp/init-base.el b/home/programs/emacs/site-lisp/init-base.el
index 0593833..0593833 100644
--- a/users/programs/emacs/site-lisp/init-base.el
+++ b/home/programs/emacs/site-lisp/init-base.el
diff --git a/users/programs/emacs/site-lisp/init-completion.el b/home/programs/emacs/site-lisp/init-completion.el
index 2601756..2601756 100644
--- a/users/programs/emacs/site-lisp/init-completion.el
+++ b/home/programs/emacs/site-lisp/init-completion.el
diff --git a/users/programs/emacs/site-lisp/init-llm.el b/home/programs/emacs/site-lisp/init-llm.el
index 48346e6..48346e6 100644
--- a/users/programs/emacs/site-lisp/init-llm.el
+++ b/home/programs/emacs/site-lisp/init-llm.el
diff --git a/users/programs/emacs/site-lisp/init-programming.el b/home/programs/emacs/site-lisp/init-programming.el
index a2299cf..a2299cf 100644
--- a/users/programs/emacs/site-lisp/init-programming.el
+++ b/home/programs/emacs/site-lisp/init-programming.el
diff --git a/users/programs/emacs/site-lisp/init-text.el b/home/programs/emacs/site-lisp/init-text.el
index 4a5739b..4a5739b 100644
--- a/users/programs/emacs/site-lisp/init-text.el
+++ b/home/programs/emacs/site-lisp/init-text.el
diff --git a/users/programs/emacs/site-lisp/init-ui.el b/home/programs/emacs/site-lisp/init-ui.el
index ea1cb5a..ea1cb5a 100644
--- a/users/programs/emacs/site-lisp/init-ui.el
+++ b/home/programs/emacs/site-lisp/init-ui.el
diff --git a/users/programs/eza.nix b/home/programs/eza.nix
index d0326f6..d0326f6 100644
--- a/users/programs/eza.nix
+++ b/home/programs/eza.nix
diff --git a/users/programs/fd.nix b/home/programs/fd.nix
index cdbae66..cdbae66 100644
--- a/users/programs/fd.nix
+++ b/home/programs/fd.nix
diff --git a/users/programs/fish.nix b/home/programs/fish.nix
index e5a1013..e5a1013 100644
--- a/users/programs/fish.nix
+++ b/home/programs/fish.nix
diff --git a/users/programs/gh.nix b/home/programs/gh.nix
index b194b35..b194b35 100644
--- a/users/programs/gh.nix
+++ b/home/programs/gh.nix
diff --git a/users/programs/git.nix b/home/programs/git.nix
index 354dc71..354dc71 100644
--- a/users/programs/git.nix
+++ b/home/programs/git.nix
diff --git a/users/programs/go.nix b/home/programs/go.nix
index 0ae1ec1..0ae1ec1 100644
--- a/users/programs/go.nix
+++ b/home/programs/go.nix
diff --git a/users/programs/k9s.nix b/home/programs/k9s.nix
index 2d60ab1..2d60ab1 100644
--- a/users/programs/k9s.nix
+++ b/home/programs/k9s.nix
diff --git a/users/programs/kubie.nix b/home/programs/kubie.nix
index 5ac8678..5ac8678 100644
--- a/users/programs/kubie.nix
+++ b/home/programs/kubie.nix
diff --git a/users/programs/onepassword.nix b/home/programs/onepassword.nix
index f364a9e..f364a9e 100644
--- a/users/programs/onepassword.nix
+++ b/home/programs/onepassword.nix
diff --git a/users/programs/ssh.nix b/home/programs/ssh.nix
index c236904..c236904 100644
--- a/users/programs/ssh.nix
+++ b/home/programs/ssh.nix
diff --git a/users/programs/starship.nix b/home/programs/starship.nix
index 8a541ce..8a541ce 100644
--- a/users/programs/starship.nix
+++ b/home/programs/starship.nix
diff --git a/users/programs/tmux.nix b/home/programs/tmux.nix
index 9b84f5c..9b84f5c 100644
--- a/users/programs/tmux.nix
+++ b/home/programs/tmux.nix
diff --git a/machines/darwin/aarch64-darwin/HQ-KWNY2VH41P.nix b/machines/darwin/aarch64-darwin/HQ-KWNY2VH41P.nix
index 640ec4b..3b8cab7 100644
--- a/machines/darwin/aarch64-darwin/HQ-KWNY2VH41P.nix
+++ b/machines/darwin/aarch64-darwin/HQ-KWNY2VH41P.nix
@@ -48,8 +48,8 @@
     home.homeDirectory = "/Users/${adminUser.name}";
     home.packages = with pkgs; [ grpcurl ];
     imports = [
-      "${self}/users/profiles/mac.nix"
-      "${self}/users/profiles/work.nix"
+      "${self}/home/profiles/mac.nix"
+      "${self}/home/profiles/work.nix"
     ];
     inherit (adminUser) userinfo;
     programs.git.userEmail = "fcuny@roblox.com";
diff --git a/machines/darwin/aarch64-darwin/mba-m2.nix b/machines/darwin/aarch64-darwin/mba-m2.nix
index 9970e62..737c4a4 100644
--- a/machines/darwin/aarch64-darwin/mba-m2.nix
+++ b/machines/darwin/aarch64-darwin/mba-m2.nix
@@ -65,8 +65,8 @@
       zoom-us
     ];
     imports = [
-      "${self}/users/profiles/mac.nix"
-      "${self}/users/profiles/media.nix"
+      "${self}/home/profiles/mac.nix"
+      "${self}/home/profiles/media.nix"
     ];
     inherit (adminUser) userinfo;
   };
diff --git a/machines/nixos/x86_64-linux/digitalocean.nix b/machines/nixos/x86_64-linux/digitalocean.nix
index e37e842..1a011e1 100644
--- a/machines/nixos/x86_64-linux/digitalocean.nix
+++ b/machines/nixos/x86_64-linux/digitalocean.nix
@@ -39,7 +39,7 @@
 
   home-manager.users.${adminUser.name} = {
     imports = [
-      "${self}/users/profiles/minimal.nix"
+      "${self}/home/profiles/minimal.nix"
     ];
   };
 
diff --git a/machines/nixos/x86_64-linux/vm-synology.nix b/machines/nixos/x86_64-linux/vm-synology.nix
index f5e8c90..05d4d8c 100644
--- a/machines/nixos/x86_64-linux/vm-synology.nix
+++ b/machines/nixos/x86_64-linux/vm-synology.nix
@@ -49,7 +49,7 @@
 
   home-manager.users.${adminUser.name} = {
     imports = [
-      "${self}/users/profiles/minimal.nix"
+      "${self}/home/profiles/minimal.nix"
     ];
   };
 
diff --git a/profiles/home-manager.nix b/profiles/home-manager.nix
index f6ea8dd..78ef3c0 100644
--- a/profiles/home-manager.nix
+++ b/profiles/home-manager.nix
@@ -7,24 +7,23 @@
   ...
 }:
 {
-  home-manager.extraSpecialArgs =
-    {
-      inherit
-        self
-        hostName
-        inputs
-        adminUser
-        ;
-    }
-    // {
-      mainConfig = config;
-      configPath = "${self}/configs/users/fcuny";
-    };
+  home-manager.extraSpecialArgs = {
+    inherit
+      self
+      hostName
+      inputs
+      adminUser
+      ;
+  }
+  // {
+    mainConfig = config;
+    configPath = "${self}/configs/users/fcuny";
+  };
 
   home-manager.sharedModules = [
     inputs.agenix.homeManagerModules.default
-    "${self}/users/modules/userinfo.nix"
-    "${self}/users/modules/onepassword.nix"
+    "${self}/home/modules/userinfo.nix"
+    "${self}/home/modules/onepassword.nix"
     {
       nixpkgs.overlays = [
         inputs.agenix.overlays.default