diff --git a/home/packages/common.nix b/home/packages/common.nix
index 285dbe9..bf5e39a 100644
--- a/home/packages/common.nix
+++ b/home/packages/common.nix
@@ -37,7 +37,6 @@
     tree
     gnutar
     gnupg
-    nerdfonts
     zoxide
     babelfish
 
@@ -45,8 +44,6 @@
     nodejs
     cargo
     python3
-    jetbrains.rust-rover
-    jetbrains.rider
 
     # nix specific stuff
     nixd
diff --git a/home/shell.nix b/home/shell.nix
index 94503b5..9941b9f 100644
--- a/home/shell.nix
+++ b/home/shell.nix
@@ -57,7 +57,7 @@
 
   programs.zsh = {
     enable = true;
-    initExtra = ''
+    initContent = ''
       if [[ -z "$BASH_EXECUTION_STRING" ]]; then
         if [[ -n "$ZSH_VERSION" ]]; then
           LOGIN_OPTION="--login"
diff --git a/modules/common/fonts.nix b/modules/common/fonts.nix
index 0e805af..965ba13 100644
--- a/modules/common/fonts.nix
+++ b/modules/common/fonts.nix
@@ -3,12 +3,13 @@
   lib,
   ...
 }: {
-  fonts.packages = with pkgs; [
-    nerdfonts
-    noto-fonts
-    noto-fonts-emoji
-    liberation_ttf
-    noto-fonts-cjk-sans
-    monaspace
-  ];
+  fonts.packages = with pkgs;
+    [
+      noto-fonts
+      noto-fonts-emoji
+      liberation_ttf
+      noto-fonts-cjk-sans
+      monaspace
+    ]
+    ++ builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.nerd-fonts);
 }
diff --git a/modules/graphics/default.nix b/modules/graphics/default.nix
index d38dbbd..1fa0335 100644
--- a/modules/graphics/default.nix
+++ b/modules/graphics/default.nix
@@ -62,7 +62,7 @@ in {
 
     (mkIf (cfg.gpuVendor == "amd") {
       services.xserver.videoDrivers = ["amdgpu"];
-      hardware.opengl.extraPackages = with pkgs; [
+      hardware.graphics.extraPackages = with pkgs; [
         amdvlk
       ];
       environment.systemPackages = with pkgs; [
@@ -72,7 +72,7 @@ in {
 
     (mkIf (cfg.gpuVendor == "intel") {
       services.xserver.videoDrivers = ["modesetting"];
-      hardware.opengl.extraPackages = with pkgs; [
+      hardware.graphics.extraPackages = with pkgs; [
         intel-media-driver
         intel-compute-runtime
       ];
diff --git a/modules/networking/core.nix b/modules/networking/core.nix
index 1db0c63..dc65e10 100644
--- a/modules/networking/core.nix
+++ b/modules/networking/core.nix
@@ -62,7 +62,7 @@ in {
     };
     networking.networkmanager = {
       enable = lib.mkForce cfg.networkManager.enable;
-      packages = cfg.networkManager.extraPlugins;
+      plugins = cfg.networkManager.extraPlugins;
     };
   };
 }