diff --git a/modules/home/cli/git/default.nix b/modules/home/cli/git/default.nix
index 52ae230..53aa062 100755
--- a/modules/home/cli/git/default.nix
+++ b/modules/home/cli/git/default.nix
@@ -2,14 +2,16 @@
 
   programs.git = {
     enable = true;
-    userEmail = "${config.usercfg.git.email}";
-    userName = "${config.usercfg.git.username}";
     signing = {
       key = "${config.usercfg.git.key}";
       signByDefault = true;
     };
     ignores = [ "*result*" ".direnv" "node_modules" ];
-    extraConfig = { core.hooksPath = "./.dev/hooks"; };
+    settings = {
+      core.hooksPath = "./.dev/hooks"; 
+      user.email = "${config.usercfg.git.email}";
+      user.name = "${config.usercfg.git.username}";
+    };
   };
 
   home.packages = with pkgs; [ tig ];
diff --git a/modules/nixos/system/hw/power/default.nix b/modules/nixos/system/hw/power/default.nix
index 7e6e009..e86ae44 100644
--- a/modules/nixos/system/hw/power/default.nix
+++ b/modules/nixos/system/hw/power/default.nix
@@ -20,11 +20,10 @@
       SuspendState=mem
     '';
 
-    services.logind.lidSwitch = "suspend-then-hibernate";
+    services.logind.settings.Login.HandleLidSwitch = "suspend-then-hibernate";
     # Hibernate on power button pressed
-    services.logind.powerKey = "hibernate";
-    services.logind.powerKeyLongPress = "poweroff";
-
+    services.logind.settings.Login.HandlePowerKey = "hibernate";
+    services.logind.settings.Login.HandlePowerKeyLongPress = "poweroff";
 
     systemd.user.services.battery_monitor = {
       wants = [ "display-manager.service" ];
diff --git a/modules/nixos/tools/debug/default.nix b/modules/nixos/tools/debug/default.nix
index fe3d4f5..7437da4 100644
--- a/modules/nixos/tools/debug/default.nix
+++ b/modules/nixos/tools/debug/default.nix
@@ -2,9 +2,9 @@
 
   config = lib.mkIf (config.syscfg.make.develop) {
     programs.adb.enable = true;
-    services.udev.packages = [
-      pkgs.android-udev-rules
-    ];
+    # services.udev.packages = [
+    #   pkgs.android-udev-rules
+    # ];
     programs.wireshark.enable = true;
 
     environment.systemPackages = with pkgs; [ wget dconf wireshark ];
diff --git a/overlays/default.nix b/overlays/default.nix
index 642b0d7..13d1e62 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -1,13 +1,15 @@
 { inputs, pkgs, ... }:
 [
   (final: prev: {
-    openttd-jgrpp = import ./openttd-jgrpp { inherit final prev; };
-    yarn-berry = import ./yarn-berry { inherit final prev; };
-    eww = import ./eww { inherit final prev; };
-    bambu-studio = import ./bambu-studio { inherit final prev; };
+    #openttd-jgrpp = import ./openttd-jgrpp { inherit final prev; };
+    #yarn-berry = import ./yarn-berry { inherit final prev; };
+    #eww = import ./eww { inherit final prev; };
+    #bambu-studio = import ./bambu-studio { inherit final prev; };
     wine = final.unstable.wineWow64Packages.unstableFull;
     unstable = import inputs.nixUnstable {
-      system = final.system;
+      
+      system = final.stdenv.hostPlatform.system;
+      stdenv.hostPlatform.system = final.stdenv.hostPlatform.system;
       config.allowUnfree = true;
     };
   })