diff --git a/machines/thaylen-city/default.nix b/machines/thaylen-city/default.nix
index cfd374f0..e3bedc8f 100644
--- a/machines/thaylen-city/default.nix
+++ b/machines/thaylen-city/default.nix
@@ -9,6 +9,7 @@
       enable = true;
       git.email = "charlotte.vanpetegem@silverfin.com";
     };
+    programs.hledger.enable = true;
   };
   networking.computerName = "Thaylen City";
 
diff --git a/modules/nixos/programs/default.nix b/modules/nixos/programs/default.nix
index baf9f2db..c1d65ffc 100644
--- a/modules/nixos/programs/default.nix
+++ b/modules/nixos/programs/default.nix
@@ -5,16 +5,7 @@
     ./calibre
     ./eid
     ./element
-    ./hledger
     ./obs
     ./torrents
   ];
-
-  home-manager.users.charlotte = { ... }: {
-    home.packages = with pkgs; [
-      jq
-      xsv
-      yt-dlp
-    ];
-  };
 }
diff --git a/modules/shared/default.nix b/modules/shared/default.nix
index ad2481cc..13baf330 100644
--- a/modules/shared/default.nix
+++ b/modules/shared/default.nix
@@ -4,5 +4,6 @@
   imports = [
     ./base
     ./development
+    ./programs
   ];
 }
diff --git a/modules/shared/programs/default.nix b/modules/shared/programs/default.nix
new file mode 100644
index 00000000..6d60d999
--- /dev/null
+++ b/modules/shared/programs/default.nix
@@ -0,0 +1,16 @@
+{ config, pkgs, ... }:
+
+let
+  username = config.chvp.username;
+in
+{
+  imports = [
+    ./hledger
+  ];
+
+  home-manager.users.${username}.home.packages = with pkgs; [
+    jq
+    xsv
+    yt-dlp
+  ];
+}
diff --git a/modules/nixos/programs/hledger/default.nix b/modules/shared/programs/hledger/default.nix
similarity index 90%
rename from modules/nixos/programs/hledger/default.nix
rename to modules/shared/programs/hledger/default.nix
index 51c96a60..d981529e 100644
--- a/modules/nixos/programs/hledger/default.nix
+++ b/modules/shared/programs/hledger/default.nix
@@ -1,5 +1,8 @@
 { config, lib, pkgs, ... }:
 
+let
+  username = config.chvp.username;
+in
 {
   options.chvp.programs.hledger.enable = lib.mkOption {
     default = false;
@@ -26,8 +29,6 @@
       ''
     ];
 
-    home-manager.users.charlotte = { ... }: {
-      home.packages = [ pkgs.hledger ];
-    };
+    home-manager.users.${username}.home.packages = [ pkgs.hledger ];
   };
 }