diff --git a/overlays/default.nix b/overlays/default.nix
index 6e00ae2..7ef585b 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -12,10 +12,18 @@ rec {
 
   scripts = (import ../scripts);
 
-  unstable = final: prev: {
-    unstable = import inputs.nixpkgs-unstable { inherit (final) system config; };
-    pkgs-mesa-26 = import inputs.nixpkgs-mesa-26 { inherit (final) system config; };
-  };
+  unstable =
+    final: prev:
+    let
+      args = {
+        inherit (final) config;
+        system = prev.stdenv.hostPlatform.system;
+      };
+    in
+    {
+      unstable = import inputs.nixpkgs-unstable args;
+      pkgs-mesa-26 = import inputs.nixpkgs-mesa-26 args;
+    };
 
   themes = (
     final: prev: {
@@ -34,14 +42,18 @@ rec {
 
   new-packages = (
     final: prev:
+    let
+      system = prev.stdenv.hostPlatform.system;
+    in
     packages
     // {
-      lsfg-vk = inputs.lsfg-vk-flake.packages.${prev.system}.lsfg-vk;
-      lsfg-vk-ui = inputs.lsfg-vk-flake.packages.${prev.system}.lsfg-vk-ui;
-      dhist = inputs.dhist.packages.${prev.system}.dhist;
-      demoji = inputs.demoji.packages.${prev.system}.default;
-      tlauncher = inputs.tlauncher.packages.${prev.system}.tlauncher;
-      wl-crosshair = inputs.wl-crosshair.packages.${prev.system}.default;
+      lsfg-vk = inputs.lsfg-vk-flake.packages.${system}.lsfg-vk;
+      lsfg-vk-ui = inputs.lsfg-vk-flake.packages.${system}.lsfg-vk-ui;
+      dhist = inputs.dhist.packages.${system}.dhist;
+      demoji = inputs.demoji.packages.${system}.default;
+      tlauncher = inputs.tlauncher.packages.${system}.tlauncher;
+      wl-crosshair = inputs.wl-crosshair.packages.${system}.default;
+      dzgui = inputs.dzgui-nix.packages.${system}.default;
     }
   );
 
diff --git a/switch b/switch
index 32bc217..bff47b1 100755
--- a/switch
+++ b/switch
@@ -12,7 +12,7 @@ git --no-pager diff
 run() {
     nixos-rebuild \
         switch \
-        --use-remote-sudo \
+        --sudo \
         --print-build-logs \
         --flake .# \
         "$@"
diff --git a/system/gaming.nix b/system/gaming.nix
index bc9d0c1..c2f9a1d 100644
--- a/system/gaming.nix
+++ b/system/gaming.nix
@@ -35,7 +35,7 @@
     environment.systemPackages = with pkgs; [
       protontricks
       bottles
-      inputs.dzgui-nix.packages.${pkgs.system}.default
+      dzgui
     ];
 
     programs.gamemode = {
diff --git a/system/greetd.nix b/system/greetd.nix
index 94d20e1..8642968 100644
--- a/system/greetd.nix
+++ b/system/greetd.nix
@@ -48,7 +48,7 @@ in
         '';
         greetd_main_script = pkgs.writeShellScriptBin "main" ''
           export XDG_CURRENT_DESKTOP=sway GTK_THEME="${theme.gtk_theme}" XCURSOR_THEME="${theme.cursor_theme}"
-          ${pkgs.greetd.gtkgreet}/bin/gtkgreet -l -c ${lib.getExe start-sway}
+          ${pkgs.gtkgreet}/bin/gtkgreet -l -c ${lib.getExe start-sway}
           swaymsg exit
         '';
         swayConfig = pkgs.writeText "greetd-sway-config" ''
diff --git a/user/git.nix b/user/git.nix
index c15514f..e64a822 100644
--- a/user/git.nix
+++ b/user/git.nix
@@ -12,7 +12,7 @@ in
     programs.git = {
       enable = true;
       lfs.enable = true;
-      extraConfig = {
+      settings = {
         user = {
           name = username;
           email = mail.personal.user;
diff --git a/user/ssh.nix b/user/ssh.nix
index 4747bb4..e141477 100644
--- a/user/ssh.nix
+++ b/user/ssh.nix
@@ -2,6 +2,7 @@
   config = {
     programs.ssh = {
       enable = true;
+      enableDefaultConfig = false;
       matchBlocks = {
         monolith = {
           user = "lelgenio";