diff --git a/aly.nix b/aly.nix
index dadb296e..dd54e8e4 100644
--- a/aly.nix
+++ b/aly.nix
@@ -17,7 +17,7 @@ in {
   programs.home-manager.enable = true;
 
   home.packages = with pkgs; [
-    (pkgs.google-chrome.override {commandLineArgs = "--gtk-version=4 --enable-wayland-ime";})
+    google-chrome
     browsh
     curl
     fractal
@@ -30,8 +30,7 @@ in {
     ruby
     tauon
     trayscale
-    unstable.obsidian
-    unstable.zoom-us
+    obsidian
     webcord
     wget
   ];
@@ -109,7 +108,7 @@ in {
       bash.enable = true;
       chromium = {
         enable = true;
-        package = pkgs.brave.override {commandLineArgs = "--gtk-version=4 --enable-wayland-ime";};
+        package = pkgs.brave;
       };
       emacs.enable = true;
       eza.enable = true;
diff --git a/homeManagerModules/apps/chromium/default.nix b/homeManagerModules/apps/chromium/default.nix
index b2a0ef03..9aee0793 100644
--- a/homeManagerModules/apps/chromium/default.nix
+++ b/homeManagerModules/apps/chromium/default.nix
@@ -9,7 +9,7 @@
       enable = lib.mkEnableOption "Chromium-based browser with default extensions.";
       package = lib.mkOption {
         description = "Chromium-based browser (Brave by default).";
-        default = pkgs.brave.override {commandLineArgs = "--gtk-version=4 --enable-wayland-ime";};
+        default = pkgs.brave;
         type = lib.types.package;
       };
     };
diff --git a/homeManagerModules/apps/vsCodium/default.nix b/homeManagerModules/apps/vsCodium/default.nix
index 906c6e6c..27c88d46 100644
--- a/homeManagerModules/apps/vsCodium/default.nix
+++ b/homeManagerModules/apps/vsCodium/default.nix
@@ -13,7 +13,7 @@
 
     programs.vscode = {
       enable = true;
-      package = pkgs.vscodium.override {commandLineArgs = "--gtk-version=4 --enable-wayland-ime";};
+      package = pkgs.vscodium;
       enableUpdateCheck = false;
       enableExtensionUpdateCheck = false;
       userSettings = {
diff --git a/homeManagerModules/desktop/hyprland/default.nix b/homeManagerModules/desktop/hyprland/default.nix
index 9fb852b9..2b5b6458 100644
--- a/homeManagerModules/desktop/hyprland/default.nix
+++ b/homeManagerModules/desktop/hyprland/default.nix
@@ -70,12 +70,12 @@
     };
 
     wayland.windowManager.hyprland.enable = true;
-    wayland.windowManager.hyprland.package = inputs.hyprland.packages.${pkgs.system}.hyprland;
+    wayland.windowManager.hyprland.package = pkgs.hyprland;
     wayland.windowManager.hyprland.extraConfig = let
       modifier = "SUPER";
 
       # Hyprland desktop utilities
-      hyprnome = lib.getExe inputs.nixpkgsUnstable.legacyPackages."${pkgs.system}".hyprnome;
+      hyprnome = lib.getExe pkgs.hyprnome;
       hyprctl = lib.getExe' config.wayland.windowManager.hyprland.package "hyprctl";
 
       # Default apps
diff --git a/homeManagerModules/desktop/sway/default.nix b/homeManagerModules/desktop/sway/default.nix
index 96a7cb16..2924603a 100644
--- a/homeManagerModules/desktop/sway/default.nix
+++ b/homeManagerModules/desktop/sway/default.nix
@@ -69,7 +69,7 @@
     wayland.windowManager.sway.package =
       if config.alyraffauf.desktop.sway.tabletMode.enable
       then pkgs.sway
-      else inputs.nixpkgsUnstable.legacyPackages."${pkgs.system}".swayfx;
+      else pkgs.swayfx;
     wayland.windowManager.sway.wrapperFeatures.gtk = true;
     wayland.windowManager.sway.checkConfig = false;
 
@@ -476,7 +476,7 @@
       bindswitch --reload --locked lid:off output eDP-1 enable
 
       ${
-        if config.wayland.windowManager.sway.package == inputs.nixpkgsUnstable.legacyPackages."${pkgs.system}".swayfx
+        if config.wayland.windowManager.sway.package == pkgs.swayfx
         then "
         blur enable
         blur_passes 1
diff --git a/homeManagerModules/desktop/theme.nix b/homeManagerModules/desktop/theme.nix
index c0dfe059..dbd2b71b 100644
--- a/homeManagerModules/desktop/theme.nix
+++ b/homeManagerModules/desktop/theme.nix
@@ -16,12 +16,7 @@
         };
         package = lib.mkOption {
           description = "GTK theme package.";
-          default = pkgs.catppuccin-gtk.override {
-            accents = ["mauve"];
-            size = "compact";
-            variant = "frappe";
-            tweaks = ["normal"];
-          };
+          default = pkgs.catppuccin-gtk;
           type = lib.types.package;
         };
         hideTitleBar = lib.mkOption {
@@ -38,10 +33,7 @@
         };
         package = lib.mkOption {
           description = "Qt Kvantum theme package.";
-          default = pkgs.catppuccin-kvantum.override {
-            accent = "Mauve";
-            variant = "Frappe";
-          };
+          default = pkgs.catppuccin-kvantum;
           type = lib.types.package;
         };
       };
@@ -53,10 +45,7 @@
         };
         package = lib.mkOption {
           description = "Icon theme package.";
-          default = pkgs.catppuccin-papirus-folders.override {
-            flavor = "frappe";
-            accent = "mauve";
-          };
+          default = pkgs.catppuccin-papirus-folders;
           type = lib.types.package;
         };
       };
@@ -90,7 +79,7 @@
         };
         package = lib.mkOption {
           description = "Font package.";
-          default = pkgs.nerdfonts.override {fonts = ["Noto"];};
+          default = pkgs.nerdfonts;
           type = lib.types.package;
         };
       };
@@ -107,7 +96,7 @@
         };
         package = lib.mkOption {
           description = "Font package.";
-          default = pkgs.nerdfonts.override {fonts = ["Noto"];};
+          default = pkgs.nerdfonts;
           type = lib.types.package;
         };
       };
diff --git a/nixosModules/default.nix b/nixosModules/default.nix
index b587c214..a3459abd 100644
--- a/nixosModules/default.nix
+++ b/nixosModules/default.nix
@@ -3,7 +3,12 @@ inputs: {
   pkgs,
   lib,
   ...
-}: {
+}: let
+  unstable = import inputs.nixpkgsUnstable {
+    system = pkgs.system;
+    config.allowUnfree = true;
+  };
+in {
   imports = [
     ./apps
     ./containers
@@ -13,9 +18,50 @@ inputs: {
     ./system
     ./user
   ];
-  
+
   nixpkgs.overlays = [
     (final: prev: {
+      brave = prev.brave.override {commandLineArgs = "--gtk-version=4 --enable-wayland-ime";};
+      catppuccin-gtk = prev.catppuccin-gtk.override {
+        accents = ["mauve"];
+        size = "compact";
+        variant = "frappe";
+        tweaks = ["normal"];
+      };
+      catppuccin-kvantum = prev.catppuccin-kvantum.override {
+        accent = "Mauve";
+        variant = "Frappe";
+      };
+      catppuccin-papirus-folders = prev.catppuccin-papirus-folders.override {
+        flavor = "frappe";
+        accent = "mauve";
+      };
+      catppuccin-plymouth = prev.catppuccin-plymouth.override {variant = "frappe";};
+      nerdfonts = prev.nerdfonts.override {fonts = ["Noto"];};
+      google-chrome = prev.google-chrome.override {commandLineArgs = "--gtk-version=4 --enable-wayland-ime";};
+      hyprland = inputs.hyprland.packages.${pkgs.system}.hyprland;
+      hyprnome = unstable.hyprnome;
+      obsidian = unstable.obsidian.overrideAttrs (old: {
+        installPhase = ''
+          runHook preInstall
+          mkdir -p $out/bin
+          makeWrapper ${pkgs.electron}/bin/electron $out/bin/obsidian \
+            --add-flags $out/share/obsidian/app.asar \
+            --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-wayland-ime}}"
+          install -m 444 -D resources/app.asar $out/share/obsidian/app.asar
+          install -m 444 -D resources/obsidian.asar $out/share/obsidian/obsidian.asar
+          install -m 444 -D "${old.desktopItem}/share/applications/"* \
+            -t $out/share/applications/
+          for size in 16 24 32 48 64 128 256 512; do
+            mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps
+            convert -background none -resize "$size"x"$size" ${old.icon} $out/share/icons/hicolor/"$size"x"$size"/apps/obsidian.png
+          done
+          runHook postInstall
+        '';
+      });
+      sway = unstable.sway;
+      swayfx = unstable.swayfx;
+      vscodium = prev.vscodium.override {commandLineArgs = "--gtk-version=4 --enable-wayland-ime";};
       webcord = prev.webcord.overrideAttrs (old: {
         installPhase = let
           binPath = lib.makeBinPath [pkgs.xdg-utils];
diff --git a/nixosModules/desktop/greetd/default.nix b/nixosModules/desktop/greetd/default.nix
index 82048b7d..219a5952 100644
--- a/nixosModules/desktop/greetd/default.nix
+++ b/nixosModules/desktop/greetd/default.nix
@@ -1,8 +1,7 @@
 {
-  inputs,
-  pkgs,
-  lib,
   config,
+  lib,
+  pkgs,
   ...
 }: {
   options = {
diff --git a/nixosModules/desktop/hyprland/default.nix b/nixosModules/desktop/hyprland/default.nix
index 3946be30..e87f6f3b 100644
--- a/nixosModules/desktop/hyprland/default.nix
+++ b/nixosModules/desktop/hyprland/default.nix
@@ -1,8 +1,7 @@
 {
-  inputs,
-  pkgs,
-  lib,
   config,
+  lib,
+  pkgs,
   ...
 }: {
   options = {
@@ -16,7 +15,7 @@
     programs = {
       hyprland = {
         enable = true;
-        package = inputs.hyprland.packages.${pkgs.system}.hyprland;
+        package = pkgs.hyprland;
       };
     };
   };
diff --git a/nixosModules/desktop/lightdm/default.nix b/nixosModules/desktop/lightdm/default.nix
index db8cb781..016b5af6 100644
--- a/nixosModules/desktop/lightdm/default.nix
+++ b/nixosModules/desktop/lightdm/default.nix
@@ -22,29 +22,22 @@
         enable = true;
         theme = {
           name = "Catppuccin-Frappe-Compact-Mauve-Dark";
-          package = pkgs.catppuccin-gtk.override {
-            accents = ["mauve"];
-            size = "compact";
-            variant = "frappe";
-            tweaks = ["normal"];
-          };
+          package = pkgs.catppuccin-gtk;
         };
 
         iconTheme = {
           name = "Papirus-Dark";
-          package = pkgs.catppuccin-papirus-folders.override {
-            flavor = "frappe";
-            accent = "mauve";
-          };
+          package = pkgs.catppuccin-papirus-folders;
         };
 
         font = {
           name = "NotoSans Nerd Font Regular";
-          package = pkgs.nerdfonts.override {fonts = ["Noto"];};
+          package = pkgs.nerdfonts;
         };
 
         cursorTheme = {
           name = "Catppuccin-Frappe-Dark-Cursors";
+          package = pkgs.catppuccin-cursors.frappeDark;
           size = 24;
         };
 
diff --git a/nixosModules/desktop/sway/default.nix b/nixosModules/desktop/sway/default.nix
index c3db25fb..d5132b83 100644
--- a/nixosModules/desktop/sway/default.nix
+++ b/nixosModules/desktop/sway/default.nix
@@ -16,7 +16,7 @@
     programs = {
       sway = {
         enable = true;
-        package = inputs.nixpkgsUnstable.legacyPackages."${pkgs.system}".swayfx;
+        package = pkgs.swayfx;
       };
     };
   };
diff --git a/nixosModules/system/plymouth/default.nix b/nixosModules/system/plymouth/default.nix
index ad8afe9a..24ef61ff 100644
--- a/nixosModules/system/plymouth/default.nix
+++ b/nixosModules/system/plymouth/default.nix
@@ -16,11 +16,9 @@
       initrd.verbose = false;
       plymouth = {
         enable = true;
-        themePackages = [(pkgs.catppuccin-plymouth.override {variant = "frappe";})];
+        themePackages = [pkgs.catppuccin-plymouth];
         theme = "catppuccin-frappe";
-        font = "${pkgs.nerdfonts.override {
-          fonts = ["Noto"];
-        }}/share/fonts/truetype/NerdFonts/NotoSansNerdFont-Regular.ttf";
+        font = "${pkgs.nerdfonts}/share/fonts/truetype/NerdFonts/NotoSansNerdFont-Regular.ttf";
       };
     };
   };