diff --git a/instances/loki/configuration.nix b/instances/loki/configuration.nix
index 1c92c84..4cd035b 100644
--- a/instances/loki/configuration.nix
+++ b/instances/loki/configuration.nix
@@ -300,7 +300,6 @@ in
   services.home-assistant = {
     enable = true;
     openFirewall = true;
-    # package = pkgs.unstable_pkgs.home-assistant;
     config = {
       default_config = { };
 
diff --git a/instances/odin/configuration-nvidia.nix b/instances/odin/configuration-nvidia.nix
index 0822725..ab29c90 100644
--- a/instances/odin/configuration-nvidia.nix
+++ b/instances/odin/configuration-nvidia.nix
@@ -5,24 +5,19 @@
 , ...
 }:
 {
+  boot.initrd.kernelModules = [ "i915" ];
 
-  boot = {
-    initrd.kernelModules = [ "i915" ];
-    # kernelPackages = pkgs.unstable_pkgs.linuxPackages;
-  };
-
-  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";
-      };
+  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/thor/hm.nix b/instances/thor/hm.nix
index f342311..44ceee5 100644
--- a/instances/thor/hm.nix
+++ b/instances/thor/hm.nix
@@ -130,7 +130,7 @@
     # ../../modules/hm/screen_locker.nix
     # ../../modules/hm/security.nix
     # ../../modules/hm/spotifyd.nix
-    ../../modules/hm/sxhkd.nix
+    # ../../modules/hm/sxhkd.nix
     ../../modules/hm/syncthing.nix
     # ../../modules/hm/thunar.nix
     # ../../modules/hm/twmn.nix
diff --git a/modules/hm/blender_nvidia.nix b/modules/hm/blender_nvidia.nix
index 8f9aa3a..e7b6451 100644
--- a/modules/hm/blender_nvidia.nix
+++ b/modules/hm/blender_nvidia.nix
@@ -1,4 +1,4 @@
 { pkgs, ... }:
 {
-  home.packages = [ (pkgs.unstable_pkgs.blender.override { cudaSupport = true; }) ];
+  home.packages = [ (pkgs.blender.override { cudaSupport = true; }) ];
 }
diff --git a/modules/hm/development/database.nix b/modules/hm/development/database.nix
index 1e97f58..99ba012 100644
--- a/modules/hm/development/database.nix
+++ b/modules/hm/development/database.nix
@@ -1,4 +1,4 @@
 { pkgs, ... }:
 {
-  home.packages = builtins.attrValues { inherit (pkgs.unstable_pkgs.jetbrains) datagrip jdk; };
+  home.packages = builtins.attrValues { inherit (pkgs.jetbrains) datagrip jdk; };
 }
diff --git a/modules/hm/joshuto.nix b/modules/hm/joshuto.nix
index 3294b77..d7182df 100644
--- a/modules/hm/joshuto.nix
+++ b/modules/hm/joshuto.nix
@@ -5,7 +5,7 @@ in
 {
   # TODO: switch to module on next release
 
-  home.packages = [ pkgs.unstable_pkgs.joshuto ];
+  home.packages = [ pkgs.joshuto ];
   home.shellAliases."fm" = "joshuto --change-directory";
 
   xdg.configFile = {
diff --git a/modules/hm/nix-index.nix b/modules/hm/nix-index.nix
index 61f1fc5..c38d223 100644
--- a/modules/hm/nix-index.nix
+++ b/modules/hm/nix-index.nix
@@ -1,7 +1,6 @@
 {
   programs.nix-index = {
     enable = true;
-    # package = pkgs.unstable_pkgs.nix-index;
     enableBashIntegration = true;
     enableZshIntegration = true;
   };
diff --git a/modules/hm/pro_audio.nix b/modules/hm/pro_audio.nix
index 7590b7f..a3c45bb 100644
--- a/modules/hm/pro_audio.nix
+++ b/modules/hm/pro_audio.nix
@@ -14,44 +14,42 @@ in
 {
   home.packages = builtins.attrValues {
     inherit (pkgs)
-      ardour
-      breeze-icons
-      carla
-      mixxx
-      rnnoise
-      #mamba
-      # zrythm
-
       # Plugins
-      aeolus
-      artyFX
-      autotalent
-      boops
-      calf
-      cardinal
-      fluidsynth
-      geonkick
-      giada
-      lsp-plugins
-      samplv1
-      sfizz
-      surge
-      surge-XT
-      talentedhack
-      vocproc
-      x42-plugins
-      zita-at1
-      zyn-fusion
-      zynaddsubfx
       # helm
       # noise-repellent
       # speech-denoiser
       # stochas
       # sunvox
       # tunefish
+      # zrythm
+      #mamba
+      aeolus
+      ardour
+      artyFX
+      autotalent
+      boops
+      breeze-icons
+      calf
+      cardinal
+      carla
+      fluidsynth
+      geonkick
+      giada
+      lsp-plugins
+      mixxx
+      rnnoise
+      samplv1
+      sfizz
+      surge
+      surge-XT
+      talentedhack
+      vital
+      vocproc
+      x42-plugins
+      zita-at1
+      zyn-fusion
+      zynaddsubfx
       ;
-
-    inherit (pkgs.unstable_pkgs) vital;
   };
 
   home.sessionVariables = variables;
diff --git a/modules/hm/pycharm.nix b/modules/hm/pycharm.nix
index 8d2aec5..ab833c5 100644
--- a/modules/hm/pycharm.nix
+++ b/modules/hm/pycharm.nix
@@ -2,6 +2,6 @@
 {
   home.packages = builtins.attrValues {
     inherit (pkgs) python3;
-    inherit (pkgs.unstable_pkgs.jetbrains) pycharm-professional jdk;
+    inherit (pkgs.jetbrains) pycharm-professional jdk;
   };
 }
diff --git a/modules/nixos/garage.nix b/modules/nixos/garage.nix
index 1b02127..93d52ec 100644
--- a/modules/nixos/garage.nix
+++ b/modules/nixos/garage.nix
@@ -1,5 +1,4 @@
-{ pkgs
-, config
+{ config
 , lib
 , ...
 }:
@@ -26,7 +25,6 @@
   };
 
   services.garage = {
-    package = pkgs.unstable_pkgs.garage;
     enable = true;
     settings = {
       replication_mode = 1;
diff --git a/modules/nixos/hyprland.nix b/modules/nixos/hyprland.nix
index 5791882..8d3ce92 100644
--- a/modules/nixos/hyprland.nix
+++ b/modules/nixos/hyprland.nix
@@ -2,7 +2,6 @@
 {
   programs.hyprland = {
     enable = true;
-    # package = pkgs.unstable_pkgs.hyprland;
     # enableNvidiaPatches = builtins.elem "nvidia" config.services.xserver.videoDrivers; # removed in 24.x
     xwayland.enable = true;
   };