From 405201d3886e459d1e27a373d193bfc4eb3131c8 Mon Sep 17 00:00:00 2001
From: outfoxxed <outfoxxed@outfoxxed.me>
Date: Thu, 24 Jul 2025 20:04:58 -0700
Subject: [PATCH] fix deprecations

---
 modules/overlay-pkgs/default.nix         |  2 +-
 modules/user/modules/fcitx5/default.nix  |  3 ++-
 modules/user/modules/firefox/default.nix |  5 +++--
 modules/xserver/default.nix              | 10 +++++-----
 modules/zsh/default.nix                  |  2 +-
 5 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/modules/overlay-pkgs/default.nix b/modules/overlay-pkgs/default.nix
index 7e7fe62..1635670 100644
--- a/modules/overlay-pkgs/default.nix
+++ b/modules/overlay-pkgs/default.nix
@@ -1,6 +1,6 @@
 { inputs, pkgs, ... }: {
   nixpkgs.overlays = [
-    inputs.nur.overlay
+    inputs.nur.overlays.default
 
     (final: prev: {
       kwrite = final.kdePackages.callPackage ./kwrite.nix {};
diff --git a/modules/user/modules/fcitx5/default.nix b/modules/user/modules/fcitx5/default.nix
index 10986ee..4598095 100755
--- a/modules/user/modules/fcitx5/default.nix
+++ b/modules/user/modules/fcitx5/default.nix
@@ -1,6 +1,7 @@
 { pkgs, ... }: {
   i18n.inputMethod = {
-    enabled = "fcitx5";
+    enable = true;
+    type = "fcitx5";
     fcitx5.addons = with pkgs; [
       fcitx5-mozc
       fcitx5-gtk
diff --git a/modules/user/modules/firefox/default.nix b/modules/user/modules/firefox/default.nix
index cc1f407..faf4640 100755
--- a/modules/user/modules/firefox/default.nix
+++ b/modules/user/modules/firefox/default.nix
@@ -184,8 +184,9 @@ in {
 
     profiles = let
       mkProfile = { name, id, settings, extensions ? [] }: {
-        inherit id settings name extensions;
+        inherit id settings name;
         path = name;
+        extensions.packages = extensions;
         userChrome = ''
           ${builtins.readFile ./hide_drm_nagbar_chrome.css}
           ${builtins.readFile ./sideberry_chrome.css}
@@ -240,7 +241,7 @@ in {
         settings = modules.base
         // prefgroups.misc.restore-pages;
 
-        extensions = with pkgs.nur.repos.rycee.firefox-addons; with extra-addons; [
+        extensions.packages = with pkgs.nur.repos.rycee.firefox-addons; with extra-addons; [
           ublock-origin
           vencord
         ];
diff --git a/modules/xserver/default.nix b/modules/xserver/default.nix
index 16a4372..062943f 100644
--- a/modules/xserver/default.nix
+++ b/modules/xserver/default.nix
@@ -4,11 +4,11 @@
     logFile = null;
     display = 7;
 
-    libinput = {
-      enable = true;
-      mouse.accelProfile = "flat";
-    };
-
     displayManager.startx.enable = true;
   };
+
+  services.libinput = {
+    enable = true;
+    mouse.accelProfile = "flat";
+  };
 }
diff --git a/modules/zsh/default.nix b/modules/zsh/default.nix
index 9889434..4c6ab88 100644
--- a/modules/zsh/default.nix
+++ b/modules/zsh/default.nix
@@ -55,7 +55,7 @@
         }
       ];
 
-      initExtra = ''
+      initContent = ''
         # keybinds
         source ${impurity.link ./keybinds.zsh}