diff --git a/configs/common.nix b/configs/common.nix
index e64fb1f..502b08a 100644
--- a/configs/common.nix
+++ b/configs/common.nix
@@ -23,6 +23,8 @@ in
     hjem.nixosModules.default
     nix-index-database.nixosModules.nix-index
 
+    (lib.mkAliasOptionModule [ "hj" ] [ "hjem" "users" "leo" "files" ])
+
     rootPassword.generate
     secrets.generate
 
diff --git a/programs/fish.nix b/programs/fish.nix
index bc0a632..42657e5 100644
--- a/programs/fish.nix
+++ b/programs/fish.nix
@@ -6,7 +6,7 @@
     fishPlugins.hydro
   ];
 
-  hjem.users.leo.files.".config/fish/config.fish".text = ''
+  hj.".config/fish/config.fish".text = ''
     function fish_greeting
     end
 
diff --git a/programs/ghostty.nix b/programs/ghostty.nix
index d33f833..477f94b 100644
--- a/programs/ghostty.nix
+++ b/programs/ghostty.nix
@@ -2,7 +2,7 @@
 {
   environment.systemPackages = [ pkgs.ghostty ];
 
-  hjem.users.leo.files.".config/ghostty/config".text = ''
+  hj.".config/ghostty/config".text = ''
     font-family = Iosevka Term
     font-feature = -calt
     font-feature = -dlig
diff --git a/programs/git.nix b/programs/git.nix
index 5e42ee3..8218619 100644
--- a/programs/git.nix
+++ b/programs/git.nix
@@ -5,7 +5,7 @@
     gh
   ];
 
-  hjem.users.leo.files = {
+  hj = {
     ".gitconfig".text = lib.generators.toGitINI {
       user = {
         name = "uku";
diff --git a/programs/neovim/neovide.nix b/programs/neovim/neovide.nix
index fa95937..300a55f 100644
--- a/programs/neovim/neovide.nix
+++ b/programs/neovim/neovide.nix
@@ -2,5 +2,5 @@
 {
   environment.systemPackages = [ pkgs.neovide ];
 
-  hjem.users.leo.files.".config/neovide/config.toml".text = "fork = true";
+  hj.".config/neovide/config.toml".text = "fork = true";
 }
diff --git a/programs/rust.nix b/programs/rust.nix
index c9a3e9e..1affa7e 100644
--- a/programs/rust.nix
+++ b/programs/rust.nix
@@ -8,7 +8,7 @@ let
   toml = pkgs.formats.toml { };
 in
 {
-  hjem.users.leo.files.".cargo/config.toml".source = toml.generate "config.toml" {
+  hj.".cargo/config.toml".source = toml.generate "config.toml" {
     build.target-dir = "${config.hjem.users.leo.directory}/.cargo/target";
 
     target.x86_64-unknown-linux-gnu = {
diff --git a/systems/mottarone/default.nix b/systems/mottarone/default.nix
index 469b62a..8315878 100644
--- a/systems/mottarone/default.nix
+++ b/systems/mottarone/default.nix
@@ -29,7 +29,7 @@ in
 
   i18n.defaultLocale = lib.mkForce "fr_FR.UTF-8";
 
-  hjem.users.leo.files = {
+  hj = {
     ".gitconfig".text = lib.generators.toGitINI {
       include.path = "~/.config/git/work_config";
     };