diff --git a/flake.lock b/flake.lock
index 03597bf..5d4eb9a 100644
--- a/flake.lock
+++ b/flake.lock
@@ -245,6 +245,26 @@
         "type": "github"
       }
     },
+    "home-manager-u": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs-u"
+        ]
+      },
+      "locked": {
+        "lastModified": 1726308872,
+        "narHash": "sha256-d4vwO5N4RsLnCY7k5tY9xbdYDWQsY3RDMeUoIa4ms2A=",
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "rev": "6c1a461a444e6ccb3f3e42bb627b510c3a722a57",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "type": "github"
+      }
+    },
     "home-manager_2": {
       "inputs": {
         "nixpkgs": [
@@ -505,6 +525,7 @@
         "flake-compat": "flake-compat_2",
         "flake-utils": "flake-utils",
         "home-manager": "home-manager_2",
+        "home-manager-u": "home-manager-u",
         "nix-rice": "nix-rice",
         "nixos-generators": "nixos-generators",
         "nixos-hardware": "nixos-hardware",
diff --git a/flake.nix b/flake.nix
index fbea03d..aac890c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -10,7 +10,10 @@
       url = "github:nix-community/home-manager/release-24.05";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    # home-manager-u = { url = "github:nix-community/home-manager"; inputs = { nixpkgs.follows = "nixpkgs-u"; }; };
+    home-manager-u = {
+      url = "github:nix-community/home-manager";
+      inputs = { nixpkgs.follows = "nixpkgs-u"; };
+    };
 
     agenix = {
       url = "github:ryantm/agenix";
@@ -44,6 +47,7 @@
     , nixpkgs
     , nixpkgs-u
     , home-manager
+    , home-manager-u
     , agenix
     , deploy-rs
     , flake-utils
@@ -192,10 +196,10 @@
         }
       ];
 
-      # homeManagerUModules = [
-      #   home-manager-u.nixosModules.default
-      #   { home-manager = { useGlobalPkgs = true; useUserPackages = true; }; }
-      # ];
+      homeManagerUModules = [
+        home-manager-u.nixosModules.default
+        { home-manager = { useGlobalPkgs = true; useUserPackages = true; }; }
+      ];
 
       commonModules = [
         # Nix configuration
@@ -232,7 +236,7 @@
 
       thorConfig = {
         nixosConfigurations = {
-          thor = nixpkgs.lib.nixosSystem {
+          thor = nixpkgs-u.lib.nixosSystem {
             system = "x86_64-linux";
             modules =
               commonModules
@@ -259,7 +263,7 @@
 
                 ./modules/nixos/musa.nix
               ]
-              ++ homeManagerModules
+              ++ homeManagerUModules
               ++ [{ home-manager.users.bertof = import ./instances/thor/hm.nix; }];
           };
         };
@@ -412,8 +416,8 @@
               ++ homeManagerModules
               ++ [
                 {
-                  home-manager.users.bertof = import ./instances/loki/hm.nix;
-                  home-manager.users.tiziano = import ./instances/loki/hm_tiziano.nix;
+                  # home-manager.users.bertof = import ./instances/loki/hm.nix;
+                  # home-manager.users.tiziano = import ./instances/loki/hm_tiziano.nix;
                 }
               ];
           };
diff --git a/instances/thor/configuration.nix b/instances/thor/configuration.nix
index 335c107..e1e78df 100644
--- a/instances/thor/configuration.nix
+++ b/instances/thor/configuration.nix
@@ -69,18 +69,19 @@
     nvidia = {
       # modesetting.enable = true;
       nvidiaSettings = true;
-      package = config.boot.kernelPackages.nvidiaPackages.mkDriver {
-        version = "555.58.02";
-
-        sha256_64bit = "sha256-xctt4TPRlOJ6r5S54h5W6PT6/3Zy2R4ASNFPu8TSHKM=";
-        sha256_aarch64 = lib.fakeSha256;
-        openSha256 = lib.fakeSha256;
-        settingsSha256 = "sha256-ZpuVZybW6CFN/gz9rx+UJvQ715FZnAOYfHn5jt5Z2C8=";
-        persistencedSha256 = lib.fakeSha256;
-      };
+      # package = config.boot.kernelPackages.nvidiaPackages.mkDriver {
+      #   version = "555.58.02";
+      #
+      #   sha256_64bit = "sha256-xctt4TPRlOJ6r5S54h5W6PT6/3Zy2R4ASNFPu8TSHKM=";
+      #   sha256_aarch64 = lib.fakeSha256;
+      #   openSha256 = lib.fakeSha256;
+      #   settingsSha256 = "sha256-ZpuVZybW6CFN/gz9rx+UJvQ715FZnAOYfHn5jt5Z2C8=";
+      #   persistencedSha256 = lib.fakeSha256;
+      # };
+      open = true;
     };
 
-    opengl.enable = true;
+    graphics.enable = true;
     bluetooth = {
       enable = true;
       # package = pkgs.bluezFull;
@@ -289,8 +290,6 @@
     '';
   };
 
-  sound.enable = false;
-
   users.users.bertof = {
     isNormalUser = true;
     extraGroups = [
diff --git a/instances/thor/hm.nix b/instances/thor/hm.nix
index 577cb72..9c89af4 100644
--- a/instances/thor/hm.nix
+++ b/instances/thor/hm.nix
@@ -13,55 +13,55 @@
     };
     packages = builtins.attrValues {
       inherit (pkgs)
+        # electrum
+        # element-desktop # matrix client
+        # evolution
+        # freecad
+        # geary
+        # gnome-calendar
+        # gnome-sound-recorder
+        # krita
+        # minecraft
+        # mycrypto
+        # pcmanfm
+        # pulseaudio
+        # retroarchFull
+        # seahorse
+        # shotwell
+        # signal-desktop
+        # slack
+        # wineFull
         authenticator
         brave
         discord
         droidcam
-        # electrum
-        # element-desktop # matrix client
+        eog
         evince
-        # evolution
-        # freecad
+        file-roller
         gallery-dl
         geeqie
+        gnome-font-viewer
+        gnome-screenshot
+        gnome-system-monitor
         gucharmap
         inkscape
-        # krita
-        # minecraft
-        # mycrypto
         openvpn
         p7zip
         pavucontrol
-        # pcmanfm
         procps
-        # pulseaudio
         pulseaudio
-        # retroarchFull
-        # shotwell
-        # signal-desktop
         skypeforlinux
-        # slack
         spotify
         tdesktop
         teams-for-linux
         thunderbird
+        totem
         transmission-gtk
-        # wineFull
         wireguard-tools
         xournalpp
         zoom-us
         ;
       inherit (pkgs.gnome)
-        eog
-        file-roller
-        # geary
-        # gnome-calendar
-        gnome-font-viewer
-        gnome-screenshot
-        # gnome-sound-recorder
-        gnome-system-monitor
-        # seahorse
-        totem
         ;
       inherit (pkgs.unstable_pkgs) heroic;
     };
diff --git a/modules/hm/development/kubernetes.nix b/modules/hm/development/kubernetes.nix
index e18d3d9..5ae63e0 100644
--- a/modules/hm/development/kubernetes.nix
+++ b/modules/hm/development/kubernetes.nix
@@ -18,7 +18,7 @@
       # pkgs.kustomize
       pkgs.k9s
       pkgs.awscli2
-      pkgs.openlens
+      pkgs.lens
       pkgs.unstable_pkgs.kubevirt
     ];
   };
diff --git a/modules/hm/nautilus.nix b/modules/hm/nautilus.nix
index 0ea6bfd..a0203ab 100644
--- a/modules/hm/nautilus.nix
+++ b/modules/hm/nautilus.nix
@@ -1,7 +1,7 @@
 { pkgs, ... }:
 {
   home.packages = [
-    pkgs.gnome.nautilus
-    pkgs.gnome.sushi
+    pkgs.nautilus
+    pkgs.sushi
   ];
 }
diff --git a/modules/hm/nemo.nix b/modules/hm/nemo.nix
index 73931be..ea9771f 100644
--- a/modules/hm/nemo.nix
+++ b/modules/hm/nemo.nix
@@ -1,4 +1,4 @@
 { pkgs, ... }:
 {
-  home.packages = builtins.attrValues { inherit (pkgs.cinnamon) nemo; };
+  home.packages = builtins.attrValues { inherit (pkgs) nemo; };
 }
diff --git a/modules/hm/sxhkd.nix b/modules/hm/sxhkd.nix
index 378d21a..509ced5 100644
--- a/modules/hm/sxhkd.nix
+++ b/modules/hm/sxhkd.nix
@@ -86,7 +86,7 @@
     {
       enable = true;
       keybindings = {
-        "{,shift+}Print" = "${pkgs.gnome.gnome-screenshot}/bin/gnome-screenshot {-i,-a}";
+        "{,shift+}Print" = "${pkgs.gnome-screenshot}/bin/gnome-screenshot {-i,-a}";
         "XF86Audio{LowerVolume,Mute,RaiseVolume}" = "${pamixer} {-d 2 -u,-t,-i 2 -u} && ${notifyVolume}";
         "XF86Audio{Next,Play,Prev}" = "${playerctl} {next,play-pause,previous}";
         "XF86MonBrightness{Up,Down}" = "${xbacklight} -{inc,dec} 10 && ${notifyBrightness}";