diff --git a/flake.lock b/flake.lock
index 69dea9d..6a4f2e2 100644
--- a/flake.lock
+++ b/flake.lock
@@ -145,11 +145,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1745205007,
-        "narHash": "sha256-k67bEcLkSo13TIBfs0CGYkJjG12aaikabMtxWbSeqr0=",
+        "lastModified": 1745325289,
+        "narHash": "sha256-RKLaR/x3jsc57lu+giaSa+3xXwky/IZMJ/f8RB+XPWs=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "3fbe9a2b76ff5c4dcb2a2a2027dac31cfc993c8c",
+        "rev": "ce8dc1f77ada561f4deee2c76f7cd6f6c7b8feec",
         "type": "github"
       },
       "original": {
@@ -272,6 +272,21 @@
         "type": "github"
       }
     },
+    "nixpkgs-master": {
+      "locked": {
+        "lastModified": 1745325559,
+        "narHash": "sha256-Ice2yq808ks+PGiGsc5ZztlAKc9+EEsWeKVBBaeF4Bk=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "b3f6a4ed5252b74fb35113619be55219a18e7922",
+        "type": "github"
+      },
+      "original": {
+        "id": "nixpkgs",
+        "ref": "master",
+        "type": "indirect"
+      }
+    },
     "nixvim": {
       "inputs": {
         "flake-parts": "flake-parts",
@@ -281,11 +296,11 @@
         "nuschtosSearch": "nuschtosSearch"
       },
       "locked": {
-        "lastModified": 1745228623,
-        "narHash": "sha256-gW+U99BB+s4erguNC3izqcabE9iRvr4+wNbrsBYhRIE=",
+        "lastModified": 1745324162,
+        "narHash": "sha256-Sjb/LvtWpPtSXacjJCTrLAmWtXNJd0SWxO3PzTvD7Tc=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "199a300488f6bfb5847fe906f0e8e183e0bf02c9",
+        "rev": "60638182b8d1b0fe13631d02eafaf8903499ee60",
         "type": "github"
       },
       "original": {
@@ -348,6 +363,7 @@
         "home-manager": "home-manager",
         "nix-flatpak": "nix-flatpak",
         "nixpkgs": "nixpkgs",
+        "nixpkgs-master": "nixpkgs-master",
         "nixvim": "nixvim",
         "nvf": "nvf",
         "spicetify-nix": "spicetify-nix"
diff --git a/flake.nix b/flake.nix
index 4c5cbd7..6cb313c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,6 +3,7 @@
 
   inputs = {
     nixpkgs.url = "nixpkgs/nixos-unstable";
+    nixpkgs-master.url = "nixpkgs/master"; # used for immediate fixes
     home-manager = {
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -29,6 +30,7 @@
   outputs = {
     self,
     nixpkgs,
+    nixpkgs-master,
     home-manager,
     nix-flatpak,
     spicetify-nix,
@@ -37,9 +39,10 @@
     nixvim,
     ...
   } @ inputs: let
-    lib = nixpkgs.lib;
     system = "x86_64-linux";
-    pkgs = nixpkgs.legacyPackages.${system}; # required for home-manager
+    pkgs = import nixpkgs {inherit system;};
+    pkgsMaster = import nixpkgs-master {inherit system;};
+    lib = nixpkgs.lib;
     spicetifyPkgs = spicetify-nix.legacyPackages.${system};
 
     systemSettings = {
@@ -70,6 +73,7 @@
 
         specialArgs = {
           inherit inputs;
+          inherit pkgsMaster;
           inherit systemSettings;
           inherit userSettings;
         };
@@ -77,7 +81,6 @@
         modules = [
           nix-flatpak.nixosModules.nix-flatpak
           ./system/configuration.nix
-          ./temp-overlays/qt6gtk2.nix
         ];
       };
     };
@@ -88,6 +91,7 @@
         extraSpecialArgs = {
           inherit self;
           inherit inputs;
+          inherit pkgsMaster;
           inherit systemSettings;
           inherit userSettings;
           inherit spicetifyPkgs;
@@ -98,7 +102,6 @@
           spicetify-nix.homeManagerModules.default
           nixvim.homeManagerModules.nixvim
           ./user/home.nix
-          ./temp-overlays/qt6gtk2.nix
         ];
       };
     };
diff --git a/system/fonts.nix b/system/fonts.nix
index 2160d04..1c58c59 100644
--- a/system/fonts.nix
+++ b/system/fonts.nix
@@ -1,6 +1,8 @@
 {pkgs, ...}: {
   fonts.packages = with pkgs; [
     jetbrains-mono
+    inconsolata
+    fira-sans
     nerd-fonts.jetbrains-mono
     corefonts
     vistafonts
diff --git a/temp-overlays/qt6gtk2.nix b/temp-overlays/qt6gtk2.nix
deleted file mode 100644
index 80ea598..0000000
--- a/temp-overlays/qt6gtk2.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{...}: {
-  nixpkgs.overlays = [
-    (final: prev: {
-      qt6Packages = prev.qt6Packages.overrideScope (
-        _: kprev: {
-          qt6gtk = kprev.qt6gtk2.overrideAttrs (_: {
-            version = "0.5-unstable-2025-03-04";
-            src = final.fetchFromGitLab {
-              domain = "opencode.net";
-              owner = "trialuser";
-              repo = "qt6gtk2";
-              rev = "d7c14bec2c7a3d2a37cde60ec059fc0ed4efee67";
-              hash = "sha256-6xD0lBiGWC3PXFyM2JW16/sDwicw4kWSCnjnNwUT4PI=";
-            };
-          });
-        }
-      );
-    })
-  ];
-}
diff --git a/user/home.nix b/user/home.nix
index 96855c9..f4ebc1f 100644
--- a/user/home.nix
+++ b/user/home.nix
@@ -11,6 +11,7 @@
     ./fastfetch.nix
     ./git.nix
     ./gleam.nix
+    ./overlays.nix
     ./gpg.nix
     ./helix.nix
     ./misc.nix
diff --git a/user/misc.nix b/user/misc.nix
index 1d5c39e..4724e12 100644
--- a/user/misc.nix
+++ b/user/misc.nix
@@ -37,5 +37,9 @@
     zenity
     wireshark
     insomnia
+    tealdeer
+    mpv
+    pavucontrol
+    tree
   ];
 }
diff --git a/user/overlays.nix b/user/overlays.nix
new file mode 100644
index 0000000..77b1038
--- /dev/null
+++ b/user/overlays.nix
@@ -0,0 +1,9 @@
+{pkgsMaster, ...}: {
+  nixpkgs.overlays = [
+    (final: prev: {
+      qt6Packages = prev.qt6Packages.overrideScope (_: kprev: {
+        qt6gtk2 = pkgsMaster.qt6Packages.qt6gtk2;
+      });
+    })
+  ];
+}