diff --git a/flake.nix b/flake.nix
index 65b1092..a2db98b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,12 +1,14 @@
 {
   description = "Home Manager configuration of julian";
 
-  inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
+  inputs = rec {
+    nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.05";
     nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
 
+    nixpkgs = nixpkgs-unstable;
+
     home-manager = {
-      url = "github:nix-community/home-manager/release-24.05";
+      url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
diff --git a/homes/x86_64-linux/julian@aspi/default.nix b/homes/x86_64-linux/julian@aspi/default.nix
index eda9cea..9a41104 100644
--- a/homes/x86_64-linux/julian@aspi/default.nix
+++ b/homes/x86_64-linux/julian@aspi/default.nix
@@ -58,11 +58,11 @@
       # neocmakelsp # cmake
 
       # Rust setup
-      unstable.rustc
-      unstable.rustfmt
-      unstable.cargo
-      unstable.clippy
-      unstable.rust-analyzer
+      rustc
+      rustfmt
+      cargo
+      clippy
+      rust-analyzer
 
       # Further tools
       cntr # nix debugger
diff --git a/homes/x86_64-linux/julian@aspi/packages.nix b/homes/x86_64-linux/julian@aspi/packages.nix
index 5bc95ab..d623b88 100644
--- a/homes/x86_64-linux/julian@aspi/packages.nix
+++ b/homes/x86_64-linux/julian@aspi/packages.nix
@@ -10,7 +10,7 @@ with pkgs;
 
   # makemkv
   audacity
-  gnome.cheese
+  cheese
   zoom-us
   qutebrowser
 
@@ -41,7 +41,7 @@ with pkgs;
   tdesktop # telegram
 
   tealdeer
-  gcolor2 # gcolor3 does not work
+  gcolor3
   # cups
   wget
   nodejs
@@ -68,8 +68,8 @@ with pkgs;
   usbutils # lsusb
   pciutils # lspci
 
-  gnome.gnome-keyring
-  gnome.seahorse
+  gnome-keyring
+  seahorse
   polkit_gnome
   nix-index
   python3
@@ -151,7 +151,7 @@ with pkgs;
 
   audible-cli
 
-  unstable.path-of-building
+  path-of-building
 
   conda
   watchexec # Run command when any file in current dir changes
diff --git a/homes/x86_64-linux/julian@kardorf/packages.nix b/homes/x86_64-linux/julian@kardorf/packages.nix
index 3d885f4..0ad12de 100644
--- a/homes/x86_64-linux/julian@kardorf/packages.nix
+++ b/homes/x86_64-linux/julian@kardorf/packages.nix
@@ -6,11 +6,11 @@ with pkgs;
   shellcheck
 
   # Rust setup
-  unstable.rustc
-  unstable.rustfmt
-  unstable.cargo
-  unstable.clippy
-  unstable.rust-analyzer
+  rustc
+  rustfmt
+  cargo
+  clippy
+  rust-analyzer
 
   # Further tools
   lazygit
@@ -18,7 +18,7 @@ with pkgs;
 
   # makemkv
   audacity
-  gnome.cheese
+  cheese
   zoom-us
   qutebrowser
 
@@ -54,7 +54,7 @@ with pkgs;
   tdesktop # telegram
 
   tealdeer
-  gcolor2 # gcolor3 does not work
+  gcolor3
   # cups
   wget
   gparted
@@ -83,8 +83,8 @@ with pkgs;
   usbutils # lsusb
   pciutils # lspci
 
-  gnome.gnome-keyring
-  gnome.seahorse
+  gnome-keyring
+  seahorse
   polkit_gnome
   nix-index
   python3
@@ -162,7 +162,7 @@ with pkgs;
   # cudaPackages.cudatoolkit
   # openmvg
   # colmapWithCuda
-  unstable.path-of-building
+  path-of-building
 
   nheko
 
diff --git a/homes/x86_64-linux/julian@v3ms/packages.nix b/homes/x86_64-linux/julian@v3ms/packages.nix
index db8f824..3fe1e18 100644
--- a/homes/x86_64-linux/julian@v3ms/packages.nix
+++ b/homes/x86_64-linux/julian@v3ms/packages.nix
@@ -3,11 +3,11 @@
 with pkgs;
 [
   # Rust setup
-  unstable.rustc
-  unstable.rustfmt
-  unstable.cargo
-  unstable.clippy
-  unstable.rust-analyzer
+  rustc
+  rustfmt
+  cargo
+  clippy
+  rust-analyzer
 
   # Further tools
   cntr # nix debugger
diff --git a/overlays/unstable/default.nix b/overlays/unstable/default.nix
index ef047aa..ae79c4b 100644
--- a/overlays/unstable/default.nix
+++ b/overlays/unstable/default.nix
@@ -6,12 +6,16 @@
 # pull packages into your overlay.
 #
 # All other arguments for this function are your flake inputs.
-{ nixpkgs-unstable, ... }:
+{ nixpkgs-stable, nixpkgs-unstable, ... }:
 final: prev: {
-  # unstable = nixpkgs-unstable.legacyPackages.${prev.system};
   # use this variant if unfree packages are needed:
   unstable = import nixpkgs-unstable {
     system = prev.system;
     config.allowUnfree = true;
   };
+  # use this variant if unfree packages are needed:
+  stable = import nixpkgs-stable {
+    system = prev.system;
+    config.allowUnfree = true;
+  };
 }
diff --git a/packages/hyprshot-gui/default.nix b/packages/hyprshot-gui/default.nix
index 279e9fa..725d086 100644
--- a/packages/hyprshot-gui/default.nix
+++ b/packages/hyprshot-gui/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   buildInputs = with pkgs; [
     bash
     hyprshot
-    gnome.zenity
+    zenity
   ];
 
   dontBuild = true;
diff --git a/systems/x86_64-linux/aspi/default.nix b/systems/x86_64-linux/aspi/default.nix
index f471126..1804c76 100644
--- a/systems/x86_64-linux/aspi/default.nix
+++ b/systems/x86_64-linux/aspi/default.nix
@@ -157,7 +157,6 @@
   };
 
   # Sound
-  sound.enable = true;
   hardware.pulseaudio.enable = false;
 
   # needed on aspi for audio to work properly