diff --git a/flake.nix b/flake.nix
index eb4d2f8..bbab2c2 100644
--- a/flake.nix
+++ b/flake.nix
@@ -5,6 +5,7 @@
     nixpkgs.url = "github:NixOS/nixpkgs/release-22.11";
     nixpkgs-u.url = "github:NixOS/nixpkgs/nixos-unstable";
     home-manager = { url = "github:nix-community/home-manager/release-22.11"; inputs = { nixpkgs.follows = "nixpkgs"; utils.follows = "flake-utils"; }; };
+    # home-manager-u = { url = "github:nix-community/home-manager"; inputs = { nixpkgs.follows = "nixpkgs-u"; }; };
 
     agenix = { url = "github:ryantm/agenix"; inputs.nixpkgs.follows = "nixpkgs"; };
     deploy-rs = { url = "github:serokell/deploy-rs"; inputs = { nixpkgs.follows = "nixpkgs"; }; };
@@ -20,9 +21,6 @@
       config = {
         allowUnfree = true;
         extraOptions = "experimental-features = nix-command flakes";
-        permittedInsecurePackages = [
-          "electron-9.4.4" # authy dependency
-        ];
       };
 
       overlays = [
@@ -84,19 +82,21 @@
         };
       };
 
+      # Home manager configuration
+      homeManagerModules = [
+        home-manager.nixosModules.default
+        { home-manager = { useGlobalPkgs = true; useUserPackages = true; }; }
+      ];
+
+      # homeManagerUModules = [
+      #   home-manager-u.nixosModules.default
+      #   { home-manager = { useGlobalPkgs = true; useUserPackages = true; }; }
+      # ];
+
       commonModules = [
         # Nix configuration
         nix_configuration
 
-        # Home manager configuration
-        home-manager.nixosModules.default
-        {
-          home-manager = {
-            useGlobalPkgs = true;
-            useUserPackages = true;
-          };
-        }
-
         # Agenix configuration
         agenix.nixosModules.default
         {
@@ -146,7 +146,7 @@
               ./nixos_modules/pentablet.nix
               ./nixos_modules/steam-link.nix
               ./nixos_modules/kdeconnect.nix
-
+            ] ++ homeManagerModules ++ [
               { home-manager.users.bertof = import ./thor/hm.nix; }
             ];
           };
@@ -168,7 +168,7 @@
               ./nixos_modules/pentablet.nix
               ./nixos_modules/steam-link.nix
               ./nixos_modules/kdeconnect.nix
-
+            ] ++ homeManagerModules ++ [
               { home-manager.users.bertof = import ./odin/hm.nix; }
             ];
           in
@@ -198,13 +198,14 @@
               ./freya/hardware-configuration.nix
               ./freya/configuration.nix
 
-              { home-manager.users.bertof = import ./freya/hm.nix; }
               ({ lib, ... }: {
                 boot.supportedFilesystems = lib.mkForce [ "btrfs" "reiserfs" "vfat" "f2fs" "xfs" "ntfs" "cifs" ];
               })
 
               ./nixos_modules/garage.nix
               ./nixos_modules/nextcloud.nix
+            ] ++ homeManagerModules ++ [
+              { home-manager.users.bertof = import ./freya/hm.nix; }
             ];
           };
         };
@@ -219,9 +220,9 @@
               ./baldur/configuration.nix
               "${nixpkgs}/nixos/modules/virtualisation/digital-ocean-config.nix"
               ./nixos_modules/digitalocean.nix
-              { home-manager.users.bertof = import ./baldur/hm.nix; }
-
               ./nixos_modules/garage.nix
+            ] ++ homeManagerModules ++ [
+              { home-manager.users.bertof = import ./baldur/hm.nix; }
             ];
           };
         };
@@ -236,14 +237,15 @@
               nixos-hardware.nixosModules.common-pc-ssd
               ./loki/hardware-configuration.nix
               ./loki/configuration.nix
-              {
-                home-manager.users.bertof = import ./loki/hm.nix;
-                home-manager.users.tiziano = import ./loki/hm_tiziano.nix;
-              }
 
               ./nixos_modules/garage.nix
               (nixpkgs-u + "/nixos/modules/services/misc/readarr.nix")
               ./nixos_modules/readarr.nix
+            ] ++ homeManagerModules ++ [
+              {
+                home-manager.users.bertof = import ./loki/hm.nix;
+                home-manager.users.tiziano = import ./loki/hm_tiziano.nix;
+              }
             ];
           };
         };