diff --git a/flake.nix b/flake.nix
index c7df008..c0aaf7f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -290,15 +290,15 @@
               { home-manager.users.bertof.imports = [ ./modules/hm/hyprland.nix ]; }
 
               ./modules/nixos/musa.nix
-            ] ++ homeManagerModules ++ [{ home-manager.users.bertof = import ./instances/odin/hm.nix; }];
+            ] ++ homeManagerUModules ++ [{ home-manager.users.bertof = import ./instances/odin/hm.nix; }];
           in
           rec {
-            odin-nvidia = nixpkgs.lib.nixosSystem {
+            odin-nvidia = nixpkgs-u.lib.nixosSystem {
               system = "x86_64-linux";
               modules = commonModules ++ odinCommonModules ++ [ ./instances/odin/configuration-nvidia.nix ];
             };
 
-            odin-intel = nixpkgs.lib.nixosSystem {
+            odin-intel = nixpkgs-u.lib.nixosSystem {
               system = "x86_64-linux";
               modules = commonModules ++ odinCommonModules ++ [ ./instances/odin/configuration-intel.nix ];
             };
diff --git a/instances/odin/common_configuration.nix b/instances/odin/common_configuration.nix
index f3f24e5..b3db8c5 100644
--- a/instances/odin/common_configuration.nix
+++ b/instances/odin/common_configuration.nix
@@ -39,22 +39,9 @@
   hardware = {
     enableRedistributableFirmware = true;
 
-    pulseaudio.enable = false;
+    graphics.enable = true;
 
-    # Enable opengl support
-    opengl = {
-      enable = true;
-      driSupport = true;
-      driSupport32Bit = true;
-      extraPackages = builtins.attrValues {
-        inherit (pkgs)
-          intel-media-driver
-          vaapiIntel
-          vaapiVdpau
-          libvdpau-va-gl
-          ;
-      };
-    };
+    pulseaudio.enable = false;
 
     # Tablet
     opentabletdriver = {
@@ -332,7 +319,6 @@
   security = {
     rtkit.enable = true;
     pam.services = {
-      login.fprintAuth = true;
       xscreensaver.fprintAuth = true;
     };
   };
diff --git a/instances/odin/configuration-nvidia.nix b/instances/odin/configuration-nvidia.nix
index 9fbd749..e182b53 100644
--- a/instances/odin/configuration-nvidia.nix
+++ b/instances/odin/configuration-nvidia.nix
@@ -11,17 +11,18 @@
     kernelPackages = pkgs.unstable_pkgs.linuxPackages;
   };
 
-  hardware.nvidia = {
-    # modesetting.enable = true;
-    # package = pkgs.linuxPackages.nvidia_x11;
-
-    prime = {
-      offload.enable = false;
-      sync.enable = true;
-      intelBusId = "PCI:0:2:0";
-      nvidiaBusId = "PCI:1:0:0";
+  hardware.nvidia =
+    {
+      # modesetting.enable = true;
+      # package = pkgs.linuxPackages.nvidia_x11;
+      open = false;
+      prime = {
+        offload.enable = false;
+        sync.enable = true;
+        intelBusId = "PCI:0:2:0";
+        nvidiaBusId = "PCI:1:0:0";
+      };
     };
-  };
 
   programs.gamemode = {
     enable = true;
diff --git a/instances/odin/hm.nix b/instances/odin/hm.nix
index 6b2da36..e1c6700 100644
--- a/instances/odin/hm.nix
+++ b/instances/odin/hm.nix
@@ -13,56 +13,50 @@
     };
     packages = builtins.attrValues {
       inherit (pkgs)
+        # element-desktop # matrix client
+        # evolution
+        # freecad
+        # krita
+        # minecraft
+        # mycrypto
+        # pcmanfm
+        # pulseaudio
+        # retroarchFull
+        # shotwell
+        # signal-desktop
+        # slack
+        # wineFull
         authenticator
         brave
         cava
         discord
         droidcam
-        # element-desktop # matrix client
+        eog
         evince
-        # evolution
-        # freecad
+        file-roller
         gallery-dl
+        gnome-font-viewer
+        gnome-screenshot
+        gnome-system-monitor
         gucharmap
         inkscape
         keyboard-switch
-        # 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)
-        # geary
-        # gnome-calendar
-        # gnome-sound-recorder
-        # seahorse
-        eog
-        file-roller
-        gnome-font-viewer
-        gnome-screenshot
-        gnome-system-monitor
-        totem
-        ;
       inherit (pkgs.unstable_pkgs)
         # heroic
         proton-pass;
diff --git a/modules/nixos/hyprland.nix b/modules/nixos/hyprland.nix
index be997db..5791882 100644
--- a/modules/nixos/hyprland.nix
+++ b/modules/nixos/hyprland.nix
@@ -14,7 +14,7 @@
 
   hardware = {
     brillo.enable = true;
-    opengl.enable = true;
+    graphics.enable = true;
     nvidia.modesetting.enable = builtins.elem "nvidia" config.services.xserver.videoDrivers;
   };