diff --git a/flake.lock b/flake.lock
index 4978dab4..bd239507 100644
--- a/flake.lock
+++ b/flake.lock
@@ -183,16 +183,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1726989464,
-        "narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=",
+        "lastModified": 1730016908,
+        "narHash": "sha256-bFCxJco7d8IgmjfNExNz9knP8wvwbXU4s/d53KOK6U0=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176",
+        "rev": "e83414058edd339148dc142a8437edb9450574c8",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-24.05",
+        "ref": "master",
         "repo": "home-manager",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index fc001554..f9b2592f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -16,7 +16,7 @@
     nix-darwin.url = "github:lnl7/nix-darwin/master";
     nix-darwin.inputs.nixpkgs.follows = "nixpkgs";
 
-    home-manager.url = "github:nix-community/home-manager/release-24.05";
+    home-manager.url = "github:nix-community/home-manager/master";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
 
     flake-parts.url = "github:hercules-ci/flake-parts";
diff --git a/hosts/dumpyourvms/dumpyourvms.nix b/hosts/dumpyourvms/dumpyourvms.nix
index 1c94a33a..e86f05fd 100644
--- a/hosts/dumpyourvms/dumpyourvms.nix
+++ b/hosts/dumpyourvms/dumpyourvms.nix
@@ -45,7 +45,7 @@ in
   hardware = {
     cpu.intel.updateMicrocode = true;
     facetimehd.enable = true;
-    opengl = {
+    graphics = {
       extraPackages = with pkgs; [ intel-vaapi-driver ]; # i7-4870HQ older hardware like haswell (crystall well)
       extraPackages32 = with pkgs.pkgsi686Linux; [ intel-vaapi-driver ];
     };
diff --git a/modules/desktop-extended/default.nix b/modules/desktop-extended/default.nix
index 058c000b..e22ec6c2 100644
--- a/modules/desktop-extended/default.nix
+++ b/modules/desktop-extended/default.nix
@@ -26,7 +26,7 @@ in
       montserrat
       nerdfonts
       noto-fonts
-      noto-fonts-cjk
+      noto-fonts-cjk-sans
       open-sans
       powerline-fonts
       source-sans-pro
diff --git a/modules/graphical/default.nix b/modules/graphical/default.nix
index 9066ed43..83fad0e9 100644
--- a/modules/graphical/default.nix
+++ b/modules/graphical/default.nix
@@ -59,7 +59,7 @@ in
       style = "gtk2";
     };
 
-    services.udev.packages = with pkgs; [ gnome3.gnome-settings-daemon ];
+    services.udev.packages = with pkgs; [ gnome-settings-daemon ];
     # Enable Sushi, a quick previewer for nautilus
     services.gnome.sushi.enable = true;
     # Enable GVfs, a userspace virtual filesystem
@@ -84,14 +84,14 @@ in
       alacritty
       firefox-wayland
       flameshot
-      gnome.adwaita-icon-theme
-      gnome.eog
-      gnome.nautilus
-      gnome.seahorse
-      gnome.yelp
+      adwaita-icon-theme
+      eog
+      nautilus
+      seahorse
+      yelp
       hicolor-icon-theme
       keepassxc
-      qMasterPassword
+      qMasterPassword-wayland
       libnotify
       vlc
     ];
diff --git a/modules/graphical/sway/config/config.d/custom-keybindings.conf b/modules/graphical/sway/config/config.d/custom-keybindings.conf
index aac0eb2c..c6cf8aa2 100644
--- a/modules/graphical/sway/config/config.d/custom-keybindings.conf
+++ b/modules/graphical/sway/config/config.d/custom-keybindings.conf
@@ -25,7 +25,7 @@ bindsym $mod+Shift+F4 exec signal-desktop
 # Toggle control center
 bindsym $mod+Shift+n exec swaync-client -t -sw
 
-bindsym $mod+Shift+m exec qMasterPassword
+bindsym $mod+Shift+m exec qMasterPassword-wayland
 
 # Screenshots and screen recordings
 bindsym $mod+Ctrl+p exec grim -g "$(slurp -d -b \#ffffff11)" ~/Pictures/Screenshots/$(date +%Y%m%d_%Hh%Mm%Ss)_grim.png
diff --git a/modules/office/default.nix b/modules/office/default.nix
index e283d028..05f80883 100644
--- a/modules/office/default.nix
+++ b/modules/office/default.nix
@@ -12,7 +12,7 @@ in
 
   users.users."${psCfg.user.name}".packages = with pkgs; [
     libreoffice-fresh
-    gnome.simple-scan
+    simple-scan
     # Tools like pdfunite
     poppler_utils
     # tool for annotating PDFs
diff --git a/overlays/default.nix b/overlays/default.nix
index ccf01877..0c4fb167 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -26,8 +26,8 @@
                 };
               in
               {
-                neovim-unwrapped = unstable.neovim-unwrapped;
-                vimPlugins = unstable.vimPlugins;
+                #neovim-unwrapped = unstable.neovim-unwrapped;
+                #vimPlugins = unstable.vimPlugins;
                 #vimPlugins = prev.vimPlugins // {inherit (unstable.vimPlugins) nvim-lspconfig;};
               }
             )