diff --git a/flake.nix b/flake.nix
index 06bc753..d9b3d4c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,7 +2,7 @@
   description = "NixOS system configuration";
 
   inputs = {
-    nixpkgs.url = "nixpkgs/nixos-24.11";
+    nixpkgs.url = "nixpkgs/nixos-25.05";
     nixpkgs-unstable.url = "nixpkgs/nixos-unstable";
     # nixpkgs-master.url = "nixpkgs";
     agenix.url = "github:ryantm/agenix";
@@ -12,7 +12,7 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
     home-manager = {
-      url = "github:nix-community/home-manager/release-24.11";
+      url = "github:nix-community/home-manager/release-25.05";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     gitea-github-theme = {
@@ -30,7 +30,7 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
     nixvim = {
-      url = "github:nix-community/nixvim/nixos-24.11";
+      url = "github:nix-community/nixvim/nixos-25.05";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     pre-commit-hooks = {
@@ -41,7 +41,7 @@
       url = "git+ssh://git@git.vimium.com/jordan/nix-secrets.git";
       flake = false;
     };
-    stylix.url = "github:danth/stylix/release-24.11";
+    stylix.url = "github:danth/stylix/release-25.05";
     thunderbird-gnome-theme = {
       url = "github:rafaelmardojai/thunderbird-gnome-theme";
       flake = false;
diff --git a/hosts/common.nix b/hosts/common.nix
index d5b94d3..81684ef 100644
--- a/hosts/common.nix
+++ b/hosts/common.nix
@@ -8,7 +8,7 @@
 {
   imports = [
     inputs.agenix.nixosModules.age
-    inputs.home-manager.nixosModule
+    inputs.home-manager.nixosModules.home-manager
     inputs.stylix.nixosModules.stylix
     ../modules/nixos
   ];
diff --git a/hosts/desktop.nix b/hosts/desktop.nix
index 9fdac97..c7379cd 100644
--- a/hosts/desktop.nix
+++ b/hosts/desktop.nix
@@ -11,15 +11,12 @@
 
   nixpkgs = {
     config.allowUnfree = true;
-    overlays = [
-      (import ../overlays/gnome.nix)
-    ];
   };
 
   services.printing.enable = true;
   services.openssh.startWhenNeeded = true;
 
-  hardware.pulseaudio.enable = false;
+  services.pulseaudio.enable = false;
   security.rtkit.enable = true;
   services.pipewire = {
     enable = true;
@@ -56,14 +53,10 @@
   fonts.packages = with pkgs; [
     corefonts
     noto-fonts
-    (nerdfonts.override {
-      fonts = [
-        "BigBlueTerminal"
-        "ComicShannsMono"
-        "Terminus"
-        "UbuntuMono"
-      ];
-    })
+    nerd-fonts.bigblue-terminal
+    nerd-fonts.comic-shanns-mono
+    nerd-fonts.terminess-ttf
+    nerd-fonts.ubuntu-mono
   ];
 
   modules = {
diff --git a/modules/nixos/hardware/presonus-studio/default.nix b/modules/nixos/hardware/presonus-studio/default.nix
index 20a2e2d..090de0f 100644
--- a/modules/nixos/hardware/presonus-studio/default.nix
+++ b/modules/nixos/hardware/presonus-studio/default.nix
@@ -100,7 +100,7 @@ in
         };
       };
       pipewire-pulse."40-upmix" = upmixConfig;
-      client-rt."40-upmix" = upmixConfig;
+      client."40-upmix" = upmixConfig;
     };
   };
 }
diff --git a/overlays/gnome.nix b/overlays/gnome.nix
deleted file mode 100644
index ecd9502..0000000
--- a/overlays/gnome.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-final: prev: {
-  gvdb = prev.fetchgit {
-    url = "https://gitlab.gnome.org/GNOME/gvdb.git";
-    rev = "b54bc5da25127ef416858a3ad92e57159ff565b3"; # From gvdb_wrap
-    sha256 = "c56yOepnKPEYFcU1B1TrDl8ydU0JU+z6R8siAQP4d2A=";
-  };
-
-  mutter = prev.mutter.overrideAttrs (attrs: {
-    src = prev.fetchurl {
-      url = "https://gitlab.gnome.org/Community/Ubuntu/mutter/-/archive/triple-buffering-v4-47/mutter-triple-buffering-v4-47.tar.gz";
-      sha256 = "LoGAOCFopDT5+fV/6FffBzwlqK5XtozEGaOHTEXmkmg=";
-    };
-
-    postPatch = ''
-      mkdir -p subprojects/gvdb
-      cp -r ${final.gvdb}/* subprojects/gvdb/
-
-      ${attrs.postPatch or ""}
-    '';
-  });
-}
diff --git a/users/jordan/common/optional/graphical/firefox.nix b/users/jordan/common/optional/graphical/firefox.nix
index 78bd565..5e90ebf 100644
--- a/users/jordan/common/optional/graphical/firefox.nix
+++ b/users/jordan/common/optional/graphical/firefox.nix
@@ -13,8 +13,8 @@
     enable = true;
     profiles.Default = {
       search = {
-        default = "DuckDuckGo";
-        privateDefault = "DuckDuckGo";
+        default = "ddg";
+        privateDefault = "ddg";
         force = true;
       };
       settings = {
diff --git a/users/jordan/common/optional/graphical/gnome.nix b/users/jordan/common/optional/graphical/gnome.nix
index 663b4e0..f9ce346 100644
--- a/users/jordan/common/optional/graphical/gnome.nix
+++ b/users/jordan/common/optional/graphical/gnome.nix
@@ -239,5 +239,5 @@ in
         [ ]
     );
 
-  services.gpg-agent.pinentryPackage = pkgs.pinentry-gnome3;
+  services.gpg-agent.pinentry.package = pkgs.pinentry-gnome3;
 }
diff --git a/users/jordan/common/optional/graphical/hyprland/default.nix b/users/jordan/common/optional/graphical/hyprland/default.nix
index afa6599..d411e97 100644
--- a/users/jordan/common/optional/graphical/hyprland/default.nix
+++ b/users/jordan/common/optional/graphical/hyprland/default.nix
@@ -298,5 +298,5 @@ in
     unclutter.enable = true;
   };
 
-  services.gpg-agent.pinentryPackage = pkgs.pinentry-gnome3;
+  services.gpg-agent.pinentry.package = pkgs.pinentry-gnome3;
 }
diff --git a/users/jordan/common/shell.nix b/users/jordan/common/shell.nix
index 2b71c3a..161e93d 100644
--- a/users/jordan/common/shell.nix
+++ b/users/jordan/common/shell.nix
@@ -1,8 +1,14 @@
 {
+  lib,
   pkgs,
   ...
 }:
-
+let
+  inherit (lib)
+    mkMerge
+    mkOrder
+    ;
+in
 {
   programs = {
     zsh = {
@@ -27,56 +33,62 @@
         size = 1000000;
       };
 
-      initExtra = ''
-        ## Colors
-        autoload -U colors && colors
+      initContent =
+        let
+          zshConfigBeforeCompInit = mkOrder 550 ''
+            setopt HASH_LIST_ALL
+          '';
+          zshConfig = mkOrder 1000 ''
+            ## Colors
+            autoload -U colors && colors
 
-        ## Directories
-        setopt AUTO_PUSHD
-        setopt CDABLE_VARS
-        setopt PUSHD_IGNORE_DUPS
-        setopt PUSHD_SILENT
-        setopt PUSHD_TO_HOME
+            ## Directories
+            setopt AUTO_PUSHD
+            setopt CDABLE_VARS
+            setopt PUSHD_IGNORE_DUPS
+            setopt PUSHD_SILENT
+            setopt PUSHD_TO_HOME
 
-        ## Expansion and globbing
-        setopt EXTENDED_GLOB
-        unsetopt GLOB_DOTS
-        unsetopt NOMATCH
+            ## Expansion and globbing
+            setopt EXTENDED_GLOB
+            unsetopt GLOB_DOTS
+            unsetopt NOMATCH
 
-        ## History
-        setopt BANG_HIST
-        setopt HIST_VERIFY
-        setopt INC_APPEND_HISTORY_TIME
+            ## History
+            setopt BANG_HIST
+            setopt HIST_VERIFY
+            setopt INC_APPEND_HISTORY_TIME
 
-        ## I/O
-        setopt INTERACTIVE_COMMENTS
-        setopt MULTIOS
-        unsetopt CLOBBER
+            ## I/O
+            setopt INTERACTIVE_COMMENTS
+            setopt MULTIOS
+            unsetopt CLOBBER
 
-        ## Jobs
-        setopt LONG_LIST_JOBS
-        setopt AUTO_RESUME
-        unsetopt BG_NICE
-        unsetopt NOTIFY
-        unsetopt HUP
-        unsetopt CHECK_JOBS
+            ## Jobs
+            setopt LONG_LIST_JOBS
+            setopt AUTO_RESUME
+            unsetopt BG_NICE
+            unsetopt NOTIFY
+            unsetopt HUP
+            unsetopt CHECK_JOBS
 
-        ## Shell emulation
-        setopt APPEND_CREATE
+            ## Shell emulation
+            setopt APPEND_CREATE
 
-        ## Prompt
-        PS1="%B%{$fg[magenta]%}%~%{$reset_color%} $%b "
+            ## Prompt
+            PS1="%B%{$fg[magenta]%}%~%{$reset_color%} $%b "
 
-        ## Vi mode
-        export KEYTIMEOUT=1
+            ## Vi mode
+            export KEYTIMEOUT=1
 
-        ## Zsh line editor
-        unsetopt BEEP
-      '';
-
-      initExtraBeforeCompInit = ''
-        setopt HASH_LIST_ALL
-      '';
+            ## Zsh line editor
+            unsetopt BEEP
+          '';
+        in
+        mkMerge [
+          zshConfigBeforeCompInit
+          zshConfig
+        ];
 
       localVariables = {
         # Prevent zsh-vi-mode overriding other keybinds