diff --git a/common.nix b/common.nix
index fd6889a..89ce4f0 100644
--- a/common.nix
+++ b/common.nix
@@ -13,7 +13,7 @@
   nix = {
     package = pkgs.nixFlakes;
     extraOptions = "experimental-features = nix-command flakes";
-    nixPath = [ "nixpkgs=${inputs.nixpkgs-unstable}" ];
+    nixPath = [ "nixpkgs=${inputs.nixpkgs}" ];
     settings = {
       substituters = [
         "https://nix-community.cachix.org"
diff --git a/flake.lock b/flake.lock
index 3a38e9a..f29b09e 100644
--- a/flake.lock
+++ b/flake.lock
@@ -28,11 +28,11 @@
         "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
-        "lastModified": 1728698619,
-        "narHash": "sha256-DcJvKq0HDrPc2PHw9mtXzaiGYiAG2SgQPHov36voDkU=",
+        "lastModified": 1728839477,
+        "narHash": "sha256-HXWknm3vRHknK0yKdlO1qKFxO6f8lJHaufFekxjL4RY=",
         "owner": "nix-community",
         "repo": "emacs-overlay",
-        "rev": "eac5f2748d0719b747e21b486c1686aa1e23a9ae",
+        "rev": "1ac99536bb5eb9b2b4fc161bd0651bcbbb36c6d9",
         "type": "github"
       },
       "original": {
@@ -182,16 +182,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1726989464,
-        "narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=",
+        "lastModified": 1728791962,
+        "narHash": "sha256-nr5QiXwQcZmf6/auC1UpX8iAtINMtdi2mH+OkqJQVmU=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176",
+        "rev": "64c6325b28ebd708653dd41d88f306023f296184",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-24.05",
+        "ref": "master",
         "repo": "home-manager",
         "type": "github"
       }
@@ -257,11 +257,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1728500571,
-        "narHash": "sha256-dOymOQ3AfNI4Z337yEwHGohrVQb4yPODCW9MDUyAc4w=",
+        "lastModified": 1728740863,
+        "narHash": "sha256-u+rxA79a0lyhG+u+oPBRtTDtzz8kvkc9a6SWSt9ekVc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "d51c28603def282a24fa034bcb007e2bcb5b5dd0",
+        "rev": "a3f9ad65a0bf298ed5847629a57808b97e6e8077",
         "type": "github"
       },
       "original": {
@@ -271,7 +271,7 @@
         "type": "github"
       }
     },
-    "nixpkgs-unstable": {
+    "nixpkgs_2": {
       "locked": {
         "lastModified": 1728492678,
         "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=",
@@ -287,22 +287,6 @@
         "type": "github"
       }
     },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1728627514,
-        "narHash": "sha256-r+SF9AnHrTg+bk6YszoKfV9lgyw+yaFUQe0dOjI0Z2o=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "c505ebf777526041d792a49d5f6dd4095ea391a7",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-24.05",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "nixvim": {
       "inputs": {
         "devshell": "devshell",
@@ -337,7 +321,6 @@
         "flameshot-git": "flameshot-git",
         "home-manager": "home-manager",
         "nixpkgs": "nixpkgs_2",
-        "nixpkgs-unstable": "nixpkgs-unstable",
         "nixvim": "nixvim",
         "vim-org-roam": "vim-org-roam",
         "vim-yazi": "vim-yazi"
@@ -398,11 +381,11 @@
     "vim-yazi": {
       "flake": false,
       "locked": {
-        "lastModified": 1728500095,
-        "narHash": "sha256-zaA/YJyqjA6jX25uelWYFVW4iMJ7eza1b/LH6RWo30U=",
+        "lastModified": 1728834368,
+        "narHash": "sha256-hvrtjNkieHFs/VzeEPlI+nkFoTsRX/c32bBOjXPBwpM=",
         "owner": "mikavilpas",
         "repo": "yazi.nvim",
-        "rev": "1e8d63d85176d5e0cca191fd6c5847839b65bfa8",
+        "rev": "bff42c2ead02675d66e31799d2f3edaba29a4c79",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 79951a6..a37f37b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,9 +1,8 @@
 {
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
-    nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
     home-manager = {
-      url = "github:nix-community/home-manager/release-24.05";
+      url = "github:nix-community/home-manager/master";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     emacs-overlay.url = "github:nix-community/emacs-overlay";
@@ -29,7 +28,6 @@
     inputs@{
       self,
       nixpkgs,
-      nixpkgs-unstable,
       ...
     }:
     let
@@ -51,8 +49,8 @@
             ];
           overlays = extraOverlays ++ (pkgs.lib.attrValues self.overlays);
         };
-      pkgs = mkPkgs nixpkgs [ self.overlay ];
-      pkgs-unstable = mkPkgs nixpkgs-unstable [ ];
+
+      pkgs = mkPkgs nixpkgs [ ];
 
       lib = nixpkgs.lib.extend (
         self: super: {
@@ -66,8 +64,6 @@
     {
       lib = lib.my;
 
-      overlay = final: prev: { unstable = pkgs-unstable; };
-
       overlays = {
         my = import ./overlay.nix;
       };
diff --git a/hosts/nixos-desktop/hardware-configuration.nix b/hosts/nixos-desktop/hardware-configuration.nix
index ae91db7..b152594 100644
--- a/hosts/nixos-desktop/hardware-configuration.nix
+++ b/hosts/nixos-desktop/hardware-configuration.nix
@@ -63,10 +63,9 @@
   networking.useNetworkd = true;
   networking.interfaces.enp31s0.useDHCP = true;
 
-  hardware.opengl = {
+  hardware.graphics = {
     enable = true;
-    driSupport = true;
-    driSupport32Bit = true;
+    enable32Bit = true;
     extraPackages = with pkgs; [
       rocm-opencl-icd
       rocm-opencl-runtime
diff --git a/modules/apps/rofi/rofi.nix b/modules/apps/rofi/rofi.nix
index f476efa..c9780e7 100644
--- a/modules/apps/rofi/rofi.nix
+++ b/modules/apps/rofi/rofi.nix
@@ -38,7 +38,7 @@ in
         };
         theme = ./theme.rasi;
       };
-      home.packages = with pkgs.unstable; [
+      home.packages = with pkgs; [
         paper-icon-theme
         rofi-power-menu
       ];
diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix
index f3110dd..2d2df5c 100644
--- a/modules/desktop/default.nix
+++ b/modules/desktop/default.nix
@@ -23,7 +23,7 @@ in
   config = lib.mkIf config.modules.desktop.wm.enable {
 
     fonts = {
-      packages = with pkgs.unstable; [
+      packages = with pkgs; [
         corefonts # Microsoft free fonts
         noto-fonts-emoji
         meslo-lg
@@ -151,7 +151,7 @@ in
         sessionVariables.EDITOR = "vim";
 
         packages =
-          (with pkgs.unstable; [
+          (with pkgs; [
             brave
             ungoogled-chromium
             mullvad-browser
diff --git a/modules/desktop/file-manager.nix b/modules/desktop/file-manager.nix
index da3f5a9..d6afe1e 100644
--- a/modules/desktop/file-manager.nix
+++ b/modules/desktop/file-manager.nix
@@ -17,7 +17,7 @@ in
 
       programs.yazi = {
         enable = true;
-        package = pkgs.unstable.yazi;
+        package = pkgs.yazi;
         enableZshIntegration = true;
         settings = {
           manager = {
@@ -73,7 +73,7 @@ in
       };
 
       home = {
-        packages = with pkgs.unstable; [
+        packages = with pkgs; [
           ffmpegthumbnailer
           unar
           poppler
diff --git a/modules/desktop/flameshot.nix b/modules/desktop/flameshot.nix
index 7087492..442170d 100644
--- a/modules/desktop/flameshot.nix
+++ b/modules/desktop/flameshot.nix
@@ -37,7 +37,7 @@ in
             };
           };
         };
-        home.packages = with pkgs.unstable; [ grim ];
+        home.packages = [ pkgs.grim ];
 
       };
   };
diff --git a/modules/desktop/terminal.nix b/modules/desktop/terminal.nix
index 3274c32..3c392da 100644
--- a/modules/desktop/terminal.nix
+++ b/modules/desktop/terminal.nix
@@ -28,7 +28,7 @@ in
           "ctrl+shift+semicolon" = "scroll_to_prompt 1";
           "ctrl+shift+t" = "new_tab_with_cwd";
         };
-        theme = "Gruvbox Dark";
+        themeFile = "gruvbox-dark";
       };
     };
   };
diff --git a/modules/desktop/themes/gtk.nix b/modules/desktop/themes/gtk.nix
index 5413efd..c7e1ccc 100644
--- a/modules/desktop/themes/gtk.nix
+++ b/modules/desktop/themes/gtk.nix
@@ -39,11 +39,11 @@ in
       gtk = {
         enable = true;
         cursorTheme = {
-          package = pkgs.unstable.paper-icon-theme;
+          package = pkgs.paper-icon-theme;
           name = "Paper";
         };
         theme = {
-          package = pkgs.unstable.adw-gtk3;
+          package = pkgs.adw-gtk3;
           name = "adw-gtk3";
         };
         iconTheme = {
@@ -63,7 +63,7 @@ in
 
       home = {
         pointerCursor = {
-          package = pkgs.unstable.paper-icon-theme;
+          package = pkgs.paper-icon-theme;
           name = "Paper";
           size = 24;
           gtk.enable = true;
diff --git a/modules/desktop/themes/qt.nix b/modules/desktop/themes/qt.nix
index 3d81b16..a8ad5e6 100644
--- a/modules/desktop/themes/qt.nix
+++ b/modules/desktop/themes/qt.nix
@@ -28,7 +28,7 @@ in
         platformTheme.name = "gtk";
         style = {
           name = "adwaita-dark";
-          package = pkgs.unstable.adwaita-qt;
+          package = pkgs.adwaita-qt;
         };
       };
     };
diff --git a/modules/desktop/wm.nix b/modules/desktop/wm.nix
index f578eac..40da5e7 100644
--- a/modules/desktop/wm.nix
+++ b/modules/desktop/wm.nix
@@ -116,7 +116,6 @@ in
 
       wayland.windowManager.hyprland = {
         enable = true;
-        # package = pkgs.unstable.hyprland;
         systemd.enable = true;
         xwayland.enable = true;
         settings = {
@@ -417,7 +416,7 @@ in
       };
 
       home = {
-        packages = with pkgs.unstable; [
+        packages = with pkgs; [
           wlr-randr
           wl-clipboard
           wdisplays
@@ -486,7 +485,7 @@ in
       ];
     };
 
-    hardware.opengl.enable = true;
+    hardware.graphics.enable = true;
 
     security.pam.services.swaylock = { };
 
diff --git a/modules/editor/emacs/emacs.nix b/modules/editor/emacs/emacs.nix
index 4a367ea..df1702f 100644
--- a/modules/editor/emacs/emacs.nix
+++ b/modules/editor/emacs/emacs.nix
@@ -21,61 +21,61 @@ in
 
       home = {
         packages = [
-          pkgs.unstable.binutils
-          pkgs.unstable.ripgrep
-          pkgs.unstable.fd
-          pkgs.unstable.findutils.locate
-          pkgs.unstable.python311
-          pkgs.unstable.libsecret
-          pkgs.unstable.gcc
-          pkgs.unstable.gnumake
-          pkgs.unstable.cmake
-          pkgs.unstable.nodejs
+          pkgs.binutils
+          pkgs.ripgrep
+          pkgs.fd
+          pkgs.findutils.locate
+          pkgs.python311
+          pkgs.libsecret
+          pkgs.gcc
+          pkgs.gnumake
+          pkgs.cmake
+          pkgs.nodejs
 
-          pkgs.unstable.opentofu
-          pkgs.unstable.pandoc
+          pkgs.opentofu
+          pkgs.pandoc
 
           # Formatters and linters
-          pkgs.unstable.nixfmt-rfc-style # nix formatter
-          pkgs.unstable.nixpkgs-fmt
-          pkgs.unstable.shfmt # sh formatter
-          pkgs.unstable.shellcheck # sh linter
-          pkgs.unstable.html-tidy # HTML formatter
-          pkgs.unstable.nodePackages.stylelint # CSS linter
-          pkgs.unstable.nodePackages.js-beautify # JS/CSS/HTML formatter
+          pkgs.nixfmt-rfc-style # nix formatter
+          pkgs.nixpkgs-fmt
+          pkgs.shfmt # sh formatter
+          pkgs.shellcheck # sh linter
+          pkgs.html-tidy # HTML formatter
+          pkgs.nodePackages.stylelint # CSS linter
+          pkgs.nodePackages.js-beautify # JS/CSS/HTML formatter
 
           # LSPs
-          pkgs.unstable.coursier
+          pkgs.coursier
           # metals # Scala
 
           # Nix
-          pkgs.unstable.nil
+          pkgs.nil
 
           pkgs.phpactor # PHP
           #OCaml
-          pkgs.unstable.ocaml
-          pkgs.unstable.dune_3
-          pkgs.unstable.ocamlPackages.ocaml-lsp
-          pkgs.unstable.ocamlPackages.ocamlformat
-          pkgs.unstable.ocamlPackages.utop
-          pkgs.unstable.ocamlPackages.ocp-indent
-          pkgs.unstable.ocamlPackages.merlin
+          pkgs.ocaml
+          pkgs.dune_3
+          pkgs.ocamlPackages.ocaml-lsp
+          pkgs.ocamlPackages.ocamlformat
+          pkgs.ocamlPackages.utop
+          pkgs.ocamlPackages.ocp-indent
+          pkgs.ocamlPackages.merlin
 
           # Used by org-roam
-          pkgs.unstable.sqlite
-          pkgs.unstable.graphviz
+          pkgs.sqlite
+          pkgs.graphviz
 
           # Used by elfeed-tube
-          pkgs.unstable.yt-dlp
-          pkgs.unstable.mpv
+          pkgs.yt-dlp
+          pkgs.mpv
 
           # Used by dirvish
-          pkgs.unstable.imagemagick
-          pkgs.unstable.ffmpegthumbnailer
-          pkgs.unstable.mediainfo
-          pkgs.unstable.poppler
-          pkgs.unstable.gnutar
-          pkgs.unstable.unzip
+          pkgs.imagemagick
+          pkgs.ffmpegthumbnailer
+          pkgs.mediainfo
+          pkgs.poppler
+          pkgs.gnutar
+          pkgs.unzip
         ];
         sessionPath = [ "${config.home-manager.users.${config.user.name}.xdg.configHome}/emacs/bin" ];
         activation = {
@@ -96,7 +96,7 @@ in
 
       programs.emacs = {
         enable = true;
-        package = pkgs.unstable.emacs29.override {
+        package = pkgs.emacs29.override {
           withNativeCompilation = true;
           withPgtk = true;
           withSQLite3 = true;
diff --git a/modules/editor/vim/vim.nix b/modules/editor/vim/vim.nix
index ce0e685..6e7b004 100644
--- a/modules/editor/vim/vim.nix
+++ b/modules/editor/vim/vim.nix
@@ -20,12 +20,12 @@ in
 
       programs.neovim = {
         enable = true;
-        package = pkgs.unstable.neovim-unwrapped;
+        package = pkgs.neovim-unwrapped;
         vimAlias = true;
         vimdiffAlias = true;
         withNodeJs = true;
         plugins =
-          (with pkgs.unstable.vimPlugins; [
+          (with pkgs.vimPlugins; [
             # base distro
             LazyVim
             conform-nvim
@@ -141,7 +141,7 @@ in
           gcc # needed for nvim-treesitter
 
           # HTML, CSS, JSON
-          unstable.vscode-langservers-extracted
+          vscode-langservers-extracted
 
           # Nix
           nixd
@@ -264,7 +264,7 @@ in
 
       programs.nixvim = {
         enable = false;
-        package = pkgs.unstable.neovim-unwrapped;
+        package = pkgs.neovim-unwrapped;
         vimAlias = true;
 
         keymaps = [
@@ -328,7 +328,7 @@ in
                   '';
               }
               {
-                pkg = pkgs.unstable.vimPlugins.which-key-nvim;
+                pkg = pkgs.vimPlugins.which-key-nvim;
                 event = "VimEnter";
                 config = # lua
                   ''
@@ -404,24 +404,24 @@ in
                       setup("terraformls", {})
                       setup("marksman", {})
                       setup("lua_ls", {})
-                      setup("jsonls", { cmd = { "${pkgs.unstable.vscode-langservers-extracted}/bin/vscode-json-language-server", "--stdio" } })
-                      setup("html", { cmd = { "${pkgs.unstable.vscode-langservers-extracted}/bin/vscode-html-language-server", "--stdio" } })
-                      setup("eslint", { cmd = { "${pkgs.unstable.vscode-langservers-extracted}/bin/vscode-eslint-language-server", "--stdio" } })
-                      setup("dockerls", { cmd = { "${pkgs.unstable.dockerfile-language-server-nodejs}/bin/docker-langserver", "--stdio" } })
+                      setup("jsonls", { cmd = { "${pkgs.vscode-langservers-extracted}/bin/vscode-json-language-server", "--stdio" } })
+                      setup("html", { cmd = { "${pkgs.vscode-langservers-extracted}/bin/vscode-html-language-server", "--stdio" } })
+                      setup("eslint", { cmd = { "${pkgs.vscode-langservers-extracted}/bin/vscode-eslint-language-server", "--stdio" } })
+                      setup("dockerls", { cmd = { "${pkgs.dockerfile-language-server-nodejs}/bin/docker-langserver", "--stdio" } })
                       setup("docker_compose_language_service", {})
-                      setup("cssls", { cmd = { "${pkgs.unstable.vscode-langservers-extracted}/bin/vscode-css-language-server", "--stdio" } })
+                      setup("cssls", { cmd = { "${pkgs.vscode-langservers-extracted}/bin/vscode-css-language-server", "--stdio" } })
                       setup("bashls", {})
-                      setup("ansiblels", { cmd = { "${pkgs.unstable.ansible-language-server}/bin/ansible-language-server", "--stdio" } })
+                      setup("ansiblels", { cmd = { "${pkgs.ansible-language-server}/bin/ansible-language-server", "--stdio" } })
                     end
                   '';
               }
               {
-                pkg = pkgs.unstable.vimPlugins.nvim-cmp;
+                pkg = pkgs.vimPlugins.nvim-cmp;
                 event = "InsertEnter";
                 dependencies = [
-                  pkgs.unstable.vimPlugins.cmp-nvim-lsp
-                  pkgs.unstable.vimPlugins.cmp-path
-                  pkgs.unstable.vimPlugins.cmp-buffer
+                  pkgs.vimPlugins.cmp-nvim-lsp
+                  pkgs.vimPlugins.cmp-path
+                  pkgs.vimPlugins.cmp-buffer
                 ];
                 opts.__raw = # lua
                   ''
@@ -452,7 +452,7 @@ in
               # Disabled for now as it tries to write org grammar to its own directory in the nix store
               # https://github.com/nvim-orgmode/orgmode/blob/95fb795a422f0455e03d13a3f83525f1d00793ad/lua/orgmode/utils/treesitter/install.lua#L9
               # {
-              #   pkg = pkgs.unstable.vimPlugins.orgmode;
+              #   pkg = pkgs.vimPlugins.orgmode;
               #   event = "VeryLazy";
               #   ft = [ "org" ];
               #   config = /*lua*/ ''
@@ -469,7 +469,7 @@ in
               #     name = "org-roam.nvim";
               #     src = inputs.vim-org-roam;
               #   });
-              #   dependencies = [ pkgs.unstable.vimPlugins.orgmode ];
+              #   dependencies = [ pkgs.vimPlugins.orgmode ];
               #   event = "VeryLazy";
               #   ft = [ "org" ];
               #   config = /*lua*/ ''
@@ -485,7 +485,7 @@ in
         };
       };
 
-      home.packages = with pkgs.unstable; [
+      home.packages = with pkgs; [
         ripgrep
         fd
         nodejs
diff --git a/modules/hardware/audio.nix b/modules/hardware/audio.nix
index ab2f5a2..02d44fd 100644
--- a/modules/hardware/audio.nix
+++ b/modules/hardware/audio.nix
@@ -14,7 +14,6 @@ in
   };
 
   config = lib.mkIf cfg.enable {
-    sound.enable = true;
 
     security.rtkit.enable = true;
 
@@ -24,7 +23,7 @@ in
     };
 
     home-manager.users.${config.user.name} = {
-      home.packages = with pkgs.unstable; [ pulsemixer ];
+      home.packages = [ pkgs.pulsemixer ];
     };
   };
 }
diff --git a/modules/media/ncmpcpp/ncmpcpp.nix b/modules/media/ncmpcpp/ncmpcpp.nix
index 2fc6d16..285cf52 100644
--- a/modules/media/ncmpcpp/ncmpcpp.nix
+++ b/modules/media/ncmpcpp/ncmpcpp.nix
@@ -17,7 +17,7 @@ in
     home-manager.users.${config.user.name} = {
 
       home = {
-        packages = with pkgs.unstable; [
+        packages = with pkgs; [
           (ncmpcpp.override { visualizerSupport = true; })
           mpc_cli
         ];